Browse Source

修改机构按钮渐变色和部分切图替换

Steven 11 months ago
parent
commit
5df7c9fd38
22 changed files with 67 additions and 37 deletions
  1. 1 1
      KulexiuForStudent/KulexiuForStudent.xcodeproj/xcshareddata/xcschemes/KulexiuForStudent.xcscheme
  2. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Chat/search_red.imageset/search_red@2x.png
  3. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Chat/search_red.imageset/search_red@3x.png
  4. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/institution_ToolImage.imageset/institution_ToolImage@2x.png
  5. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/institution_ToolImage.imageset/institution_ToolImage@3x.png
  6. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/institution_mineToolDetail.imageset/institution_mineToolDetail@2x.png
  7. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/institution_mineToolDetail.imageset/institution_mineToolDetail@3x.png
  8. 4 4
      KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/InstitutionMineBodyView.xib
  9. 5 2
      KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/SettingBottomView.m
  10. 6 1
      KulexiuForStudent/KulexiuForStudent/Module/Chat/Group/View/GroupSettingBodyView.m
  11. 5 5
      KulexiuForStudent/KulexiuForStudent/Module/Chat/Group/View/GroupSettingBodyView.xib
  12. 6 1
      KulexiuForStudent/KulexiuForStudent/Module/Chat/View/KSChatListSearchView.m
  13. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Feedback/View/FeedbackBodyView.m
  14. 5 1
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/Controller/ModifyPhoneChangeController.m
  15. 5 4
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/Controller/ModifyPhoneCheckController.m
  16. 5 1
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/DeleteAccount/Controller/AccountDeleteViewController.m
  17. 0 2
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/DeleteAccount/View/DeleteAccountBodyView.m
  18. 5 1
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/View/PasswordModify/ForgetPasswordBodyView.m
  19. 4 2
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/View/PasswordModify/PasswordCheckBodyView.m
  20. 5 1
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/View/PasswordModify/PasswordModifyBodyView.m
  21. 5 5
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/View/PhoneChangeBodyView.xib
  22. 5 5
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/View/PhoneCheckBodyView.xib

+ 1 - 1
KulexiuForStudent/KulexiuForStudent.xcodeproj/xcshareddata/xcschemes/KulexiuForStudent.xcscheme

@@ -51,7 +51,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "TEST"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Chat/search_red.imageset/search_red@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Chat/search_red.imageset/search_red@3x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/institution_ToolImage.imageset/institution_ToolImage@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/institution_ToolImage.imageset/institution_ToolImage@3x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/institution_mineToolDetail.imageset/institution_mineToolDetail@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/institution_mineToolDetail.imageset/institution_mineToolDetail@3x.png


+ 4 - 4
KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/InstitutionMineBodyView.xib

@@ -137,13 +137,13 @@
                             <rect key="frame" x="19" y="216.66666666666666" width="376" height="56.999999999999972"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_ToolImage" translatesAutoresizingMaskIntoConstraints="NO" id="LC0-SH-j3j">
-                                    <rect key="frame" x="5" y="0.0" width="47" height="49"/>
+                                    <rect key="frame" x="4" y="0.0" width="47" height="49"/>
                                 </imageView>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_ToolTitle" translatesAutoresizingMaskIntoConstraints="NO" id="3mi-f7-wdo">
-                                    <rect key="frame" x="62" y="11" width="60" height="15"/>
+                                    <rect key="frame" x="61" y="11" width="60" height="15"/>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曲目训练教程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mvV-Sr-oNN">
-                                    <rect key="frame" x="62.000000000000007" y="30" width="73.666666666666686" height="17"/>
+                                    <rect key="frame" x="61.000000000000007" y="30" width="73.666666666666686" height="17"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="17" id="xic-Zn-hSL"/>
                                     </constraints>
@@ -163,7 +163,7 @@
                                 <constraint firstItem="3mi-f7-wdo" firstAttribute="leading" secondItem="mvV-Sr-oNN" secondAttribute="leading" id="2vK-eb-bjK"/>
                                 <constraint firstAttribute="trailing" secondItem="U3x-hC-8CJ" secondAttribute="trailing" id="Cy3-z6-X5r"/>
                                 <constraint firstItem="U3x-hC-8CJ" firstAttribute="top" secondItem="ps4-up-G2N" secondAttribute="top" id="EBZ-Dq-UTy"/>
