备份一下

FuSiLive/Classes/BaoFang/Main/Other/FUSBaoFangCacheOperate.m

@@ -55,6 +55,7 @@
             for (NSDictionary *tempData in dataList) {
             for (NSDictionary *tempData in dataList) {
                 FUSHomeLanguageGetlistModel *tempModel = [[FUSHomeLanguageGetlistModel alloc] init];
                 FUSHomeLanguageGetlistModel *tempModel = [[FUSHomeLanguageGetlistModel alloc] init];
                 [tempModel fus_setValueWithDict:tempData];
                 [tempModel fus_setValueWithDict:tempData];
+                tempModel.fus_dataDict = tempData;
                 [resList appendObject:tempModel];
                 [resList appendObject:tempModel];
             }
             }
         }
         }

FuSiLive/Classes/BaoFang/Main/Other/FUSBaoFangHttpHelper.m

@@ -809,6 +809,7 @@
             for (NSDictionary *tempData in dataList) {
             for (NSDictionary *tempData in dataList) {
                 FUSHomeLanguageGetlistModel *tempModel = [[FUSHomeLanguageGetlistModel alloc] init];
                 FUSHomeLanguageGetlistModel *tempModel = [[FUSHomeLanguageGetlistModel alloc] init];
                 [tempModel fus_setValueWithDict:tempData];
                 [tempModel fus_setValueWithDict:tempData];
+                tempModel.fus_dataDict = tempData;
                 [resList appendObject:tempModel];
                 [resList appendObject:tempModel];
             }
             }
         }
         }

FuSiLive/Classes/Foundation/Controller/FUSImagePicker/Controller/NEW_FUSFullImageViewController.m

@@ -132,7 +132,7 @@
         self.bottomView.frame = CGRectMake(_bottomView.frame.origin.x, self.view.height - bottomHeight, _bottomView.frame.size.width, bottomHeight);
         self.bottomView.frame = CGRectMake(_bottomView.frame.origin.x, self.view.height - bottomHeight, _bottomView.frame.size.width, bottomHeight);
     }];
     }];
     
     
-    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO];
+//    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO];
     
     
     _isVisible = YES;
     _isVisible = YES;
     
     
@@ -208,7 +208,7 @@
     FUSChoseButton *backBtn = [FUSChoseButton buttonWithType:UIButtonTypeCustom];
     FUSChoseButton *backBtn = [FUSChoseButton buttonWithType:UIButtonTypeCustom];
     backBtn.frame = CGRectMake(0, 0, 18, 31);
     backBtn.frame = CGRectMake(0, 0, 18, 31);
     [backBtn addTarget:self action:@selector(onClickBackBtn) forControlEvents:UIControlEventTouchUpInside];
     [backBtn addTarget:self action:@selector(onClickBackBtn) forControlEvents:UIControlEventTouchUpInside];
-    UIImage *backImage = [UIImage imageNamed:[FUSRTL RTLImageName:@"common_navigation_back_white"]];
+    UIImage *backImage = [UIImage fus_backImage];
     [backBtn setImage:backImage forState:UIControlStateNormal];
     [backBtn setImage:backImage forState:UIControlStateNormal];
     UIBarButtonItem *backBarItem = [[UIBarButtonItem alloc]initWithCustomView:backBtn];
     UIBarButtonItem *backBarItem = [[UIBarButtonItem alloc]initWithCustomView:backBtn];
     [self.navigationItem setLeftBarButtonItems:@[backBarItem] animated:YES];
     [self.navigationItem setLeftBarButtonItems:@[backBarItem] animated:YES];
@@ -236,7 +236,7 @@
     shapeLayer.lineWidth = lineWidth;
     shapeLayer.lineWidth = lineWidth;
     shapeLayer.path = bezierpath.CGPath;
     shapeLayer.path = bezierpath.CGPath;
     shapeLayer.fillColor = [[UIColor clearColor]CGColor];
     shapeLayer.fillColor = [[UIColor clearColor]CGColor];
-    shapeLayer.strokeColor = [[UIColor whiteColor]CGColor];
+    shapeLayer.strokeColor = [[UIColor fus_lineColor]CGColor];
     [choseBtn.layer addSublayer:shapeLayer];
     [choseBtn.layer addSublayer:shapeLayer];
 }
 }
 
 

