问题修复

SLAiELTS/SLAiELTS.xcodeproj/project.pbxproj

@@ -2837,7 +2837,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 27;
+				CURRENT_PROJECT_VERSION = 29;
 				DEVELOPMENT_TEAM = 5WKRWDTA83;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2923,7 +2923,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 27;
+				CURRENT_PROJECT_VERSION = 29;
 				DEVELOPMENT_TEAM = 5WKRWDTA83;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

SLAiELTS/SLAiELTS/Vendor/Resources/en.lproj/Localizable.strings

@@ -156,11 +156,11 @@
 "说话时间太短！" = "The speaking time is too short!";
 "请选择标签" = "Please select a label";
 "请上传头像" = "Please upload your avatar";
-"男性" = "male";
-"男性" = "male";
-"男性" = "male";
-"男性" = "male";
-"男性" = "male";
+"美音" = "American Accent";
+"英音" = "male";
+"快" = "fast";
+"中" = "medium";
+"慢" = "slow";
 "男性" = "male";
 "男性" = "male";
 "男性" = "male";

SLAiELTS/SLAiELTS/ViewControllers/FriendsVC/SLRecomFriendsVc.m

@@ -136,7 +136,7 @@
 }
 
 -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
-    return 0.001f;
+    return 10.001f;
 }
 
 - (NSMutableArray *)friendsModel {

SLAiELTS/SLAiELTS/ViewControllers/FriendsVC/SLRecomFriendsVc.xib

@@ -79,7 +79,7 @@
                     </constraints>
                 </view>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" estimatedSectionHeaderHeight="-1" sectionFooterHeight="18" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="4Hd-tI-svx">
-                    <rect key="frame" x="0.0" y="110" width="390" height="700"/>
+                    <rect key="frame" x="0.0" y="100" width="390" height="710"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <connections>
                         <outlet property="dataSource" destination="-1" id="MUw-zi-6hT"/>
@@ -95,7 +95,7 @@
                 <constraint firstItem="YNg-vM-DsK" firstAttribute="bottom" secondItem="4Hd-tI-svx" secondAttribute="bottom" id="OTE-Js-6gh"/>
                 <constraint firstItem="4Hd-tI-svx" firstAttribute="leading" secondItem="YNg-vM-DsK" secondAttribute="leading" id="Umx-lj-Xzz"/>
                 <constraint firstItem="G9H-k1-iTF" firstAttribute="leading" secondItem="YNg-vM-DsK" secondAttribute="leading" id="VPA-GY-hgl"/>
-                <constraint firstItem="4Hd-tI-svx" firstAttribute="top" secondItem="G9H-k1-iTF" secondAttribute="top" constant="10" id="aB5-l1-nwN"/>
+                <constraint firstItem="4Hd-tI-svx" firstAttribute="top" secondItem="G9H-k1-iTF" secondAttribute="top" id="aB5-l1-nwN"/>
                 <constraint firstItem="YNg-vM-DsK" firstAttribute="trailing" secondItem="6T9-CQ-vWA" secondAttribute="trailing" id="b1N-SY-k6o"/>
                 <constraint firstItem="YNg-vM-DsK" firstAttribute="trailing" secondItem="G9H-k1-iTF" secondAttribute="trailing" id="ehd-gt-39H"/>
                 <constraint firstItem="G9H-k1-iTF" firstAttribute="top" secondItem="DTa-iB-OMQ" secondAttribute="top" constant="100" id="hA3-Nc-wmY"/>
@@ -106,7 +106,7 @@
     </objects>
     <designables>
         <designable name="1lw-iM-hR8">
-            <size key="intrinsicContentSize" width="28.666666666666668" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="64.666666666666671" height="18.666666666666668"/>
         </designable>
     </designables>
     <resources>

SLAiELTS/SLAiELTS/ViewControllers/Moments/Views/MomentsNewsCell/SLMomentsNewsCell.xib

@@ -22,6 +22,11 @@
                             <constraint firstAttribute="height" constant="48" id="PRw-nr-4qm"/>
                             <constraint firstAttribute="width" constant="48" id="W6T-xK-s4h"/>
                         </constraints>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                <integer key="value" value="24"/>
+                            </userDefinedRuntimeAttribute>
+                        </userDefinedRuntimeAttributes>
                     </imageView>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Fd0-Zh-jKa">
                         <rect key="frame" x="325" y="15" width="80" height="80"/>

SLAiELTS/SLAiELTS/ViewControllers/MyVC/VCs/SLAiSetVc.m

@@ -146,9 +146,9 @@
         NSArray *arr = @[
         @[[SLPageModelDetail initWithTitle:NSLocalizedString(@"AI昵称", nil) subTitle:user.aiName bgImage:@""],
           [SLPageModelDetail initWithTitle:NSLocalizedString(@"性别", nil) subTitle:NSLocalizedString(user.aiSex, nil) bgImage:@""],],
-          @[[SLPageModelDetail initWithTitle:NSLocalizedString(@"口音设置", nil) segments:@[NSLocalizedString(@"American Accent", nil), NSLocalizedString(@"British Accent", nil)]],
+          @[[SLPageModelDetail initWithTitle:NSLocalizedString(@"口音设置", nil) segments:@[NSLocalizedString(@"美音", nil), NSLocalizedString(@"英音", nil)]],
             [SLPageModelDetail initWithTitle:NSLocalizedString(@"难度设置", nil) segments:@[NSLocalizedString(@"简单", nil), NSLocalizedString(@"中等", nil), NSLocalizedString(@"困难", nil)]],
-            [SLPageModelDetail initWithTitle:NSLocalizedString(@"语速设置", nil) segments:@[NSLocalizedString(@"slow", nil), NSLocalizedString(@"medium", nil), NSLocalizedString(@"fast", nil)]]],];
+            [SLPageModelDetail initWithTitle:NSLocalizedString(@"语速设置", nil) segments:@[NSLocalizedString(@"慢", nil), NSLocalizedString(@"中", nil), NSLocalizedString(@"快", nil)]]],];
         _dataModels = [NSMutableArray arrayWithArray:arr];
     }
     return _dataModels;