-                                <constraint firstItem="LC0-SH-j3j" firstAttribute="leading" secondItem="ps4-up-G2N" secondAttribute="leading" constant="5" id="L23-Ux-Bow"/>
+                                <constraint firstItem="LC0-SH-j3j" firstAttribute="leading" secondItem="ps4-up-G2N" secondAttribute="leading" constant="4" id="L23-Ux-Bow"/>
                                 <constraint firstItem="LC0-SH-j3j" firstAttribute="top" secondItem="ps4-up-G2N" secondAttribute="top" id="Vao-c4-Sp5"/>
                                 <constraint firstAttribute="bottom" secondItem="U3x-hC-8CJ" secondAttribute="bottom" id="ZCv-TO-fQ4"/>
                                 <constraint firstAttribute="bottom" secondItem="mvV-Sr-oNN" secondAttribute="bottom" constant="10" id="cgK-6A-Li4"/>

+ 5 - 2
KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/SettingBottomView.m

@@ -19,8 +19,11 @@
 
 - (void)awakeFromNib {
     [super awakeFromNib];
-//    CAGradientLayer *buttonLayer = [UIView createGradientLayerFromColor:HexRGB(0x44C9FE) startPoint:CGPointMake(0, 0.5) endColor:HexRGB(0x259CFE) endPoint:CGPointMake(1, 0.5) bounds:CGRectMake(0, 0, KPortraitWidth - 25 *2, 44)];
-//    [self.sureButton.layer addSublayer:buttonLayer];
+    
+    if ([UserDefaultObjectForKey(TENANT_ID) integerValue] > 0) {
+        CAGradientLayer *buttonLayer = [UIView createGradientLayerFromColor:HexRGB(0xFF204B) startPoint:CGPointMake(1, 0.5) endColor:HexRGB(0xFE5B71) endPoint:CGPointMake(0, 0.5) bounds:CGRectMake(0, 0, KPortraitWidth - 25 *2, 44)];
+        [self.sureButton.layer addSublayer:buttonLayer];
+    }
 }
 
 + (instancetype)shareInstance {

+ 6 - 1
KulexiuForStudent/KulexiuForStudent/Module/Chat/Group/View/GroupSettingBodyView.m

@@ -127,11 +127,16 @@ typedef void(^ChooseMemberCallback)(NSString *targetId);
 - (void)awakeFromNib {
     [super awakeFromNib];
     self.isOn = NO;
-    [self.sureButton setBackgroundColor:CLIENT_THEMECOLOR];
+
     [self.memberView addSubview:self.memberScrollView];
     [self.memberScrollView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.top.bottom.mas_equalTo(self.memberView);
     }];
+    
+    if ([UserDefaultObjectForKey(TENANT_ID) integerValue] > 0) { // 机构
+        CAGradientLayer *colorLayer = [UIView createGradientLayerFromColor:HexRGB(0xFF204B) startPoint:CGPointMake(1, 0.5) endColor:HexRGB(0xFE5B71) endPoint:CGPointMake(0, 0.5) bounds:CGRectMake(0, 0, KPortraitWidth - 25 *2, 44)];
+        [self.sureButton.layer addSublayer:colorLayer];
+    }
 }
 
 + (instancetype)shareInstance  {

+ 5 - 5
KulexiuForStudent/KulexiuForStudent/Module/Chat/Group/View/GroupSettingBodyView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -311,7 +311,7 @@
                     </connections>
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9Zk-Ss-xf8">
-                    <rect key="frame" x="28" y="588" width="358" height="44"/>
+                    <rect key="frame" x="25" y="588" width="364" height="44"/>
                     <color key="backgroundColor" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="zlf-6G-YkC"/>
@@ -347,9 +347,9 @@
                 <constraint firstItem="hNX-kx-Qhp" firstAttribute="top" secondItem="fRV-DB-sBs" secondAttribute="bottom" constant="12" id="On8-mJ-2uf"/>
                 <constraint firstAttribute="trailing" secondItem="AOx-4a-71e" secondAttribute="trailing" id="VHK-38-OtQ"/>
                 <constraint firstAttribute="trailing" secondItem="fRV-DB-sBs" secondAttribute="trailing" id="XuH-sa-ebf"/>
-                <constraint firstItem="9Zk-Ss-xf8" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="28" id="awA-Kz-NgN"/>
+                <constraint firstItem="9Zk-Ss-xf8" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="25" id="awA-Kz-NgN"/>
                 <constraint firstAttribute="trailing" secondItem="hNX-kx-Qhp" secondAttribute="trailing" id="ilu-5a-WOE"/>
-                <constraint firstAttribute="trailing" secondItem="9Zk-Ss-xf8" secondAttribute="trailing" constant="28" id="jPR-6G-jho"/>
+                <constraint firstAttribute="trailing" secondItem="9Zk-Ss-xf8" secondAttribute="trailing" constant="25" id="jPR-6G-jho"/>
                 <constraint firstItem="aOO-cS-gdV" firstAttribute="top" secondItem="UZO-j7-eJs" secondAttribute="bottom" constant="12" id="miC-9L-nUn"/>
                 <constraint firstItem="H5y-Vp-Aux" firstAttribute="top" secondItem="0hZ-Dj-wqy" secondAttribute="bottom" id="vyf-Ns-eUM"/>
                 <constraint firstAttribute="trailing" secondItem="UZO-j7-eJs" secondAttribute="trailing" id="xBL-hk-DiD"/>

+ 6 - 1
KulexiuForStudent/KulexiuForStudent/Module/Chat/View/KSChatListSearchView.m

@@ -22,8 +22,13 @@
     [super awakeFromNib];
     self.searchField.delegate = self;
     self.searchField.tintColor = CLIENT_THEMECOLOR;
-    [self.searchButton setBackgroundColor:CLIENT_THEMEBUTTONCOLOR];
     [self.searchImg setImage:[UIImage imageNamed:CLIENT_SEARCH_IMG]];
+    
+    if ([UserDefaultObjectForKey(TENANT_ID) integerValue] > 0) { // 机构
+        CAGradientLayer *colorLayer = [UIView createGradientLayerFromColor:HexRGB(0xFF436A) startPoint:CGPointMake(1, 0.5) endColor:HexRGB(0xFF6D8B) endPoint:CGPointMake(0, 0.5) bounds:CGRectMake(0, 0, 56, 28)];
+        [self.searchButton.layer addSublayer:colorLayer];
+    }
+
 }
 
 - (void)configText:(NSString *)text {

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Mine/Feedback/View/FeedbackBodyView.m

@@ -40,7 +40,7 @@
     _emailContract.text = orgEmail;
     
     if ([UserDefault(TENANT_ID) integerValue] > 0) {
-        CAGradientLayer *titleLayer = [UIView createGradientLayerFromColor:HexRGB(0xFF204B) startPoint:CGPointMake(1, 0.5) endColor:HexRGB(0xFE5B71) endPoint:CGPointMake(0, 0.5) bounds:CGRectMake(0, 0, KPortraitWidth - 25 *2, 48)];
+        CAGradientLayer *titleLayer = [UIView createGradientLayerFromColor:HexRGB(0xFF204B) startPoint:CGPointMake(1, 0.5) endColor:HexRGB(0xFE5B71) endPoint:CGPointMake(0, 0.5) bounds:CGRectMake(0, 0, KPortraitWidth - 25 *2, 44)];
         [self.sureButton.layer addSublayer:titleLayer];
     }
     

+ 5 - 1
KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/Controller/ModifyPhoneChangeController.m

@@ -46,8 +46,12 @@
     }];
     self.bodyView.phoneField.tintColor = CLIENT_THEMECOLOR;
     self.bodyView.codeField.tintColor = CLIENT_THEMECOLOR;