FuSiLive/Classes/FusiVersionFeature/Others/FUSControllerPushHelper.m

@@ -30,43 +30,44 @@
     UIViewController *vc = nil;
     UIViewController *vc = nil;
     
     
     // 测试原生客服
     // 测试原生客服
-    FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:![NSString isNull:uid] ? uid : @(SERVEICE_UID).stringValue face:facePath nikename:nikename];
-    serviceChat.isServiceAccount = YES;
-    if (![NSString isNull:welcomeStr]) {
-        serviceChat.welcomeStr = welcomeStr;
-    }
-    vc = serviceChat;
-    
-    // 普通调起客服流程
-//    if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 1) {
-//        
-//        if (FUSConfig.sharedInstanced.devConfigs.appStatus) {
-//            
-//            FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:uid ? uid : @(SERVEICE_UID).stringValue face:facePath nikename:nikename];
-//            serviceChat.isServiceAccount = YES;
-//            if (![NSString isNull:welcomeStr]) {
-//                serviceChat.welcomeStr = welcomeStr;
-//            }
-//            vc = serviceChat;
-//        } else {
-//            
-//            FUSWKWebViewController *webVC = [[FUSWKWebViewController alloc] init];
-//            NSString *webURL = FUSLocalizationHelper.isArbicLanguage ? URL_WEB_ARBIC_HELP : URL_WEB_HELP;
-//            webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID];
-//            vc = webVC;
-//        }
-//    }else if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 2) {
-//        
-//        FUSWKWebViewController *webVC = [[FUSWKWebViewController alloc] init];
-//        NSString *webURL = [FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.url;
-//        webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID];
-//        vc = webVC;
-//    }
-//    NSArray *viewControllers = self.viewControllers;
-//    UIViewController *viewVC = [viewControllers lastObject];
-//    if ([viewVC isKindOfClass:[FUSSingleChatViewController class]]){
-//        return;
+//    FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:![NSString isNull:uid] ? uid : @(SERVEICE_UID).stringValue face:facePath nikename:nikename];
+//    serviceChat.isServiceAccount = YES;
+//    if (![NSString isNull:welcomeStr]) {
+//        serviceChat.welcomeStr = welcomeStr;
 //    }
 //    }
+//    vc = serviceChat;
+    
+    
+//     普通调起客服流程
+    if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 1) {
+        
+        if (FUSConfig.sharedInstanced.devConfigs.appStatus) {
+            
+            FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:uid ? uid : @(SERVEICE_UID).stringValue face:facePath nikename:nikename];
+            serviceChat.isServiceAccount = YES;
+            if (![NSString isNull:welcomeStr]) {
+                serviceChat.welcomeStr = welcomeStr;
+            }
+            vc = serviceChat;
+        } else {
+            
+            FUSWKWebViewController *webVC = [[FUSWKWebViewController alloc] init];
+            NSString *webURL = FUSLocalizationHelper.isArbicLanguage ? URL_WEB_ARBIC_HELP : URL_WEB_HELP;
+            webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID];
+            vc = webVC;
+        }
+    }else if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 2) {
+        
+        FUSWKWebViewController *webVC = [[FUSWKWebViewController alloc] init];
+        NSString *webURL = [FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.url;
+        webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID];
+        vc = webVC;
+    }
+    NSArray *viewControllers = self.viewControllers;
+    UIViewController *viewVC = [viewControllers lastObject];
+    if ([viewVC isKindOfClass:[FUSSingleChatViewController class]]){
+        return;
+    }
     [self pushViewController:vc animated:animate];
     [self pushViewController:vc animated:animate];
 }
 }
 
 

FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/Model/FUSHomeLanguageGetlistModel.h

@@ -15,6 +15,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 @property (nonatomic, copy) NSString *content;
 @property (nonatomic, copy) NSString *content;
 
 
+/// 原始数据，每次都自己手动复值上去，方便存储
+@property (nonatomic, copy) NSDictionary *fus_dataDict;
+
+/// 记录当前选择的模型到本地
+-(void)fus_writeSelectModelToLocal;
+
+/// 取出当前存储的选择模型
++(FUSHomeLanguageGetlistModel *)fus_readSelectModel;
+
 @end
 @end
 
 
 NS_ASSUME_NONNULL_END
 NS_ASSUME_NONNULL_END

FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/Model/FUSHomeLanguageGetlistModel.m

@@ -9,4 +9,24 @@
 
 
 @implementation FUSHomeLanguageGetlistModel
 @implementation FUSHomeLanguageGetlistModel
 
 
+- (void)fus_writeSelectModelToLocal{
+    if (self.fus_dataDict != nil && self.fus_dataDict.allKeys > 0) {
+        [[NSUserDefaults standardUserDefaults] setValue:self.fus_dataDict forKey:HOME_LANGUAGE_GET_LIST_SELECT_KEY];
+    }else{
+        FUSLogInfo(@"----FUSHomeLanguageGetlistModel存储失败！！");
+    }
+}
+
++ (FUSHomeLanguageGetlistModel *)fus_readSelectModel{
+    NSDictionary *modelDict = [[NSUserDefaults standardUserDefaults] objectForKey:HOME_LANGUAGE_GET_LIST_SELECT_KEY];
+    if (modelDict != nil) {
+        FUSHomeLanguageGetlistModel *model = [FUSHomeLanguageGetlistModel modelWithDictionary:modelDict];
+        model.fus_dataDict = modelDict;
+        return model;
+    }else{
+        FUSLogInfo(@"----FUSHomeLanguageGetlistModel尚未存储!!");
+        return nil;
+    }
+}
+
 @end
 @end

FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyHeaderView.m

@@ -346,8 +346,11 @@
         make.width.offset(ageStringSzie.width + 9 + 10);
         make.width.offset(ageStringSzie.width + 9 + 10);
     }];
     }];
     
     
-    self.vipMarkImgView.image = [UIImage fus_imageWithLevel:[model.level integerValue]];
-//    self.vipMarkImgView.image = [UIImage fus_imageWithLevel:35];
+    NSInteger level = 0;
+    if ([model.privilege[@"richPower"] integerValue] == 1) {
+        level = model.level.intValue;
+    }
+    self.vipMarkImgView.image = [UIImage fus_imageWithLevel:level];
 }
 }
 
 
 
 

FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/ViewModel/FUSHomeViewViewModel.m

@@ -65,7 +65,7 @@
         self.loadingCount--;
         self.loadingCount--;
         self.homeLanguageGetList = languageList;
         self.homeLanguageGetList = languageList;
         if (self.isFirstLoad && self.homeLanguageGetList.count > 0) {
         if (self.isFirstLoad && self.homeLanguageGetList.count > 0) {
-            // 第一次加载
+            // 第一次加载，直接使用，而不是作更新复选
             self.isFirstLoad = NO;
             self.isFirstLoad = NO;
             
             
             // 先取出存储
             // 先取出存储

FuSiLive/Classes/FusiVersionFeature/ViewController/ImAnchor/View/FUSImAnchorHeaderView.m

@@ -267,7 +267,11 @@
     }];
     }];
     
     
     self.fireNumLabel.text = model.activebonds;
     self.fireNumLabel.text = model.activebonds;