SLAiELTS/SLAiELTS/ViewControllers/MyVC/VCs/SLCitySetVc.m

@@ -94,15 +94,20 @@
                 {
                     [[SLLocationManager shareInstance] getLocationComplete:^(CLLocation * _Nullable currentLocation) {
                         if (currentLocation) {
-                            SLLoginInfo *newLoginModel = [SLGlobalInfo SharedInstance].loginInfo;
-                            newLoginModel.user.province = [SLLocationManager shareInstance].province;
-                            newLoginModel.user.city = [SLLocationManager shareInstance].city;
-                            [SLGlobalInfo SharedInstance].loginInfo = newLoginModel;
-                            SLBaseCellView *baseCell = [weakSelf.view viewWithTag:8888];
-                            baseCell.subTitleLabel.text = [NSString stringWithFormat:@"%@%@",[SLLocationManager shareInstance].province,[SLLocationManager shareInstance].city];
-                            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                                [weakSelf.navigationController popViewControllerAnimated:YES];
-                            });
+                            
+                            [[SLHttpCenter SharedInstance] postWithUrl:@"/api/User/SetUserAddress" parameter:@{@"province" : [SLLocationManager shareInstance].province ?: @"", @"city" : [SLLocationManager shareInstance].city ?: @""} success:^(id responseObject) {
+                                SLLoginInfo *newLoginModel = [SLGlobalInfo SharedInstance].loginInfo;
+                                newLoginModel.user.province = [SLLocationManager shareInstance].province;
+                                newLoginModel.user.city = [SLLocationManager shareInstance].city;
+                                [SLGlobalInfo SharedInstance].loginInfo = newLoginModel;
+                                SLBaseCellView *baseCell = [weakSelf.view viewWithTag:8888];
+                                baseCell.subTitleLabel.text = [NSString stringWithFormat:@"%@%@",[SLLocationManager shareInstance].province,[SLLocationManager shareInstance].city];
+                                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                                    [weakSelf.navigationController popViewControllerAnimated:YES];
+                                });
+                            } failure:^(SPRequestError *error) {
+                                
+                            }];
                         }else {
                             [ZFToast ShowWithMessage:NSLocalizedString(@"定位失败，请检查权限设置", nil)];
                         }