-    [self.bodyView.sureButton setBackgroundColor:CLIENT_THEMECOLOR];
     [self.bodyView.codeButton setTitleColor:INS_THEMECOLOR forState:UIControlStateNormal];
+    
+    if ([UserDefault(TENANT_ID) integerValue] > 0) {
+        CAGradientLayer *colorLayer = [UIView createGradientLayerFromColor:HexRGB(0xFF204B) startPoint:CGPointMake(1, 0.5) endColor:HexRGB(0xFE5B71) endPoint:CGPointMake(0, 0.5) bounds:CGRectMake(0, 0, KPortraitWidth - 25 *2, 44)];
+        [self.bodyView.sureButton.layer addSublayer:colorLayer];
+    }
 }
 
 - (void)operationWithAction:(CHANGEACTION)action parm:(NSDictionary *)parm {

+ 5 - 4
KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/Controller/ModifyPhoneCheckController.m

@@ -24,15 +24,13 @@
     [self configUI];
 }
 
-
-
 - (void)configUI {
     self.bodyView = [PhoneCheckBodyView shareInstance];
     [self.scrollView addSubview:_bodyView];
     [_bodyView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(self.scrollView.mas_top);
         make.right.left.mas_equalTo(self.view);
-        make.height.mas_equalTo(kScreenHeight - kNaviBarHeight - iPhoneXSafeBottomMargin);
+        make.height.mas_equalTo(KPortraitHeight - kNaviBarHeight - iPhoneXSafeBottomMargin);
     }];
     MJWeakSelf;
     [_bodyView sureCallback:^(NSString * _Nonnull phoneNo, NSString * _Nonnull pwdStr) {
@@ -41,7 +39,10 @@
     
     self.bodyView.phoneField.tintColor = CLIENT_THEMECOLOR;
     self.bodyView.passwordField.tintColor = CLIENT_THEMECOLOR;
-    [self.bodyView.sureButton setBackgroundColor:CLIENT_THEMECOLOR];
+    if ([UserDefault(TENANT_ID) integerValue] > 0) {
+        CAGradientLayer *colorLayer = [UIView createGradientLayerFromColor:HexRGB(0xFF204B) startPoint:CGPointMake(1, 0.5) endColor:HexRGB(0xFE5B71) endPoint:CGPointMake(0, 0.5) bounds:CGRectMake(0, 0, KPortraitWidth - 25 *2, 44)];
+        [self.bodyView.sureButton.layer addSublayer:colorLayer];
+    }
 }
 
 - (void)checkWithPhone:(NSString *)phoneNo password:(NSString *)password {

+ 5 - 1
KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/DeleteAccount/Controller/AccountDeleteViewController.m

@@ -51,8 +51,12 @@
         [weakSelf operationWithAction:action parm:parm];
     }];
     self.bodyView.lineView.backgroundColor = CLIENT_THEMECOLOR;
