部分修复

SLAiELTS/Pods/ZLPhotoBrowser/ZLPhotoBrowser/PhotoBrowser/resource/ZLPhotoActionSheet.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -54,7 +54,7 @@
                             <constraints>
                                 <constraint firstAttribute="height" constant="60" id="J9w-f7-IG8"/>
                             </constraints>
-                            <state key="normal" title="相册">
+                            <state key="normal" title="选择照片">
                                 <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </state>
                             <connections>
@@ -133,7 +133,7 @@
                     </variation>
                 </view>
             </subviews>
-            <color key="backgroundColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="0.14999999999999999" colorSpace="custom" customColorSpace="sRGB"/>
+            <color key="backgroundColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstAttribute="bottom" secondItem="NwQ-VQ-65C" secondAttribute="bottom" id="4AE-LH-xns"/>
                 <constraint firstItem="NwQ-VQ-65C" firstAttribute="leading" secondItem="uFx-aZ-mnT" secondAttribute="leading" id="Wlz-Qi-izY"/>

SLAiELTS/SLAiELTS/AppMarcos/YMConstMacro.h

@@ -102,4 +102,8 @@
 
 #define SL333Color      SLColor(@"#333333")
 
+#define SLColF5F8F7      SLColor(@"#F5F8F7")
+
+#define SLCol8E8E93      SLColor(@"#8E8E93")
+
 #endif /* YMConstMacro_h */

SLAiELTS/SLAiELTS/ViewControllers/FriendsVC/SLFriendPowerVc.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -22,16 +22,16 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="04G-yj-1zc">
-                    <rect key="frame" x="0.0" y="91" width="390" height="50"/>
+                    <rect key="frame" x="0.0" y="127" width="390" height="50"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="不让他看我" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZIE-oe-mQI">
                             <rect key="frame" x="16" y="16" width="76.666666666666671" height="18"/>
                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                            <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="0.84705882349999995" colorSpace="calibratedRGB"/>
+                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="0.84705882349999995" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="euq-ud-HFa">
-                            <rect key="frame" x="329" y="9.6666666666666714" width="51" height="31"/>
+                            <rect key="frame" x="329" y="9.6666666666666572" width="51" height="31"/>
                             <color key="onTintColor" red="0.086274509799999996" green="0.46666666670000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <connections>
                                 <action selector="toMe:" destination="-1" eventType="valueChanged" id="EYF-lU-btw"/>
@@ -48,12 +48,12 @@
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="10a-4x-HMD">
-                    <rect key="frame" x="0.0" y="142" width="390" height="50"/>
+                    <rect key="frame" x="0.0" y="178" width="390" height="50"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="不看他" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Laq-QC-DXQ">
                             <rect key="frame" x="16" y="16" width="46" height="18"/>
                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                            <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="0.84705882349999995" colorSpace="calibratedRGB"/>
+                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="0.84552425415759502" colorSpace="custom" customColorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fP7-RY-erz">
@@ -73,19 +73,27 @@
                         <constraint firstAttribute="height" constant="50" id="niz-N9-Nzx"/>
                     </constraints>
                 </view>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="朋友圈和状态" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ipe-2D-Ljk">
+                    <rect key="frame" x="16" y="108.66666666666667" width="73.666666666666671" height="14.333333333333329"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                    <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="0.84705882349999995" colorSpace="calibratedRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
             </subviews>
             <viewLayoutGuide key="safeArea" id="Q5M-cg-NOt"/>
             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
             <constraints>
                 <constraint firstItem="04G-yj-1zc" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" id="2Q4-Va-0tE"/>
-                <constraint firstItem="04G-yj-1zc" firstAttribute="top" secondItem="Q5M-cg-NOt" secondAttribute="top" constant="44" id="6L9-QM-kYn">
+                <constraint firstItem="04G-yj-1zc" firstAttribute="top" secondItem="Q5M-cg-NOt" secondAttribute="top" constant="80" id="6L9-QM-kYn">
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="boolean" keyPath="safeAreaTop" value="YES"/>
                     </userDefinedRuntimeAttributes>
                 </constraint>
+                <constraint firstItem="Ipe-2D-Ljk" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="16" id="9oq-LJ-fLT"/>
                 <constraint firstItem="10a-4x-HMD" firstAttribute="trailing" secondItem="Q5M-cg-NOt" secondAttribute="trailing" id="ItY-Zk-oia"/>
                 <constraint firstItem="10a-4x-HMD" firstAttribute="top" secondItem="04G-yj-1zc" secondAttribute="bottom" constant="1" id="Lwk-Pf-vOZ"/>
                 <constraint firstItem="10a-4x-HMD" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" id="Ro6-Zw-XPF"/>