-    self.vipMarkImgView.image = [UIImage fus_imageWithLevel:[model.level integerValue]];
+    NSInteger level = 0;
+    if ([model.privilege[@"richPower"] integerValue] == 1) {
+        level = model.level.intValue;
+    }
+    self.vipMarkImgView.image = [UIImage fus_imageWithLevel:level];
 }
 }
 
 
 + (CGFloat)fus_viewHeight{
 + (CGFloat)fus_viewHeight{

FuSiLive/Classes/NewLive/Main/View/FunctionView/TreasureBox/View/FUSLiveTreasureBoxRecordView.m

@@ -64,7 +64,7 @@
     
     
     __weak typeof(self) weakSelf = self;
     __weak typeof(self) weakSelf = self;
     _recordWebView = [[FUSWKWebView alloc] initWithFrame:CGRectMake(0, 0, _scrView.width, _scrView.height)];
     _recordWebView = [[FUSWKWebView alloc] initWithFrame:CGRectMake(0, 0, _scrView.width, _scrView.height)];
-    [_recordWebView configWebViewWithWebUrl:DNS_WEB(@"/Nesting/box/grabBox.html")];
+    [_recordWebView configWebViewWithWebUrl:DNS_WEB(@"/vestApp/box/grabBox.html")];
     _recordWebView.shouldIncludeIdentifyInfo = YES;
     _recordWebView.shouldIncludeIdentifyInfo = YES;
     _recordWebView.webEventHelper.webClickEventHandler = ^(NSDictionary *info, NSInteger jumpType) {
     _recordWebView.webEventHelper.webClickEventHandler = ^(NSDictionary *info, NSInteger jumpType) {
         if (jumpType == FUSJOpenH5Link) {
         if (jumpType == FUSJOpenH5Link) {

FuSiLive/Resources/LocalizationString/Fusi_Arbic.strings

@@ -2156,3 +2156,5 @@
 
 
 "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "سيتم تقسيم دخل الهدايا الذي يتلقاه مستخدمو Mic إلى %@ بواسطة المذيع و%@ بواسطة المستخدمين.";
 "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "سيتم تقسيم دخل الهدايا الذي يتلقاه مستخدمو Mic إلى %@ بواسطة المذيع و%@ بواسطة المستخدمين.";
 
 
+"发送验证码" = "استلام رمز التحقق";
+

FuSiLive/Resources/LocalizationString/Fusi_Chinese.strings

@@ -2190,3 +2190,5 @@
 
 
 "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "連麥用戶獲得的禮物收入，主播分成%@，用戶分成%@";
 "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "連麥用戶獲得的禮物收入，主播分成%@，用戶分成%@";
 
 
+"发送验证码" = "獲取驗證碼";
+

FuSiLive/Resources/LocalizationString/Fusi_Chinese_Traditional.strings

@@ -2190,3 +2190,5 @@
 
 
 "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "連麥用戶獲得的禮物收入，主播分成%@，用戶分成%@";
 "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "連麥用戶獲得的禮物收入，主播分成%@，用戶分成%@";
 
 
+"发送验证码" = "獲取驗證碼";
+

FuSiLive/Resources/LocalizationString/Fusi_English.strings

@@ -2190,3 +2190,5 @@
 
 
 "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "The gift income received by Mic users will be divided into %@ by the broadcaster and %@ by the users.";
 "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "The gift income received by Mic users will be divided into %@ by the broadcaster and %@ by the users.";
 
 
+"发送验证码" = "Get verification code";
+

FuSiLive/Resources/LocalizationString/Fusi_Indonesian.strings

@@ -2164,3 +2164,5 @@
 
 
 "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "Pendapatan hadiah yang diterima oleh pengguna Mic akan dibagi menjadi %@ oleh penyiar dan %@ oleh pengguna.";
 "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "Pendapatan hadiah yang diterima oleh pengguna Mic akan dibagi menjadi %@ oleh penyiar dan %@ oleh pengguna.";
 
 
+"发送验证码" = "Dapatkan kode verifikasi";
+

FuSiLive/Resources/LocalizationString/Fusi_Japanese.strings

@@ -2168,3 +2168,5 @@
 
 
 "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "Micユーザーが受け取ったギフト収入は、放送者に%@、ユーザーに%@に分配されます。";
 "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "Micユーザーが受け取ったギフト収入は、放送者に%@、ユーザーに%@に分配されます。";
 
 
+"发送验证码" = "確認コードを取得";
+

FuSiLive/Resources/LocalizationString/Fusi_Thai.strings

@@ -2164,3 +2164,5 @@
 
 
 "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "รายได้ของขวัญที่ได้รับจากผู้ใช้ Mic จะถูกแบ่งออกเป็น %@ โดยผู้ถ่ายทอดสด และ %@ โดยผู้ใช้";
 "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "รายได้ของขวัญที่ได้รับจากผู้ใช้ Mic จะถูกแบ่งออกเป็น %@ โดยผู้ถ่ายทอดสด และ %@ โดยผู้ใช้";
 
 
+"发送验证码" = "รับรหัสยืนยัน";
+

FuSiLive/Resources/LocalizationString/Fusi_vietnamese.strings

@@ -2168,3 +2168,5 @@
 
 
 "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "Thu nhập quà tặng mà người dùng Mic nhận được sẽ được chia thành %@ cho đài truyền hình và %@ cho người dùng.";
 "连麦用户获得的礼物收入，主播分成%@，用户分成%@" = "Thu nhập quà tặng mà người dùng Mic nhận được sẽ được chia thành %@ cho đài truyền hình và %@ cho người dùng.";
 
 
+"发送验证码" = "Lấy mã xác minh";
+