-    self.bodyView.sureButton.backgroundColor = CLIENT_THEMECOLOR;
     [self.bodyView.codeButton setTitleColor:CLIENT_THEMECOLOR forState:UIControlStateNormal];
+    
+    if ([UserDefault(TENANT_ID) integerValue] > 0) {
+        CAGradientLayer *colorLayer = [UIView createGradientLayerFromColor:HexRGB(0xFF204B) startPoint:CGPointMake(1, 0.5) endColor:HexRGB(0xFE5B71) endPoint:CGPointMake(0, 0.5) bounds:CGRectMake(0, 0, KPortraitWidth - 25 *2, 44)];
+        [self.bodyView.sureButton.layer addSublayer:colorLayer];
+    }
 }
 
 - (void)operationWithAction:(DELETEACCOUNT)action parm:(NSDictionary *)parm {

+ 0 - 2
KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/DeleteAccount/View/DeleteAccountBodyView.m

@@ -35,8 +35,6 @@
     NSString *phoneDim = [self.phoneNo stringByReplacingCharactersInRange:NSMakeRange(3, 4) withString:@"****"];
     self.phoneDescLabel.text = [NSString stringWithFormat:@"将%@所绑定的账号注销",phoneDim];
     self.containerWidth.constant = KPortraitWidth - 26;
-//    self.containerHeight.constant = KPortraitHeight - kNaviBarHeight - 24 - 155;
-//    self.scroll.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
 }
 
 + (instancetype)shareInstance {

+ 5 - 1
KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/View/PasswordModify/ForgetPasswordBodyView.m

@@ -25,8 +25,12 @@
     self.codeField.delegate = self;
     NSString *phoneStr = UserDefault(PHONEKEY);
     self.phoneLabel.text = [phoneStr stringByReplacingCharactersInRange:NSMakeRange(3, 4) withString:@"****"];
-    [self.sureButton setBackgroundColor:CLIENT_THEMECOLOR];
     [self.codeButton setTitleColor:CLIENT_THEMECOLOR forState:UIControlStateNormal];
+    
+    if ([UserDefault(TENANT_ID) integerValue] > 0) {
+        CAGradientLayer *titleLayer = [UIView createGradientLayerFromColor:HexRGB(0xFF204B) startPoint:CGPointMake(1, 0.5) endColor:HexRGB(0xFE5B71) endPoint:CGPointMake(0, 0.5) bounds:CGRectMake(0, 0, KPortraitWidth - 25 *2, 44)];
+        [self.sureButton.layer addSublayer:titleLayer];
+    }
 }
 
 + (instancetype)shareInstance {

+ 4 - 2
KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/View/PasswordModify/PasswordCheckBodyView.m

@@ -32,8 +32,10 @@
     self.pwdField.delegate = self;
     NSString *phoneStr = UserDefault(PHONEKEY);
     self.phoneLabel.text = [phoneStr stringByReplacingCharactersInRange:NSMakeRange(3, 4) withString:@"****"];
-    [self.sureButton setBackgroundColor:CLIENT_THEMECOLOR];
-
+    if ([UserDefault(TENANT_ID) integerValue] > 0) {
+        CAGradientLayer *titleLayer = [UIView createGradientLayerFromColor:HexRGB(0xFF204B) startPoint:CGPointMake(1, 0.5) endColor:HexRGB(0xFE5B71) endPoint:CGPointMake(0, 0.5) bounds:CGRectMake(0, 0, KPortraitWidth - 25 *2, 44)];
+        [self.sureButton.layer addSublayer:titleLayer];
+    }
 }
 
 + (instancetype)shareInstance {

+ 5 - 1
KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/View/PasswordModify/PasswordModifyBodyView.m

@@ -43,9 +43,13 @@
     }
     NSString *phoneStr = UserDefault(PHONEKEY);
     self.phoneLabel.text = [phoneStr stringByReplacingCharactersInRange:NSMakeRange(3, 4) withString:@"****"];