+                <constraint firstItem="04G-yj-1zc" firstAttribute="top" secondItem="Ipe-2D-Ljk" secondAttribute="bottom" constant="4" id="T9J-VC-U1v"/>
                 <constraint firstItem="04G-yj-1zc" firstAttribute="trailing" secondItem="Q5M-cg-NOt" secondAttribute="trailing" id="vhX-ql-gs7"/>
             </constraints>
             <point key="canvasLocation" x="138" y="-1"/>

SLAiELTS/SLAiELTS/ViewControllers/FriendsVC/Views/SLRemidLookView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -12,7 +12,7 @@
             <connections>
                 <outlet property="contentView" destination="iN0-l3-epB" id="2MQ-Ig-HK4"/>
                 <outlet property="scrollView" destination="Ku5-sg-uNZ" id="XWE-ff-1uF"/>
-                <outlet property="selBtn" destination="Xkq-la-Ipb" id="Gqy-hj-Lgw"/>
+                <outlet property="selBtn" destination="IiY-YT-Ypo" id="yPY-uP-AMD"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@@ -43,13 +43,21 @@
                     <viewLayoutGuide key="contentLayoutGuide" id="mlI-aQ-UHn"/>
                     <viewLayoutGuide key="frameLayoutGuide" id="5AI-CX-1Q7"/>
                 </scrollView>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IiY-YT-Ypo">
+                    <rect key="frame" x="0.0" y="0.0" width="795" height="101"/>
+                    <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                </button>
             </subviews>
             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
             <constraints>
                 <constraint firstItem="Xkq-la-Ipb" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="47s-Ai-jnS"/>
                 <constraint firstItem="1AX-fE-qPS" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="5Mz-LK-UDE"/>
+                <constraint firstItem="IiY-YT-Ypo" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="91w-me-HhA"/>
                 <constraint firstItem="1AX-fE-qPS" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="16" id="CNs-9d-gJv"/>
                 <constraint firstItem="Xkq-la-Ipb" firstAttribute="leading" secondItem="Ku5-sg-uNZ" secondAttribute="trailing" constant="20" id="CZd-wj-eaE"/>
+                <constraint firstItem="IiY-YT-Ypo" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="DY1-pI-wOH"/>
+                <constraint firstAttribute="bottom" secondItem="IiY-YT-Ypo" secondAttribute="bottom" id="Dkp-d6-s8W"/>
+                <constraint firstAttribute="trailing" secondItem="IiY-YT-Ypo" secondAttribute="trailing" id="Gwb-gN-mus"/>
                 <constraint firstAttribute="trailing" secondItem="Xkq-la-Ipb" secondAttribute="trailing" constant="16" id="PqO-RH-F5f"/>
                 <constraint firstItem="Ku5-sg-uNZ" firstAttribute="leading" secondItem="1AX-fE-qPS" secondAttribute="trailing" constant="12" id="UB2-a7-G1j"/>
                 <constraint firstItem="Ku5-sg-uNZ" firstAttribute="centerY" secondItem="1AX-fE-qPS" secondAttribute="centerY" id="V0D-yp-J2g"/>

SLAiELTS/SLAiELTS/ViewControllers/LoginVC/SLLoginVCViewController.xib

@@ -178,7 +178,7 @@
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                    <state key="normal" title="登录" backgroundImage="icon_btn_blue">
+                    <state key="normal" title="登 录" backgroundImage="icon_btn_blue">
                         <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </state>
                     <state key="selected" backgroundImage="icon_btn_blue_sel"/>

SLAiELTS/SLAiELTS/ViewControllers/LoginVC/SLRegistViewController.xib

@@ -148,7 +148,7 @@
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                    <state key="normal" title="注册并登陆" backgroundImage="icon_btn_blue">
+                    <state key="normal" title="注册并登录" backgroundImage="icon_btn_blue">
                         <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </state>
                     <state key="selected" backgroundImage="icon_btn_blue_sel"/>

SLAiELTS/SLAiELTS/ViewControllers/MessageVC/Views/YMChatBottomView.m