SLAiELTS/SLAiELTS/ViewControllers/MyVC/Views/SLMySpeedView.m

@@ -56,7 +56,7 @@
     self.segment.delegate = nil;
     [self.segmentBgView addSubview:self.segment];
     
-    self.segment1 = [self creatSegmentViewWith:@[NSLocalizedString(@"slow", nil), NSLocalizedString(@"medium", nil), NSLocalizedString(@"fast", nil)]];
+    self.segment1 = [self creatSegmentViewWith:@[NSLocalizedString(@"慢", nil), NSLocalizedString(@"中", nil), NSLocalizedString(@"快", nil)]];
 //    self.segment1.userInteractionEnabled = NO;
 //    self.segment1.delegate = nil;
     [self.segment1 updateWithSpacing:2 topHeight:3];

SLAiELTS/SLAiELTS/ViewControllers/RoleLabelVC/Models/RoleModel.m

@@ -30,26 +30,26 @@
 }
 
 + (NSDictionary *)roleModelDict {
-    return @{NSLocalizedString(@"British Accent", nil) : @"1",
-             NSLocalizedString(@"American Accent", nil) : @"0",
-             NSLocalizedString(@"fast", nil) : @"1.5",
-             NSLocalizedString(@"medium", nil) : @"1",
-             NSLocalizedString(@"slow", nil) : @"0.5",
+    return @{NSLocalizedString(@"英音", nil) : @"1",
+             NSLocalizedString(@"美音", nil) : @"0",
+             NSLocalizedString(@"快", nil) : @"1.5",
+             NSLocalizedString(@"中", nil) : @"1",
+             NSLocalizedString(@"慢", nil) : @"0.5",
              NSLocalizedString(@"男性", nil) : @"男",
              NSLocalizedString(@"女性", nil) : @"女",};
 }
 
 + (NSDictionary *)roleSpeedModelDict {
     return @{
-             NSLocalizedString(@"fast", nil) : @"1.5",
-             NSLocalizedString(@"medium", nil) : @"1",
-             NSLocalizedString(@"slow", nil) : @"0.5"};
+             NSLocalizedString(@"快", nil) : @"1.5",
+             NSLocalizedString(@"中", nil) : @"1",
+             NSLocalizedString(@"慢", nil) : @"0.5"};
 }
 
 + (NSDictionary *)roleLanuchModelDict {
     return @{
-            NSLocalizedString(@"British Accent", nil) : @"1",
-            NSLocalizedString(@"American Accent", nil) : @"0",};
+            NSLocalizedString(@"英音", nil) : @"1",
+            NSLocalizedString(@"美音", nil) : @"0",};
 }
 
 @end

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

@@ -79,7 +79,7 @@
             break;
         case SLRoleLanguage:
         {
-            arr = @[@[NSLocalizedString(@"fast", nil), NSLocalizedString(@"medium", nil), NSLocalizedString(@"slow", nil)], @[NSLocalizedString(@"American Accent", nil), NSLocalizedString(@"British Accent", nil)], @[NSLocalizedString(@"女性", nil), NSLocalizedString(@"男性", nil)],];
+            arr = @[@[NSLocalizedString(@"快", nil), NSLocalizedString(@"中", nil), NSLocalizedString(@"慢", nil)], @[NSLocalizedString(@"美音", nil), NSLocalizedString(@"英音", nil)], @[NSLocalizedString(@"女性", nil), NSLocalizedString(@"男性", nil)],];
             titleStr = NSLocalizedString(@"请设置你的AI语音", nil);
             subTitleStr = NSLocalizedString(@"语音聊天将播放此声音", nil);;
 //            [self confignWithRoleLanguage];