-    [self.sureButton setBackgroundColor:CLIENT_THEMESORTCOLOR];
     [self.codeButton setTitleColor:CLIENT_THEMECOLOR forState:UIControlStateNormal];
     self.needVefiCode = NO;
+    
+    if ([UserDefault(TENANT_ID) integerValue] > 0) {
+        CAGradientLayer *titleLayer = [UIView createGradientLayerFromColor:HexRGB(0xFF204B) startPoint:CGPointMake(1, 0.5) endColor:HexRGB(0xFE5B71) endPoint:CGPointMake(0, 0.5) bounds:CGRectMake(0, 0, KPortraitWidth - 25 *2, 44)];
+        [self.sureButton.layer addSublayer:titleLayer];
+    }
 }
 
 + (instancetype)shareInstance {

+ 5 - 5
KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/View/PhoneChangeBodyView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -98,7 +98,7 @@
                     </userDefinedRuntimeAttributes>
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hhn-N2-gSx">
-                    <rect key="frame" x="28" y="184" width="358" height="44"/>
+                    <rect key="frame" x="25" y="184" width="364" height="44"/>
                     <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="Lq9-Fh-flN"/>
@@ -118,9 +118,9 @@
             <color key="backgroundColor" red="0.96862745100000003" green="0.96862745100000003" blue="0.97647058819999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="RoS-cA-EXT" secondAttribute="trailing" constant="13" id="m9i-US-aNw"/>
-                <constraint firstAttribute="trailing" secondItem="Hhn-N2-gSx" secondAttribute="trailing" constant="28" id="qcn-w1-5Ej"/>
+                <constraint firstAttribute="trailing" secondItem="Hhn-N2-gSx" secondAttribute="trailing" constant="25" id="qcn-w1-5Ej"/>
                 <constraint firstItem="RoS-cA-EXT" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="13" id="sLq-Qx-Do6"/>
-                <constraint firstItem="Hhn-N2-gSx" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="28" id="sTM-i7-yIC"/>
+                <constraint firstItem="Hhn-N2-gSx" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="25" id="sTM-i7-yIC"/>
                 <constraint firstItem="RoS-cA-EXT" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="12" id="sXB-iX-5dK"/>
                 <constraint firstItem="Hhn-N2-gSx" firstAttribute="top" secondItem="RoS-cA-EXT" secondAttribute="bottom" constant="30" id="yXV-xr-pCy"/>
             </constraints>

+ 5 - 5
KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/View/PhoneCheckBodyView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -83,7 +83,7 @@
                     </userDefinedRuntimeAttributes>
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fVz-og-KBl">
-                    <rect key="frame" x="28" y="158" width="358" height="44"/>
+                    <rect key="frame" x="25" y="158" width="364" height="44"/>
                     <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="Ur1-jX-Eqx"/>
@@ -104,8 +104,8 @@
             <constraints>
                 <constraint firstItem="FXn-f6-216" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="13" id="7Pj-is-BvV"/>
                 <constraint firstAttribute="trailing" secondItem="FXn-f6-216" secondAttribute="trailing" constant="13" id="9mT-vG-Txt"/>
-                <constraint firstItem="fVz-og-KBl" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="28" id="Lez-g5-UqH"/>
-                <constraint firstAttribute="trailing" secondItem="fVz-og-KBl" secondAttribute="trailing" constant="28" id="Lwj-xZ-f2D"/>
+                <constraint firstItem="fVz-og-KBl" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="25" id="Lez-g5-UqH"/>
+                <constraint firstAttribute="trailing" secondItem="fVz-og-KBl" secondAttribute="trailing" constant="25" id="Lwj-xZ-f2D"/>
                 <constraint firstItem="fVz-og-KBl" firstAttribute="top" secondItem="FXn-f6-216" secondAttribute="bottom" constant="30" id="qZx-6p-Wk2"/>
                 <constraint firstItem="FXn-f6-216" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="12" id="w86-kI-L7w"/>
             </constraints>