@@ -154,7 +154,7 @@ static const NSInteger btnTag = 20000;
     if (!_nextGrowingTextView) {
         _nextGrowingTextView = [[YMNextGrowingTextView alloc] initWithFrame:CGRectMake(0, 0, kSCREEN_WIDTH - 160, 40)];
         _nextGrowingTextView.backgroundColor = [UIColor whiteColor];
-        _nextGrowingTextView.placeholderAttributedText = [[NSAttributedString alloc] initWithString:@"请输入关键词" attributes:@{NSFontAttributeName: [UIFont fontWithName:@"PingFang SC" size: 16], NSForegroundColorAttributeName : SLColor(@"#999999")}];
+        _nextGrowingTextView.placeholderAttributedText = [[NSAttributedString alloc] initWithString:@" " attributes:@{NSFontAttributeName: [UIFont fontWithName:@"PingFang SC" size: 16], NSForegroundColorAttributeName : SLColor(@"#999999")}];
         _nextGrowingTextView.layer.cornerRadius = 4.0;
         _nextGrowingTextView.maxNumberOfLines = 6;
         _nextGrowingTextView.hidden = YES;

SLAiELTS/SLAiELTS/ViewControllers/Moments/MomentsVc/SLCreatMomentsVc.xib

@@ -28,7 +28,11 @@
                     <rect key="frame" x="16" y="97" width="358" height="160"/>
                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="160" id="SNa-oE-Y4I"/>
+                        <constraint firstAttribute="height" constant="160" id="SNa-oE-Y4I">
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="boolean" keyPath="adapterScreen" value="YES"/>
+                            </userDefinedRuntimeAttributes>
+                        </constraint>
                     </constraints>
                     <connections>
                         <outlet property="delegate" destination="-1" id="Hv4-xL-rFm"/>

SLAiELTS/SLAiELTS/ViewControllers/MyVC/Models/SLImagePickerAndUpload.m

@@ -14,7 +14,7 @@
 - (void)willShowActionSheet
 {
     WS(weakSelf);
-    [SLCustomizeAlert showBottomAletrWithTitles:@[@"相机", @"相册"] cancelTitle:@"取消" buttonIndex:^(NSInteger index) {
+    [SLCustomizeAlert showBottomAletrWithTitles:@[@"拍照", @"选择照片"] cancelTitle:@"取消" buttonIndex:^(NSInteger index) {
         switch (index) {
             case 0:
             {

SLAiELTS/SLAiELTS/ViewControllers/MyVC/VCs/SLFeedbackVc.m

@@ -54,7 +54,7 @@
         [pickView show];
     }];
     
-    self.photoBrowerView.maxSelectCount = 4;
+    self.photoBrowerView.maxSelectCount = 3;
 //    self.photoBrowerView.lineCount = 4;
     self.photoBrowerModels = [NSMutableArray array];
     self.photoBrowerView.dataArray = self.photoBrowerModels;

SLAiELTS/SLAiELTS/ViewControllers/MyVC/VCs/SLFeedbackVc.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -102,17 +102,17 @@
                         <constraint firstAttribute="height" constant="50" id="y1f-in-y4p"/>
                     </constraints>
                 </view>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ekj-c6-l90">
+                <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ekj-c6-l90">
                     <rect key="frame" x="12" y="567.33333333333337" width="366" height="50"/>
-                    <color key="backgroundColor" red="0.086274509799999996" green="0.46666666670000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="50" id="oOH-83-KJK"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                    <state key="normal" title="确  定">
+                    <state key="normal" title="提 交" backgroundImage="icon_btn_blue">
                         <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </state>
+                    <state key="highlighted" backgroundImage="icon_btn_blue_sel"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
                             <integer key="value" value="25"/>
@@ -176,6 +176,8 @@
         </view>
     </objects>
     <resources>
+        <image name="icon_btn_blue" width="855" height="168"/>
+        <image name="icon_btn_blue_sel" width="854" height="165"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

SLAiELTS/SLAiELTS/ViewControllers/MyVC/Views/Cells/SLMeHeaderCollectionViewCell.m

@@ -139,7 +139,7 @@ static const NSInteger btnTag = 888888;
     SLLoginInfo *targetModel = [SLGlobalInfo SharedInstance].loginInfo;
     if (targetModel) {
         self.nameLabel.text = [NSString stringWithFormat:@"%@",targetModel.user.userName];
-        self.loginTimeLabel.text = [NSString stringWithFormat:@"账号：%@",targetModel.user.phone];
+        self.loginTimeLabel.text = [NSString stringWithFormat:@"ID账号：%@",targetModel.user.phone];
         NSString *headUrl = [NSString stringWithFormat:@"%@%@",[SLHttpCenter SharedInstance].serverUrl, [SLGlobalInfo SharedInstance].loginInfo.user.userHead];
         [self.headView sd_setImageWithURL:[NSURL URLWithString:headUrl] placeholderImage:ImageName(@"icon_ellipse")];
     }else {

SLAiELTS/SLAiELTS/ViewControllers/RoleLabelVC/SLRoleLabelViewController.m

@@ -158,15 +158,16 @@
         NSDictionary *dict = [self.roleModel mj_keyValues];
         //InitializeSet
         //InsertAiData
+        AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
         [[SLHttpCenter SharedInstance] postWithUrl:@"/api/User/InitializeSet" parameter:dict success:^(id responseObject) {
-            SLRoleCreatSucView *roleCreatSucView = [[SLRoleCreatSucView alloc] initWithFrame:self.view.frame];
-            roleCreatSucView.sucBlock = ^{
-                AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
-                [appDelegate setTabWithRootWindow];
-            };
-            [roleCreatSucView alertShow];
+            [appDelegate setTabWithRootWindow];
+//            SLRoleCreatSucView *roleCreatSucView = [[SLRoleCreatSucView alloc] initWithFrame:self.view.frame];
+//            roleCreatSucView.sucBlock = ^{
+//                AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+//                [appDelegate setTabWithRootWindow];
+//            };
+//            [roleCreatSucView alertShow];
         } failure:^(SPRequestError *error) {
-            AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
             [appDelegate setTabWithRootWindow];
         }];
         return;

SLAiELTS/SLAiELTS/ViewControllers/RoleLabelVC/SLRoleLabelViewController.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -26,9 +26,8 @@
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_regist_bg" translatesAutoresizingMaskIntoConstraints="NO" id="dR6-Lt-NT1">
                     <rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
                 </imageView>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8MG-L3-bYX">
+                <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8MG-L3-bYX">
                     <rect key="frame" x="22" y="754" width="346" height="50"/>
-                    <color key="backgroundColor" red="0.086274509799999996" green="0.46666666670000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="50" id="5kA-w4-Kxl">
                             <userDefinedRuntimeAttributes>
@@ -38,9 +37,10 @@
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                    <state key="normal" title="下一步">
+                    <state key="normal" title="下一步" backgroundImage="icon_btn_blue">
                         <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </state>
+                    <state key="highlighted" backgroundImage="icon_btn_blue_sel"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
                             <integer key="value" value="25"/>
@@ -107,6 +107,8 @@
     </objects>
     <resources>
         <image name="icon_back_gay" width="40.333332061767578" height="40.333332061767578"/>
+        <image name="icon_btn_blue" width="855" height="168"/>
+        <image name="icon_btn_blue_sel" width="854" height="165"/>
         <image name="icon_regist_bg" width="375.66665649414062" height="816.66668701171875"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

SLAiELTS/SLAiELTS/ViewControllers/RoleLabelVC/Views/SLInterestView.m

@@ -70,7 +70,7 @@ static NSInteger SLInterestTag = 10888;
 
 - (void)interestBtnClick:(UIButton *)btn {
     btn.selected = !btn.selected;
-    btn.backgroundColor = btn.selected ? SLBlueColor : UIColor.whiteColor;
+    btn.backgroundColor = btn.selected ? SLBlueColor : SLColF5F8F7;
     btn.layer.borderWidth = btn.selected ? 0 : 1;
     InterestModel *model = [self.interestArr objectAtIndex:btn.tag - SLInterestTag];
     model.isSeleted = btn.selected;
@@ -109,7 +109,7 @@ static NSInteger SLInterestTag = 10888;
         [btn setTitle:obj.interestName forState:UIControlStateNormal];
         [btn setTitleColor:SLColor(@"#080F1B") forState:UIControlStateNormal];
         [btn setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected];
-        btn.backgroundColor = SLColor(@"#F5F8F7");
+        btn.backgroundColor = SLColF5F8F7;
         CGSize size = [btn sizeThatFits:CGSizeMake(MAXFLOAT, 40)];
         CGFloat h = size.width + 24;
         CGFloat w = btn.frame.size.width + MAX(h, 30);

SLAiELTS/SLAiELTS/ViewControllers/RoleLabelVC/Views/SLRoleLabelView.m

@@ -96,7 +96,7 @@
             }];
             self.nameBgView.hidden = NO;
             titleStr = @"为你的AI助教取名";
-            subTitleStr = @"AI助教将使用次名称与你对话";
+            subTitleStr = @"AI助教将使用此名称与你对话";
         }
             break;
         case SLUserInfo:
@@ -122,7 +122,7 @@
             [segmentView removeFromSuperview];
             [self.sexSelBgView addSubview:segmentView];
             [segmentView setTitlesWithArray:@[@"女性", @"男性"]];
-            segmentView.selectIndex = 0;
+            segmentView.selectIndex = 1;
             [segmentView mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.edges.equalTo(self.sexSelBgView);
             }];
@@ -154,7 +154,7 @@
                 make.top.equalTo(self.logoImageView.mas_bottom).offset((6 + h));
             }];
             [segmentView setTitlesWithArray:obj];
-            if (roleType == SLRoleLanguage && idx == 0) {
+            if (roleType == SLRoleLanguage) {
                 segmentView.selectIndex = 1;
             }else {
                 segmentView.selectIndex = 0;
@@ -294,12 +294,12 @@
     segment.normalTitleFont = 17;
     segment.selectTitleFont = 17;
     segment.cornerRadius = 29.0f;
-    segment.backgroundColor = SLColor(@"#F5F8F7");
+    segment.backgroundColor = SLColF5F8F7;
     segment.tag = 110022;
     segment.delegate = self;
     segment.normalBackgroundColor = [UIColor clearColor];
-    segment.selectBackgroundColor = SLColor(@"#1677FF");
-    segment.titleNormalColor = SLColor(@"#8E8E93");
+    segment.selectBackgroundColor = SLBlueColor;
+    segment.titleNormalColor = SLCol8E8E93;
     segment.titleSelectColor = [UIColor whiteColor];
     segment.borderWidth = 0.0f;
     [self addSubview:segment];

SLAiELTS/SLAiELTS/ViewControllers/RoleLabelVC/Views/SLRoleLabelView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -186,15 +186,26 @@
                                                 <action selector="datePickViewBtnClick:" destination="-1" eventType="touchUpInside" id="zDF-BM-5sr"/>
                                             </connections>
                                         </button>
+                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mjy-2J-2lk">
+                                            <rect key="frame" x="20" y="0.0" width="414" height="58"/>
+                                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                            <connections>
+                                                <action selector="datePickViewBtnClick:" destination="-1" eventType="touchUpInside" id="2u7-7s-l42"/>
+                                            </connections>
+                                        </button>
                                     </subviews>
                                     <color key="backgroundColor" red="0.96078431369999995" green="0.97254901959999995" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                     <constraints>
+                                        <constraint firstItem="mjy-2J-2lk" firstAttribute="top" secondItem="aCA-dD-WOG" secondAttribute="top" id="6cc-4c-gyp"/>
+                                        <constraint firstItem="mjy-2J-2lk" firstAttribute="leading" secondItem="aCA-dD-WOG" secondAttribute="leading" id="JCz-pq-PKt"/>
                                         <constraint firstItem="scE-mn-SaB" firstAttribute="centerY" secondItem="eaT-kA-Rfa" secondAttribute="centerY" id="MRO-wZ-zTw"/>
                                         <constraint firstItem="aCA-dD-WOG" firstAttribute="leading" secondItem="eaT-kA-Rfa" secondAttribute="leading" constant="20" id="Nar-hZ-rfY"/>
                                         <constraint firstAttribute="trailing" secondItem="aCA-dD-WOG" secondAttribute="trailing" constant="100" id="PAJ-9I-Uxy"/>
                                         <constraint firstAttribute="trailing" secondItem="scE-mn-SaB" secondAttribute="trailing" constant="18" id="ST8-9o-1vA"/>
                                         <constraint firstItem="aCA-dD-WOG" firstAttribute="top" secondItem="eaT-kA-Rfa" secondAttribute="top" id="Wlj-xl-PIF"/>
                                         <constraint firstItem="aCA-dD-WOG" firstAttribute="centerY" secondItem="eaT-kA-Rfa" secondAttribute="centerY" id="dvt-pq-nX0"/>
+                                        <constraint firstItem="mjy-2J-2lk" firstAttribute="bottom" secondItem="aCA-dD-WOG" secondAttribute="bottom" id="i6Q-Zo-ENG"/>
+                                        <constraint firstItem="mjy-2J-2lk" firstAttribute="trailing" secondItem="scE-mn-SaB" secondAttribute="leading" id="onN-a7-l4U"/>
                                         <constraint firstAttribute="height" constant="58" id="zra-KZ-fzB"/>
                                     </constraints>
                                     <userDefinedRuntimeAttributes>