Commit 9d367c563ec318d84bdaea09c87f2896b75832df
1 parent
a824de42
Exists in
newLive
no message
Showing
5 changed files
with
110 additions
and
97 deletions
Show diff stats
YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard
| ... | ... | @@ -826,7 +826,12 @@ |
| 826 | 826 | <subviews> |
| 827 | 827 | <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="CFz-Ro-N17"> |
| 828 | 828 | <rect key="frame" x="0.0" y="184" width="375" height="434"/> |
| 829 | - <color key="backgroundColor" red="0.89713114500000002" green="0.89431768659999999" blue="0.90413767099999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | |
| 829 | + <color key="backgroundColor" red="0.93503493069999999" green="0.93562394380000002" blue="0.96585971120000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | |
| 830 | + <view key="tableFooterView" contentMode="scaleToFill" id="IB7-84-pRF"> | |
| 831 | + <rect key="frame" x="0.0" y="72" width="375" height="1"/> | |
| 832 | + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | |
| 833 | + <color key="backgroundColor" red="0.93503493069999999" green="0.93562394380000002" blue="0.96585971120000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | |
| 834 | + </view> | |
| 830 | 835 | <prototypes> |
| 831 | 836 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" id="dJF-O6-zOW" customClass="UserCenterHistoryCell" customModule="YouerLiveVideo" customModuleProvider="target"> |
| 832 | 837 | <rect key="frame" x="0.0" y="28" width="375" height="44"/> | ... | ... |
YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStationViewController.swift
| ... | ... | @@ -150,9 +150,6 @@ extension TVStationViewController:UICollectionViewDelegate,UICollectionViewDeleg |
| 150 | 150 | if collectionView.tag == 3{ |
| 151 | 151 | let vc = Story.instantiateViewControllerWithIdentifier("ExcellentTVViewControllerVC", storyName: "TVStation") as! ExcellentTVViewController |
| 152 | 152 | self.navigationController?.pushViewController(vc, animated: true) |
| 153 | - }else{ | |
| 154 | - let vc = Story.instantiateViewControllerWithIdentifier("TVStationChannelViewControllerVC", storyName: "TVStation") as! TVStationChannelViewController | |
| 155 | - self.navigationController?.pushViewController(vc, animated: true) | |
| 156 | 153 | } |
| 157 | 154 | } |
| 158 | 155 | func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { | ... | ... |
YouerLiveVideo/YouerLiveVideo/controllers/User/Setting/ChangePassWordViewController.swift
| ... | ... | @@ -12,6 +12,7 @@ class ChangePassWordViewController: UIViewController { |
| 12 | 12 | |
| 13 | 13 | @IBOutlet weak var scrollView: UIScrollView! |
| 14 | 14 | @IBOutlet weak var scrollViewHeight: NSLayoutConstraint! |
| 15 | + @IBOutlet weak var contentSizeHeight: NSLayoutConstraint! | |
| 15 | 16 | |
| 16 | 17 | @IBOutlet weak var passwordTextFiled: UITextField! |
| 17 | 18 | @IBOutlet weak var agrenPasswordTextFiled: UITextField! |
| ... | ... | @@ -26,11 +27,17 @@ class ChangePassWordViewController: UIViewController { |
| 26 | 27 | |
| 27 | 28 | override func viewDidLoad() { |
| 28 | 29 | super.viewDidLoad() |
| 29 | - scrollViewH = scrollViewHeight.constant | |
| 30 | + self.automaticallyAdjustsScrollViewInsets = false | |
| 30 | 31 | NotificationCenter.default.addObserver(self, selector: #selector(ChangePassWordViewController.keyboardWIllChange), name: NSNotification.Name.UIKeyboardWillChangeFrame, object: nil) |
| 31 | 32 | |
| 32 | 33 | // Do any additional setup after loading the view. |
| 33 | 34 | } |
| 35 | + | |
| 36 | + override func viewWillAppear(_ animated: Bool) { | |
| 37 | + scrollViewHeight.constant = getScreenHeight() - 70 - 64 | |
| 38 | + contentSizeHeight.constant = getScreenHeight() - 70 - 64 | |
| 39 | + scrollViewH = scrollViewHeight.constant | |
| 40 | + } | |
| 34 | 41 | |
| 35 | 42 | override func didReceiveMemoryWarning() { |
| 36 | 43 | super.didReceiveMemoryWarning() | ... | ... |
YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 | <view key="tableFooterView" alpha="0.0" contentMode="scaleToFill" id="gdX-lf-V9T"> |
| 28 | 28 | <rect key="frame" x="0.0" y="233" width="375" height="1"/> |
| 29 | 29 | <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> |
| 30 | - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | |
| 30 | + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> | |
| 31 | 31 | </view> |
| 32 | 32 | <prototypes> |
| 33 | 33 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" rowHeight="65" id="VaS-c5-fyN" customClass="UserEditCell" customModule="YouerLiveVideo" customModuleProvider="target"> |
| ... | ... | @@ -264,16 +264,44 @@ |
| 264 | 264 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 265 | 265 | <subviews> |
| 266 | 266 | <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8Vd-3T-3CR"> |
| 267 | - <rect key="frame" x="0.0" y="0.0" width="375" height="597"/> | |
| 267 | + <rect key="frame" x="0.0" y="0.0" width="375" height="200"/> | |
| 268 | 268 | <subviews> |
| 269 | 269 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1DA-t8-OEm"> |
| 270 | - <rect key="frame" x="0.0" y="0.0" width="375" height="597"/> | |
| 270 | + <rect key="frame" x="0.0" y="0.0" width="375" height="200"/> | |
| 271 | 271 | <subviews> |
| 272 | - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YjI-UW-Ova"> | |
| 272 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PPf-BI-ZxE"> | |
| 273 | 273 | <rect key="frame" x="0.0" y="100" width="375" height="50"/> |
| 274 | 274 | <subviews> |
| 275 | - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入您收到的验证码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="dtg-hq-Nhp"> | |
| 275 | + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请重复您输入的新密码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Qzh-5W-Fdl"> | |
| 276 | + <rect key="frame" x="20" y="16.5" width="335" height="17"/> | |
| 277 | + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | |
| 278 | + <nil key="textColor"/> | |
| 279 | + <fontDescription key="fontDescription" type="system" pointSize="14"/> | |
| 280 | + <textInputTraits key="textInputTraits"/> | |
| 281 | + <connections> | |
| 282 | + <outlet property="delegate" destination="HIn-e8-Pzh" id="3FT-zT-ACD"/> | |
| 283 | + </connections> | |
| 284 | + </textField> | |
| 285 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g5c-gx-Rlr"> | |
| 286 | + <rect key="frame" x="16" y="49" width="343" height="1"/> | |
| 287 | + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | |
| 288 | + <color key="backgroundColor" red="0.93503493069999999" green="0.93562394380000002" blue="0.96585971120000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | |
| 289 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | |
| 290 | + <nil key="textColor"/> | |
| 291 | + <nil key="highlightedColor"/> | |
| 292 | + </label> | |
| 293 | + </subviews> | |
| 294 | + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | |
| 295 | + <constraints> | |
| 296 | + <constraint firstAttribute="height" constant="50" id="jT7-Bv-YA6"/> | |
| 297 | + </constraints> | |
| 298 | + </view> | |
| 299 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YjI-UW-Ova"> | |
| 300 | + <rect key="frame" x="0.0" y="150" width="375" height="50"/> | |
| 301 | + <subviews> | |
| 302 | + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入您收到的验证码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="dtg-hq-Nhp"> | |
| 276 | 303 | <rect key="frame" x="20" y="17" width="147" height="17"/> |
| 304 | + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | |
| 277 | 305 | <nil key="textColor"/> |
| 278 | 306 | <fontDescription key="fontDescription" type="system" pointSize="14"/> |
| 279 | 307 | <textInputTraits key="textInputTraits" keyboardType="numberPad"/> |
| ... | ... | @@ -281,18 +309,17 @@ |
| 281 | 309 | <outlet property="delegate" destination="HIn-e8-Pzh" id="Rk2-Rg-WTc"/> |
| 282 | 310 | </connections> |
| 283 | 311 | </textField> |
| 284 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lFa-PY-Lg1"> | |
| 312 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lFa-PY-Lg1"> | |
| 285 | 313 | <rect key="frame" x="16" y="49" width="343" height="1"/> |
| 314 | + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | |
| 286 | 315 | <color key="backgroundColor" red="0.93503493069999999" green="0.93562394380000002" blue="0.96585971120000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 287 | - <constraints> | |
| 288 | - <constraint firstAttribute="height" constant="1" id="Lfw-Yi-UtD"/> | |
| 289 | - </constraints> | |
| 290 | 316 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 291 | 317 | <nil key="textColor"/> |
| 292 | 318 | <nil key="highlightedColor"/> |
| 293 | 319 | </label> |
| 294 | - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="i2a-hL-oad"> | |
| 320 | + <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="i2a-hL-oad"> | |
| 295 | 321 | <rect key="frame" x="274" y="10" width="85" height="30"/> |
| 322 | + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | |
| 296 | 323 | <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/> |
| 297 | 324 | <state key="normal" title=" 获取验证码 "> |
| 298 | 325 | <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| ... | ... | @@ -304,22 +331,15 @@ |
| 304 | 331 | </subviews> |
| 305 | 332 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 306 | 333 | <constraints> |
| 307 | - <constraint firstItem="i2a-hL-oad" firstAttribute="centerY" secondItem="YjI-UW-Ova" secondAttribute="centerY" id="6tN-tx-hH2"/> | |
| 308 | - <constraint firstItem="lFa-PY-Lg1" firstAttribute="leading" secondItem="YjI-UW-Ova" secondAttribute="leading" constant="16" id="AUg-bg-Q14"/> | |
| 309 | - <constraint firstAttribute="bottom" secondItem="lFa-PY-Lg1" secondAttribute="bottom" id="KLR-8O-Gec"/> | |
| 310 | - <constraint firstItem="dtg-hq-Nhp" firstAttribute="leading" secondItem="YjI-UW-Ova" secondAttribute="leading" constant="20" id="Tbt-To-MnF"/> | |
| 311 | - <constraint firstItem="lFa-PY-Lg1" firstAttribute="centerX" secondItem="YjI-UW-Ova" secondAttribute="centerX" id="UMn-tr-iSe"/> | |
| 312 | - <constraint firstAttribute="height" constant="50" id="Zdw-rZ-eCg"/> | |
| 313 | - <constraint firstAttribute="trailing" secondItem="i2a-hL-oad" secondAttribute="trailing" constant="16" id="nhQ-oH-HBd"/> | |
| 314 | - <constraint firstItem="dtg-hq-Nhp" firstAttribute="centerY" secondItem="YjI-UW-Ova" secondAttribute="centerY" id="pYp-kV-v06"/> | |
| 315 | - <constraint firstItem="i2a-hL-oad" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="dtg-hq-Nhp" secondAttribute="trailing" constant="8" id="tCf-jM-Z0F"/> | |
| 334 | + <constraint firstAttribute="height" constant="50" id="FXG-ec-5Cr"/> | |
| 316 | 335 | </constraints> |
| 317 | 336 | </view> |
| 318 | 337 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DSL-73-rUm"> |
| 319 | - <rect key="frame" x="0.0" y="0.0" width="375" height="50"/> | |
| 338 | + <rect key="frame" x="0.0" y="50" width="375" height="50"/> | |
| 320 | 339 | <subviews> |
| 321 | - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入新密码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="KOX-8X-bEC"> | |
| 340 | + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入新密码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="KOX-8X-bEC"> | |
| 322 | 341 | <rect key="frame" x="20" y="17" width="335" height="17"/> |
| 342 | + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | |
| 323 | 343 | <nil key="textColor"/> |
| 324 | 344 | <fontDescription key="fontDescription" type="system" pointSize="14"/> |
| 325 | 345 | <textInputTraits key="textInputTraits"/> |
| ... | ... | @@ -327,12 +347,10 @@ |
| 327 | 347 | <outlet property="delegate" destination="HIn-e8-Pzh" id="JRe-kh-lW4"/> |
| 328 | 348 | </connections> |
| 329 | 349 | </textField> |
| 330 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xNz-Dn-QcJ"> | |
| 350 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xNz-Dn-QcJ"> | |
| 331 | 351 | <rect key="frame" x="16" y="49" width="343" height="1"/> |
| 352 | + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | |
| 332 | 353 | <color key="backgroundColor" red="0.93503493069999999" green="0.93562394380000002" blue="0.96585971120000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 333 | - <constraints> | |
| 334 | - <constraint firstAttribute="height" constant="1" id="jO2-yd-Lfd"/> | |
| 335 | - </constraints> | |
| 336 | 354 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 337 | 355 | <nil key="textColor"/> |
| 338 | 356 | <nil key="highlightedColor"/> |
| ... | ... | @@ -340,32 +358,26 @@ |
| 340 | 358 | </subviews> |
| 341 | 359 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 342 | 360 | <constraints> |
| 343 | - <constraint firstAttribute="height" constant="50" id="CLT-v4-ZkO"/> | |
| 344 | - <constraint firstItem="KOX-8X-bEC" firstAttribute="centerX" secondItem="DSL-73-rUm" secondAttribute="centerX" id="M4r-zi-VnB"/> | |
| 345 | - <constraint firstItem="xNz-Dn-QcJ" firstAttribute="centerX" secondItem="DSL-73-rUm" secondAttribute="centerX" id="iTN-UG-68h"/> | |
| 346 | - <constraint firstItem="KOX-8X-bEC" firstAttribute="leading" secondItem="DSL-73-rUm" secondAttribute="leading" constant="20" id="nTe-NB-Iit"/> | |
| 347 | - <constraint firstAttribute="bottom" secondItem="xNz-Dn-QcJ" secondAttribute="bottom" id="o8H-LN-340"/> | |
| 348 | - <constraint firstItem="KOX-8X-bEC" firstAttribute="centerY" secondItem="DSL-73-rUm" secondAttribute="centerY" id="oJc-1J-siL"/> | |
| 349 | - <constraint firstItem="xNz-Dn-QcJ" firstAttribute="leading" secondItem="DSL-73-rUm" secondAttribute="leading" constant="16" id="uSC-7n-UlI"/> | |
| 361 | + <constraint firstAttribute="height" constant="50" id="6rp-3e-2Q1"/> | |
| 350 | 362 | </constraints> |
| 351 | 363 | </view> |
| 352 | - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PPf-BI-ZxE"> | |
| 353 | - <rect key="frame" x="0.0" y="50" width="375" height="50"/> | |
| 364 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="b6X-Hs-kwP"> | |
| 365 | + <rect key="frame" x="0.0" y="0.0" width="375" height="50"/> | |
| 354 | 366 | <subviews> |
| 355 | - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请重复您输入的新密码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Qzh-5W-Fdl"> | |
| 356 | - <rect key="frame" x="20" y="16.5" width="335" height="17"/> | |
| 367 | + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入新密码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="bQy-pc-aag"> | |
| 368 | + <rect key="frame" x="20" y="17" width="335" height="17"/> | |
| 357 | 369 | <nil key="textColor"/> |
| 358 | 370 | <fontDescription key="fontDescription" type="system" pointSize="14"/> |
| 359 | 371 | <textInputTraits key="textInputTraits"/> |
| 360 | 372 | <connections> |
| 361 | - <outlet property="delegate" destination="HIn-e8-Pzh" id="3FT-zT-ACD"/> | |
| 373 | + <outlet property="delegate" destination="HIn-e8-Pzh" id="rhk-6o-2mE"/> | |
| 362 | 374 | </connections> |
| 363 | 375 | </textField> |
| 364 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g5c-gx-Rlr"> | |
| 376 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="As7-aB-uJz"> | |
| 365 | 377 | <rect key="frame" x="16" y="49" width="343" height="1"/> |
| 366 | 378 | <color key="backgroundColor" red="0.93503493069999999" green="0.93562394380000002" blue="0.96585971120000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 367 | 379 | <constraints> |
| 368 | - <constraint firstAttribute="height" constant="1" id="h8G-PP-6FW"/> | |
| 380 | + <constraint firstAttribute="height" constant="1" id="YZY-7C-lLF"/> | |
| 369 | 381 | </constraints> |
| 370 | 382 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 371 | 383 | <nil key="textColor"/> |
| ... | ... | @@ -374,55 +386,59 @@ |
| 374 | 386 | </subviews> |
| 375 | 387 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 376 | 388 | <constraints> |
| 377 | - <constraint firstItem="Qzh-5W-Fdl" firstAttribute="centerX" secondItem="PPf-BI-ZxE" secondAttribute="centerX" id="ACg-OY-kid"/> | |
| 378 | - <constraint firstItem="g5c-gx-Rlr" firstAttribute="centerX" secondItem="PPf-BI-ZxE" secondAttribute="centerX" id="GIy-fQ-NqG"/> | |
| 379 | - <constraint firstAttribute="bottom" secondItem="g5c-gx-Rlr" secondAttribute="bottom" id="VsV-v8-cnP"/> | |
| 380 | - <constraint firstItem="Qzh-5W-Fdl" firstAttribute="leading" secondItem="PPf-BI-ZxE" secondAttribute="leading" constant="20" id="XxL-fd-Xdk"/> | |
| 381 | - <constraint firstAttribute="height" constant="50" id="Z4s-6F-BRm"/> | |
| 382 | - <constraint firstItem="Qzh-5W-Fdl" firstAttribute="centerY" secondItem="PPf-BI-ZxE" secondAttribute="centerY" id="bP8-Ie-B5l"/> | |
| 383 | - <constraint firstItem="g5c-gx-Rlr" firstAttribute="leading" secondItem="PPf-BI-ZxE" secondAttribute="leading" constant="16" id="mJw-dS-wNd"/> | |
| 389 | + <constraint firstItem="bQy-pc-aag" firstAttribute="leading" secondItem="b6X-Hs-kwP" secondAttribute="leading" constant="20" id="8Zj-WD-Ht9"/> | |
| 390 | + <constraint firstItem="As7-aB-uJz" firstAttribute="leading" secondItem="b6X-Hs-kwP" secondAttribute="leading" constant="16" id="S5q-5s-bTi"/> | |
| 391 | + <constraint firstItem="bQy-pc-aag" firstAttribute="centerY" secondItem="b6X-Hs-kwP" secondAttribute="centerY" id="amW-6X-3Oh"/> | |
| 392 | + <constraint firstItem="bQy-pc-aag" firstAttribute="centerX" secondItem="b6X-Hs-kwP" secondAttribute="centerX" id="cQF-lz-fTW"/> | |
| 393 | + <constraint firstAttribute="bottom" secondItem="As7-aB-uJz" secondAttribute="bottom" id="klD-53-Tse"/> | |
| 394 | + <constraint firstAttribute="trailing" secondItem="As7-aB-uJz" secondAttribute="trailing" constant="16" id="nEn-CT-udb"/> | |
| 395 | + <constraint firstAttribute="height" constant="50" id="xsq-cP-2jd"/> | |
| 384 | 396 | </constraints> |
| 385 | 397 | </view> |
| 386 | 398 | </subviews> |
| 387 | 399 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 388 | 400 | <constraints> |
| 389 | - <constraint firstAttribute="trailing" secondItem="YjI-UW-Ova" secondAttribute="trailing" id="4og-BG-yQ2"/> | |
| 390 | - <constraint firstItem="YjI-UW-Ova" firstAttribute="top" secondItem="PPf-BI-ZxE" secondAttribute="bottom" id="EVk-W9-6ha"/> | |
| 391 | - <constraint firstAttribute="trailing" secondItem="PPf-BI-ZxE" secondAttribute="trailing" id="KSD-tV-fyr"/> | |
| 392 | - <constraint firstAttribute="height" constant="597" id="O1w-LD-ENA"/> | |
| 393 | - <constraint firstItem="DSL-73-rUm" firstAttribute="leading" secondItem="1DA-t8-OEm" secondAttribute="leading" id="P4W-fB-mdJ"/> | |
| 394 | - <constraint firstItem="PPf-BI-ZxE" firstAttribute="leading" secondItem="1DA-t8-OEm" secondAttribute="leading" id="SZy-V6-tVw"/> | |
| 395 | - <constraint firstItem="PPf-BI-ZxE" firstAttribute="top" secondItem="DSL-73-rUm" secondAttribute="bottom" id="YFk-eX-dg9"/> | |
| 396 | - <constraint firstItem="YjI-UW-Ova" firstAttribute="leading" secondItem="1DA-t8-OEm" secondAttribute="leading" id="ZW2-Ge-UHU"/> | |
| 397 | - <constraint firstItem="DSL-73-rUm" firstAttribute="top" secondItem="1DA-t8-OEm" secondAttribute="top" id="fhq-vI-7jW"/> | |
| 398 | - <constraint firstAttribute="trailing" secondItem="DSL-73-rUm" secondAttribute="trailing" id="rjR-sC-f1X"/> | |
| 401 | + <constraint firstItem="b6X-Hs-kwP" firstAttribute="leading" secondItem="1DA-t8-OEm" secondAttribute="leading" id="4O9-m4-vmA"/> | |
| 402 | + <constraint firstAttribute="trailing" secondItem="b6X-Hs-kwP" secondAttribute="trailing" id="6GM-YF-OD7"/> | |
| 403 | + <constraint firstItem="PPf-BI-ZxE" firstAttribute="leading" secondItem="1DA-t8-OEm" secondAttribute="leading" id="Bel-T4-kSe"/> | |
| 404 | + <constraint firstItem="YjI-UW-Ova" firstAttribute="leading" secondItem="1DA-t8-OEm" secondAttribute="leading" id="Cmm-WZ-IB4"/> | |
| 405 | + <constraint firstAttribute="trailing" secondItem="DSL-73-rUm" secondAttribute="trailing" id="D69-lY-bJR"/> | |
| 406 | + <constraint firstItem="DSL-73-rUm" firstAttribute="leading" secondItem="1DA-t8-OEm" secondAttribute="leading" id="FbS-0a-dMg"/> | |
| 407 | + <constraint firstItem="DSL-73-rUm" firstAttribute="top" secondItem="b6X-Hs-kwP" secondAttribute="bottom" id="O4d-f5-mOn"/> | |
| 408 | + <constraint firstItem="YjI-UW-Ova" firstAttribute="top" secondItem="PPf-BI-ZxE" secondAttribute="bottom" id="P7t-DG-nPu"/> | |
| 409 | + <constraint firstAttribute="trailing" secondItem="PPf-BI-ZxE" secondAttribute="trailing" id="P98-Vv-AYp"/> | |
| 410 | + <constraint firstItem="b6X-Hs-kwP" firstAttribute="top" secondItem="1DA-t8-OEm" secondAttribute="top" id="UJv-FM-ZVM"/> | |
| 411 | + <constraint firstAttribute="bottom" secondItem="YjI-UW-Ova" secondAttribute="bottom" id="aPa-Rc-5fd"/> | |
| 412 | + <constraint firstAttribute="height" constant="200" id="lat-Tj-mho"/> | |
| 413 | + <constraint firstAttribute="trailing" secondItem="YjI-UW-Ova" secondAttribute="trailing" id="rrx-yb-HBG"/> | |
| 414 | + <constraint firstItem="PPf-BI-ZxE" firstAttribute="top" secondItem="DSL-73-rUm" secondAttribute="bottom" id="vZr-4K-bB8"/> | |
| 399 | 415 | </constraints> |
| 400 | 416 | </view> |
| 401 | 417 | </subviews> |
| 402 | 418 | <constraints> |
| 403 | - <constraint firstAttribute="bottom" secondItem="1DA-t8-OEm" secondAttribute="bottom" id="SgU-Q9-eey"/> | |
| 404 | - <constraint firstItem="1DA-t8-OEm" firstAttribute="centerX" secondItem="8Vd-3T-3CR" secondAttribute="centerX" id="V9c-vU-aiU"/> | |
| 405 | - <constraint firstItem="1DA-t8-OEm" firstAttribute="top" secondItem="8Vd-3T-3CR" secondAttribute="top" id="c1T-M8-TiB"/> | |
| 406 | - <constraint firstItem="1DA-t8-OEm" firstAttribute="leading" secondItem="8Vd-3T-3CR" secondAttribute="leading" id="dFv-uc-gPl"/> | |
| 407 | - <constraint firstAttribute="trailing" secondItem="1DA-t8-OEm" secondAttribute="trailing" id="hCM-VP-Yxf"/> | |
| 408 | - <constraint firstAttribute="height" constant="597" id="riU-A5-eXR"/> | |
| 419 | + <constraint firstAttribute="bottom" secondItem="1DA-t8-OEm" secondAttribute="bottom" id="0BA-2y-L9t"/> | |
| 420 | + <constraint firstAttribute="trailing" secondItem="1DA-t8-OEm" secondAttribute="trailing" id="3YC-Ny-yMe"/> | |
| 421 | + <constraint firstItem="1DA-t8-OEm" firstAttribute="top" secondItem="8Vd-3T-3CR" secondAttribute="top" id="4Ms-lb-OJN"/> | |
| 422 | + <constraint firstItem="1DA-t8-OEm" firstAttribute="leading" secondItem="8Vd-3T-3CR" secondAttribute="leading" id="5fv-tv-H7s"/> | |
| 423 | + <constraint firstItem="1DA-t8-OEm" firstAttribute="centerX" secondItem="8Vd-3T-3CR" secondAttribute="centerX" id="9aj-Mg-Eki"/> | |
| 424 | + <constraint firstAttribute="height" constant="200" id="lBk-XC-8mQ"/> | |
| 409 | 425 | </constraints> |
| 410 | 426 | </scrollView> |
| 411 | - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="whH-Oe-owS"> | |
| 427 | + <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="whH-Oe-owS"> | |
| 412 | 428 | <rect key="frame" x="0.0" y="597" width="375" height="70"/> |
| 429 | + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | |
| 413 | 430 | <subviews> |
| 414 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kVt-8Z-dIm"> | |
| 431 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kVt-8Z-dIm"> | |
| 415 | 432 | <rect key="frame" x="0.0" y="0.0" width="375" height="1"/> |
| 433 | + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | |
| 416 | 434 | <color key="backgroundColor" red="0.93503493069999999" green="0.93562394380000002" blue="0.96585971120000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 417 | - <constraints> | |
| 418 | - <constraint firstAttribute="height" constant="1" id="sVm-Ul-Tks"/> | |
| 419 | - </constraints> | |
| 420 | 435 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 421 | 436 | <nil key="textColor"/> |
| 422 | 437 | <nil key="highlightedColor"/> |
| 423 | 438 | </label> |
| 424 | - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a1z-OP-RVi"> | |
| 439 | + <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a1z-OP-RVi"> | |
| 425 | 440 | <rect key="frame" x="50" y="11" width="274" height="48"/> |
| 441 | + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | |
| 426 | 442 | <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/> |
| 427 | 443 | <state key="normal" title="确认修改"> |
| 428 | 444 | <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| ... | ... | @@ -433,27 +449,13 @@ |
| 433 | 449 | </button> |
| 434 | 450 | </subviews> |
| 435 | 451 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 436 | - <constraints> | |
| 437 | - <constraint firstAttribute="height" constant="70" id="2q1-vd-aIj"/> | |
| 438 | - <constraint firstItem="a1z-OP-RVi" firstAttribute="top" secondItem="kVt-8Z-dIm" secondAttribute="bottom" constant="10" id="Cer-Vw-jgp"/> | |
| 439 | - <constraint firstItem="a1z-OP-RVi" firstAttribute="centerY" secondItem="whH-Oe-owS" secondAttribute="centerY" id="JRI-y7-sxw"/> | |
| 440 | - <constraint firstItem="kVt-8Z-dIm" firstAttribute="top" secondItem="whH-Oe-owS" secondAttribute="top" id="TJw-qg-Xj5"/> | |
| 441 | - <constraint firstAttribute="trailing" secondItem="kVt-8Z-dIm" secondAttribute="trailing" id="Yft-zB-u6I"/> | |
| 442 | - <constraint firstItem="kVt-8Z-dIm" firstAttribute="leading" secondItem="whH-Oe-owS" secondAttribute="leading" id="Yyc-Md-Jf6"/> | |
| 443 | - <constraint firstItem="a1z-OP-RVi" firstAttribute="leading" secondItem="whH-Oe-owS" secondAttribute="leading" constant="50" id="bj3-p2-4Ev"/> | |
| 444 | - <constraint firstItem="a1z-OP-RVi" firstAttribute="centerX" secondItem="whH-Oe-owS" secondAttribute="centerX" id="wX9-9q-dFe"/> | |
| 445 | - </constraints> | |
| 446 | 452 | </view> |
| 447 | 453 | </subviews> |
| 448 | 454 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 449 | 455 | <constraints> |
| 450 | - <constraint firstItem="whH-Oe-owS" firstAttribute="top" secondItem="8Vd-3T-3CR" secondAttribute="bottom" id="71h-u4-NXV"/> | |
| 451 | - <constraint firstAttribute="trailing" secondItem="8Vd-3T-3CR" secondAttribute="trailing" id="9MH-8S-tRA"/> | |
| 452 | - <constraint firstItem="whH-Oe-owS" firstAttribute="leading" secondItem="bs0-1B-XZt" secondAttribute="leading" id="B4t-9D-S3Q"/> | |
| 453 | - <constraint firstItem="8Vd-3T-3CR" firstAttribute="leading" secondItem="bs0-1B-XZt" secondAttribute="leading" id="H8g-fx-ewt"/> | |
| 454 | - <constraint firstItem="Gxk-Dg-G3D" firstAttribute="top" secondItem="whH-Oe-owS" secondAttribute="bottom" id="LnM-uu-3er"/> | |
| 455 | - <constraint firstItem="8Vd-3T-3CR" firstAttribute="top" secondItem="bs0-1B-XZt" secondAttribute="top" id="MkB-mh-yZy"/> | |
| 456 | - <constraint firstAttribute="trailing" secondItem="whH-Oe-owS" secondAttribute="trailing" id="uLu-dR-hbo"/> | |
| 456 | + <constraint firstAttribute="trailing" secondItem="8Vd-3T-3CR" secondAttribute="trailing" id="AAa-wY-U8j"/> | |
| 457 | + <constraint firstItem="8Vd-3T-3CR" firstAttribute="top" secondItem="bs0-1B-XZt" secondAttribute="top" id="bPf-qx-Igd"/> | |
| 458 | + <constraint firstItem="8Vd-3T-3CR" firstAttribute="leading" secondItem="bs0-1B-XZt" secondAttribute="leading" id="laP-eB-Tfw"/> | |
| 457 | 459 | </constraints> |
| 458 | 460 | <connections> |
| 459 | 461 | <action selector="editKeyboard:" destination="HIn-e8-Pzh" eventType="touchUpInside" id="Gqe-4a-Nym"/> |
| ... | ... | @@ -463,7 +465,6 @@ |
| 463 | 465 | <outlet property="agrenPasswordTextFiled" destination="Qzh-5W-Fdl" id="NIs-ap-xHZ"/> |
| 464 | 466 | <outlet property="passwordTextFiled" destination="KOX-8X-bEC" id="Rd7-u2-mLM"/> |
| 465 | 467 | <outlet property="scrollView" destination="8Vd-3T-3CR" id="dEo-pi-u7a"/> |
| 466 | - <outlet property="scrollViewHeight" destination="riU-A5-eXR" id="ihQ-Ne-Y5c"/> | |
| 467 | 468 | <outlet property="userCodeTextFiled" destination="dtg-hq-Nhp" id="ZYP-US-SH2"/> |
| 468 | 469 | </connections> |
| 469 | 470 | </viewController> | ... | ... |
YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift
| ... | ... | @@ -23,6 +23,7 @@ class UserViewController: UIViewController { |
| 23 | 23 | super.viewDidLoad() |
| 24 | 24 | self.configTheme() |
| 25 | 25 | self.navigationItem.rightBarButtonItem = UIBarButtonItem(image: #imageLiteral(resourceName: "radio_s"), style: .plain, target: self, action: #selector(UserViewController.editBtnClick)) |
| 26 | + self.automaticallyAdjustsScrollViewInsets = false | |
| 26 | 27 | setUserInfor() |
| 27 | 28 | // Do any additional setup after loading the view. |
| 28 | 29 | } |
| ... | ... | @@ -60,10 +61,10 @@ class UserViewController: UIViewController { |
| 60 | 61 | historyList.reloadData() |
| 61 | 62 | } |
| 62 | 63 | |
| 63 | - override func viewWillAppear(_ animated: Bool) { | |
| 64 | - super.viewWillAppear(animated) | |
| 65 | - self.tabBarController?.tabBar.isHidden = false | |
| 66 | - } | |
| 64 | +// override func viewWillAppear(_ animated: Bool) { | |
| 65 | +// super.viewWillAppear(animated) | |
| 66 | +// self.tabBarController?.tabBar.isHidden = false | |
| 67 | +// } | |
| 67 | 68 | |
| 68 | 69 | /* |
| 69 | 70 | // MARK: - Navigation |
| ... | ... | @@ -148,9 +149,11 @@ extension UserViewController:UITableViewDelegate,UITableViewDataSource{ |
| 148 | 149 | return 44 |
| 149 | 150 | } |
| 150 | 151 | |
| 151 | - func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat { | |
| 152 | - return 1 | |
| 152 | + override func viewWillAppear(_ animated: Bool) { | |
| 153 | + super.viewWillAppear(animated) | |
| 154 | + self.tabBarController?.tabBar.isHidden = false | |
| 153 | 155 | } |
| 156 | + | |
| 154 | 157 | |
| 155 | 158 | } |
| 156 | 159 | ... | ... |