Merge branch 'main' of http://git.imoreme.com/lushaoxiong/DrWater

DJMHomeTY.xcodeproj/project.pbxproj

@@ -3129,7 +3129,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageWater;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 8Z4G7AGK6D;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -3154,7 +3154,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.3;
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMDrWater;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -3174,7 +3174,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageWater;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 8Z4G7AGK6D;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -3199,7 +3199,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.3;
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMDrWater;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

DJMHomeTY/Assets.xcassets/HFX/HFX_041_stop.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "HFX_041_stop@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "HFX_041_stop@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DJMHomeTY/Global/Base/Controller/XHParentVC.m

@@ -427,6 +427,7 @@
                 weakSelf.remaintime = [[self defaultTime] integerValue];//
                 weakSelf.verificationNum = @"";
             }else{
+//                weakSelf.remaintime = 10;
                 weakSelf.remaintime = [weakSelf.dataModel.orderMap.remaintime integerValue];
                 weakSelf.verificationNum = weakSelf.dataModel.consumableMap.consumablenumber;
             }

DJMHomeTY/Global/Lib/PickModules/UIExPickerView.m

@@ -25,13 +25,13 @@
 -(void)initCtrl:(CGRect)frame
 {
     UIButton *btnCancel = [[UIButton alloc ] initWithFrame:CGRectMake(0, 0, 80, 40)];
-    [btnCancel setTitle:@"取消" forState:UIControlStateNormal];
+    [btnCancel setTitle:HJLocalizedString(@"取消") forState:UIControlStateNormal];
     [btnCancel setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
     [btnCancel addTarget:self action:@selector(onButtonCancel) forControlEvents:UIControlEventTouchUpInside];
     [self addSubview:btnCancel];
     
     UIButton *btnFinish = [[UIButton alloc ] initWithFrame:CGRectMake(self.frame.size.width-80, 0, 80, 40)];
-    [btnFinish setTitle:@"完成" forState:UIControlStateNormal];
+    [btnFinish setTitle:HJLocalizedString(@"完成") forState:UIControlStateNormal];
     [btnFinish setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
     [btnFinish addTarget:self action:@selector(onButtonFinish) forControlEvents:UIControlEventTouchUpInside];
     [self addSubview:btnFinish];

DJMHomeTY/Global/Manager/XHDataManager.h

@@ -36,8 +36,8 @@
 @property (nonatomic,assign) NSInteger userID;
 //token
 @property (nonatomic,copy) NSString *token;
-
-
+/// 上次操作流速
+@property (nonatomic,assign) NSInteger currentspeed;
 
 
 /// 密码

DJMHomeTY/Global/Manager/XHDataManager.m

@@ -36,7 +36,7 @@
 
 #define Sex @"sex"
 #define Age @"age"
-
+#define Currentspeed @"currentspeed"
 
 #define ClientId @"clientId"
 
@@ -148,6 +148,16 @@
     return [[self userDefaults] integerForKey:Sex];
 }
 
+
+-(void)setCurrentspeed:(NSInteger)currentspeed{
+    [[self userDefaults] setInteger:currentspeed forKey:Currentspeed];
+    [[self userDefaults] synchronize];
+}
+-(NSInteger)currentspeed{
+    return [[self userDefaults] integerForKey:Currentspeed];
+}
+
+
 -(void)setAge:(NSString *)age{
     [[self userDefaults] setObject:age forKey:Age];
     [[self userDefaults] synchronize];

DJMHomeTY/Global/Text/en.lproj/Localizable.strings

 
+

DJMHomeTY/Global/Text/zh-Hant.lproj/Localizable.strings

 
+

DJMHomeTY/Page/DRFacial/Controller/DXHFXUpkeepVC.h

@@ -11,6 +11,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface DXHFXUpkeepVC : XHParentVC
 
+@property (nonatomic,assign) BOOL isStrengthen;
+
 @end
 
 NS_ASSUME_NONNULL_END

DJMHomeTY/Page/DRFacial/Controller/DXHFXUpkeepVC.m

@@ -177,8 +177,13 @@
     
     
     
+    NSArray *tipsArray;
+    if (self.isStrengthen) {
+        tipsArray = @[HJLocalizedString(@"取空瓶灌装 30℃左右的温水，安装在精华液瓶的位置，并安装好废水瓶"),HJLocalizedString(@"在手柄上把流量调节到最大，点击“▶”进行保养"),HJLocalizedString(@"清洁件用透明盖子或手指堵住探头，间隔一段时间松开"),HJLocalizedString(@"50秒后结束保养，请卸下瓶子"),HJLocalizedString(@"最后，请记得清洗废水瓶")];
+    }else{
+        tipsArray = @[HJLocalizedString(@"取空瓶灌装 30℃左右的温水，安装在精华液瓶的位置，并安装好废水瓶"),HJLocalizedString(@"在手柄上把流量调节到最大，点击“▶”进行保养"),HJLocalizedString(@"清洁件用透明盖子或手指堵住探头，间隔一段时间松开"),HJLocalizedString(@"45秒后结束保养，请卸下瓶子"),HJLocalizedString(@"最后，请记得清洗废水瓶")];
+    }
     
-    NSArray *tipsArray = @[HJLocalizedString(@"取空瓶灌装 30℃左右的温水，安装在精华液瓶的位置，并安装好废水瓶"),HJLocalizedString(@"在手柄上把流量调节到最大，点击“▶”进行保养"),HJLocalizedString(@"清洁件用透明盖子或手指堵住探头，间隔一段时间松开"),HJLocalizedString(@"45秒后结束保养，请卸下瓶子"),HJLocalizedString(@"最后，请记得清洗废水瓶")];
     UILabel *lastLb;
     for (int i = 0; i < tipsArray.count; i ++) {
         UILabel *numLb = [UILabel new];
@@ -288,7 +293,9 @@
     NSMutableDictionary *paramsDic = [NSMutableDictionary dictionary];
     
     [paramsDic setObject:@"1" forKey:@"type"];
-    
+    if (XHGetDataManager.deviceCode) {
+        [paramsDic setObject:XHGetDataManager.deviceCode?XHGetDataManager.deviceCode:@"" forKey:@"deviceCode"];
+    }
     [[XHHttpRequestManager shareManager] getHttpRequestURL:HFXGetVideoList isJson:NO parameters:paramsDic success:^(id responseObject) {
         [SVProgressHUD dismiss];
         NSLog(@"responseObject:\n%@===%@",responseObject,responseObject[@"msg"]);
@@ -341,12 +348,40 @@
     if (XHGetDataManager.deviceID) {
         sender.selected = !sender.selected;
         if(self.totalTime == 0){
+            if (self.isStrengthen) {
+                self.totalTime = 50;
+            }else{
                 self.totalTime = 45;
             }
+            
+        }
         if(sender.selected){
+            
+            if (self.isStrengthen) {
+                [HJGetBluetoothManager writeStr:[[NSString stringWithFormat:DR04_HFX_send_start] withCrc16Modbus]];
+                
+                
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    [HJGetBluetoothManager writeStr:[[NSString stringWithFormat:DR04_HFX_send_bymode] withCrc16Modbus]];
+                });
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.4 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    [HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"%@%@",DR04_HFX_send_energy,[[HJTools shared] ToLongHex:4 withLength:2]] withCrc16Modbus]];
+                });
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.6 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    [self pumpStart];
+                });
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.8 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    [self changePumpSpeedWithSize:100];
+                });
+                
+                
+            }else{
                 [HJGetBluetoothManager writeStr:[[NSString stringWithFormat:DR04_HFX_send_start] withCrc16Modbus]];
                 [HJGetBluetoothManager writeStr:[[NSString stringWithFormat:DR04_HFX_send_bymode] withCrc16Modbus]];
                 [HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"%@%@",DR04_HFX_send_energy,[[HJTools shared] ToLongHex:4 withLength:2]] withCrc16Modbus]];
+            }
+            
+            
             if (self.timer1 == nil) {
                 self.timer1=[NSTimer scheduledTimerWithTimeInterval:1.0f target:self selector:@selector(timerAction1) userInfo:nil repeats:YES];
                 [[NSRunLoop mainRunLoop] addTimer:self.timer1 forMode:NSDefaultRunLoopMode];
@@ -371,7 +406,9 @@
             [self requestData];
         }else{
             [HJGetBluetoothManager writeStr:[[NSString stringWithFormat:DR04_HFX_send_stop] withCrc16Modbus]];
-            
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [self pumpStop];
+            });
             [self.timer1 invalidate];
             self.timer1=nil;
         }
@@ -422,7 +459,9 @@
             
             [self.timer1 invalidate];
             self.timer1=nil;
-            
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [self pumpStop];
+            });
             
             [self.navigationController popViewControllerAnimated:YES];
         }
@@ -465,6 +504,24 @@
         [self.navigationController popViewControllerAnimated:YES];
     }
 }
+/// 调节蠕动泵速度
+- (void)changePumpSpeedWithSize:(NSInteger)size{
+    if (size != 100) {
+        size += 20;
+    }
+    
+    [HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"%@%@",DR04_HFX_send_pumpSpeedChange,[[HJTools shared] ToLongHex:size withLength:2]] withCrc16Modbus]];
+}
+/// 蠕动泵开启
+- (void)pumpStart{
+    
+    [HJGetBluetoothManager writeStr:[DR04_HFX_send_pumpStart withCrc16Modbus]];
+}
+/// 蠕动泵关闭
+- (void)pumpStop{
+    
+    [HJGetBluetoothManager writeStr:[DR04_HFX_send_pumpStop withCrc16Modbus]];
+}
 #pragma mark --委托代理
 #pragma mark --懒加载
 

DJMHomeTY/Page/DRFacial/View/DXHFXVideoCell.m

@@ -54,5 +54,6 @@
     _model = model;
     [_titleImg sd_setImageWithURL:[NSURL URLWithString:model.imgUrl] placeholderImage:[UIImage imageNamed:@"Main_Logo"]];
     _titleLb.text = model.detail;
+    
 }
 @end

DJMHomeTY/Page/DeviceListPage/Controller/DXDeviceListVC.m

@@ -191,7 +191,7 @@ static NSString *dxmachineCell = @"DXDeviceListCell";
 #pragma mark - ==========数据处理方法==========
 -(void)initDataTY{//TY
     NSArray *arr = @[
-        @{@"DeviceType":@"LDM(家居版)",
+        @{@"DeviceType":HJLocalizedString(@"LDM(家居版)"),
           @"DeviceCode":TYDeviceName,
           @"DeviceId":@"LS01",
           @"imgName":@"",
@@ -201,13 +201,13 @@ static NSString *dxmachineCell = @"DXDeviceListCell";
 }
 -(void)initDataDr02{//Dr水滴
     NSArray *arr = @[
-        @{@"DeviceType":@"Dr.水滴高光仪",
+        @{@"DeviceType":HJLocalizedString(@"Dr.水滴高光仪"),
           @"DeviceCode":Dr02DeviceName,
           @"DeviceId":@"LS01",
           @"imgName":@"DXDr_02",
           @"tag":@(DM1BtnTag),
           
-        },@{@"DeviceType":@"Dr.Hi飞秀",
+        },@{@"DeviceType":HJLocalizedString(@"Dr.Hi飞秀"),
             @"DeviceCode":@"Dr-04",
             @"DeviceId":@"Dr-04",
             @"imgName":@"DXDr_HFX",
@@ -225,13 +225,13 @@ static NSString *dxmachineCell = @"DXDeviceListCell";
 }
 -(void)initDataDR{//Dr
     NSArray *arr = @[
-        @{@"DeviceType":@"Dr强效向控旋磁仪",
+        @{@"DeviceType":HJLocalizedString(@"Dr强效向控旋磁仪"),
           @"DeviceCode":DrDeviceFacialName,
           @"DeviceId":@"Dr-01",
           @"imgName":@"DR_DeviceListCellBgImg",
           @"tag":@(D3BtnTag)
         },
-        @{@"DeviceType":@"高光水滴仪",
+        @{@"DeviceType":HJLocalizedString(@"高光水滴仪"),
           @"DeviceCode":DrDeviceDr02BName,
           @"DeviceId":@"Dr-02-B",
           @"imgName":@"Dr02BListImg",

DJMHomeTY/Page/DeviceListPage/Controller/XHDeviceListVC.m

@@ -121,7 +121,7 @@ static NSString *machineCell = @"XHDeviceListCell";
 #pragma mark - ==========数据处理方法==========
 -(void)initDataTY{//TY
     NSArray *arr = @[
-        @{@"DeviceType":@"LDM(家居版)",
+        @{@"DeviceType":HJLocalizedString(@"LDM(家居版)"),
           @"DeviceCode":TYDeviceName,
           @"DeviceId":@"LS01",
           @"imgName":@"",
@@ -131,7 +131,7 @@ static NSString *machineCell = @"XHDeviceListCell";
 }
 -(void)initDataDr02{//Dr水滴
     NSArray *arr = @[
-        @{@"DeviceType":@"LDM(家居版)",
+        @{@"DeviceType":HJLocalizedString(@"LDM(家居版)"),
           @"DeviceCode":Dr02DeviceName,
           @"DeviceId":@"LS01",
           @"imgName":@"",
@@ -143,13 +143,13 @@ static NSString *machineCell = @"XHDeviceListCell";
 -(void)initDataDR{//Dr
     
     NSArray *arr = @[
-        @{@"DeviceType":@"Dr强效向控旋磁仪",
+        @{@"DeviceType":HJLocalizedString(@"Dr强效向控旋磁仪"),
           @"DeviceCode":DrDeviceFacialName,
           @"DeviceId":@"Dr-01",
           @"imgName":@"DR_DeviceListCellBgImg",
           @"tag":@(D3BtnTag)
         },
-        @{@"DeviceType":@"高光水滴仪",
+        @{@"DeviceType":HJLocalizedString(@"高光水滴仪"),
           @"DeviceCode":DrDeviceDr02BName,
           @"DeviceId":@"Dr-02-B",
           @"imgName":@"Dr02BListImg",

DJMHomeTY/Page/Dr03/View/XHDr03View.m

@@ -19,7 +19,7 @@
 - (instancetype)initWithFrame:(CGRect)frame
 {
     if (!(self = [super initWithFrame:frame])) return nil;
-    self.currentFaceImgArr = @[@"下额线",@"法令纹",@"苹果肌",@"眼部",@"额头"];
+    self.currentFaceImgArr = @[HJLocalizedString(@"下额线"),HJLocalizedString(@"法令纹"),HJLocalizedString(@"苹果肌"),HJLocalizedString(@"眼部"),HJLocalizedString(@"额头")];
     [self createUI];
     return self;
 }
@@ -41,7 +41,7 @@
         make.centerX.mas_equalTo(self);
     }];
     self.topFaceImgView = topImg;
-    NSArray *titleArr = @[@"下额线\n 5mins",@"法令纹\n5mins",@"苹果肌\n5mins",@"眼部\n5mins",@"额头\n5mins"];
+    NSArray *titleArr = @[HJLocalizedString(@"下额线\n 5mins"),HJLocalizedString(@"法令纹\n5mins"),HJLocalizedString(@"苹果肌\n5mins"),HJLocalizedString(@"眼部\n5mins"),HJLocalizedString(@"额头\n5mins")];
     for (int i = 0; i<5; i++) {
         UIButton *btn = [UIButton myUIButtonSuperView:self withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(selectModelAction:) withTag:D3Model1Btn1tag+i withNormalImg:HJSetImg(@"D03Btn_nor") withSelectedImg:HJSetImg(@"D03Btn_sel") withHighlightedImg:HJSetImg(@"D03Btn_sel") withTitle:HJLocalizedString(titleArr[i]) withFont:XHFontSize(12) withTitleNormalColor:[UIColor lightGrayColor] withTitleSelectedColor:[UIColor whiteColor]];
         btn.titleLabel.lineBreakMode = 0;

DJMHomeTY/Page/HomePage/Controller/XHMainVC1.m

@@ -375,7 +375,7 @@
             [self initMyData:sender.selected];
         }
     }else{
-        [self showError:@"当前模式正在进行中，请结束后再切换模式!"];
+        [self showError:HJLocalizedString(@"当前模式正在进行中，请结束后再切换模式!")];
     }
 }
 #pragma  mark UI 显示ModelVie
@@ -441,13 +441,13 @@
 #pragma mark XHSmartViewDelegate/XHCustomViewDelegate
 - (void)btnAction:(UIButton *)sender{
     if(!self.BLEConnect){
-        [self showError:@"请连接上设备后重试"];
+        [self showError:HJLocalizedString(@"请连接上设备后重试")];
         return;
     }
    
     if (sender.tag ==Home_SelectPlanBtnTag) {
         if(self.isStartted){//方案已经开始不能切换
-            [self showError:@"请结束当前方案后再切换"];
+            [self showError:HJLocalizedString(@"请结束当前方案后再切换")];
             return;
         }
         [self showModelView];
@@ -1110,7 +1110,7 @@
                 [HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"06000B31020200"] withCrc16Modbus]];//暂停
                 [self stopAction];
             }
-            [self showError:@"手柄未连接"];
+            [self showError:HJLocalizedString(@"手柄未连接")];
         }
     }else if (HJStringNSNotFound(str,@"06000B330153")){//固件版本55aa06000b33015301757b
 //        if((self.currentReceiveTimes2-self.currentReceiveTimes1)/200<=0){
@@ -1692,7 +1692,7 @@
         if(buttonIndex == 1){//升级
             [HJGetBluetoothManager writeStr:[DR04_HFX_send_getUpdateVersion withCrc16Modbus]];
             [weakSelf.UploadAlert close];
-            [SVProgressHUD showWithStatus:@"正在准备升级..."];
+            [SVProgressHUD showWithStatus:HJLocalizedString(@"正在准备升级...")];
         }else{
             [weakSelf.UploadAlert close];
         }
@@ -1703,8 +1703,8 @@
     HJSelfWeak;
     dispatch_async(dispatch_get_main_queue(), ^{
         float percentage = (float)index / total;
-        [SVProgressHUD showProgress:percentage status:[NSString stringWithFormat:@"正在升级固件\n(已完成%.2f%%)\n请勿断开蓝牙",percentage * 100]];
-
+//        [SVProgressHUD showProgress:percentage status:[NSString stringWithFormat:@"正在升级固件\n(已完成%.2f%%)\n请勿断开蓝牙",percentage * 100]];
+        [SVProgressHUD showProgress:percentage status:[NSString stringWithFormat:@"%@\n(%@ %.2f%%)\n%@",HJLocalizedString(@"正在升级固件"),HJLocalizedString(@"已完成"),percentage * 100,HJLocalizedString(@"请勿断开蓝牙")]];
     });
     
     

DJMHomeTY/Page/HomePage/View/XHCustomSetTimes.m

@@ -121,10 +121,11 @@
     
     if(slider == self.mySlider3M){
         NSLog(@"slider.valueslider.value1:%f",slider.value);
-        self.mySliderLb3M.text = [NSString stringWithFormat:@"调节变频时间 | %.fms",slider.value];
+//        self.mySliderLb3M.text = [NSString stringWithFormat:@"调节变频时间 | %.fms",slider.value];
+        self.mySliderLb3M.text = [NSString stringWithFormat:@"%@ | %.fms",HJLocalizedString(@"调节变频时间"),slider.value];
     }else if(slider == self.mySlider10M){
         NSLog(@"slider.valueslider.value2:%f",slider.value);
-        self.mySliderLb10M.text = [NSString stringWithFormat:@"调节变频时间 | %.fms",slider.value];
+        self.mySliderLb10M.text = [NSString stringWithFormat:@"%@ | %.fms",HJLocalizedString(@"调节变频时间"),slider.value];
     }
     
     if (self.sendtimesBlock) {
@@ -155,9 +156,11 @@
     HJSelfWeak;
     dispatch_async(dispatch_get_main_queue(), ^{
         weakSelf.mySlider3M.value = [model.str1 intValue];
-        weakSelf.mySliderLb3M.text = [NSString stringWithFormat:@"调节变频时间 | %dms",[model.str1 intValue]];
+//        weakSelf.mySliderLb3M.text = [NSString stringWithFormat:@"调节变频时间 | %dms",[model.str1 intValue]];
+        self.mySliderLb3M.text = [NSString stringWithFormat:@"%@ | %.dms",HJLocalizedString(@"调节变频时间"),[model.str1 intValue]];
         weakSelf.mySlider10M.value = [model.str2 intValue];
-        weakSelf.mySliderLb10M.text = [NSString stringWithFormat:@"调节变频时间 | %dms",[model.str2 intValue]];
+//        weakSelf.mySliderLb10M.text = [NSString stringWithFormat:@"调节变频时间 | %dms",[model.str2 intValue]];
+        weakSelf.mySliderLb10M.text = [NSString stringWithFormat:@"%@ | %.dms",HJLocalizedString(@"调节变频时间"),[model.str2 intValue]];
     });
 }
 @end

DJMHomeTY/Page/HomePage/View/XHCustomView.m

@@ -77,7 +77,7 @@
     }];
     
     
-    UILabel *strengthLb1Bottom = [UILabel myUILabelSuperView:myView withNSTextAlignment:NSTextAlignmentCenter withContent:(TargetType==5)?@"3M 档位":@"3M 强度(W/cm²)" withFont:XHFontSize(10) withTextColor:XHBtnTextColor withResize:true];
+    UILabel *strengthLb1Bottom = [UILabel myUILabelSuperView:myView withNSTextAlignment:NSTextAlignmentCenter withContent:(TargetType==5)?HJLocalizedString(@"3M 档位"):HJLocalizedString(@"3M 强度(W/cm²)") withFont:XHFontSize(10) withTextColor:XHBtnTextColor withResize:true];
     [strengthLb1Bottom mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(strengthLb.mas_bottom).offset(0*IPhone6ScaleHeight);
         make.centerX.mas_equalTo(myView);
@@ -147,7 +147,7 @@
         make.width.height.mas_equalTo(49.9*IPhone6ScaleWidth);
     }];
     
-    UILabel *strengthLb2Bottom = [UILabel myUILabelSuperView:myView withNSTextAlignment:NSTextAlignmentCenter withContent:(TargetType==5)?@"10M 档位":@"10M 强度(W/cm²)" withFont:XHFontSize(10) withTextColor:XHBtnTextColor withResize:true];
+    UILabel *strengthLb2Bottom = [UILabel myUILabelSuperView:myView withNSTextAlignment:NSTextAlignmentCenter withContent:(TargetType==5)?HJLocalizedString(@"10M 档位"):HJLocalizedString(@"10M 强度(W/cm²)") withFont:XHFontSize(10) withTextColor:XHBtnTextColor withResize:true];
     [strengthLb2Bottom mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(strengthLb2.mas_bottom).offset(0*IPhone6ScaleHeight);
         make.centerX.mas_equalTo(myView);

DJMHomeTY/Page/HomePage/View/XHSelectModelView.m

@@ -59,11 +59,12 @@
     if((TargetType == 2)||(TargetType == 4)){
         itemNorArrimg = @[@"Home_Slect_eye_n",@"Home_Slect_deepGrain_n",@"Home_Slect_up_n",@"Home_Slect_face_n",@"Home_Slect_skin_n",@"Home_Slect_newskin_n",@"Home_Slect_anti-aging_n",@"Home_Slect_absorption_n",@"Home_Slect_acne_n",@"Home_Slect_papules_n"];
         itemSelArrimg = @[@"Home_Slect_eye_s",@"Home_Slect_deepGrain_s",@"Home_Slect_up_s",@"Home_Slect_face_s",@"Home_Slect_skin_s",@"Home_Slect_newskin_s",@"Home_Slect_anti-aging_s",@"Home_Slect_absorption_s",@"Home_Slect_acne_s",@"Home_Slect_papules_s"];
-        itemArr = @[@"眼纹",@"深纹",@"提升",@"面部紧致",@"皮肤焕新",@"敏感性皮肤焕新",@"抗衰",@"辅助面部吸收",@"粉刺痤疮",@"丘疹脓疱性痤疮"];
+        itemArr = @[HJLocalizedString(@"眼纹"),HJLocalizedString(@"深纹"),HJLocalizedString(@"提升"),HJLocalizedString(@"面部紧致"),HJLocalizedString(@"皮肤焕新"),HJLocalizedString(@"敏感性皮肤焕新"),HJLocalizedString(@"抗衰"),HJLocalizedString(@"辅助面部吸收"),HJLocalizedString(@"粉刺痤疮"),HJLocalizedString(@"丘疹脓疱性痤疮")];
+        
     }else{
         itemNorArrimg = @[@"Home_Slect_eye_n_r",@"Home_Slect_deepGrain_n_r",@"Home_Slect_up_n_r",@"Home_Slect_face_n_r",@"Home_Slect_skin_n_r",@"Home_Slect_newskin_n_r",@"Home_Slect_anti-aging_n_r",@"Home_Slect_absorption_n_r",@"Home_Slect_acne_n_r",@"Home_Slect_papules_n_r"];
         itemSelArrimg = @[@"Home_Slect_eye_s_r",@"Home_Slect_deepGrain_s_r",@"Home_Slect_up_s_r",@"Home_Slect_face_s_r",@"Home_Slect_skin_s_r",@"Home_Slect_newskin_s_r",@"Home_Slect_anti-aging_s_r",@"Home_Slect_absorption_s_r",@"Home_Slect_acne_s_r",@"Home_Slect_papules_s_r"];
-        itemArr = @[@"明眸淡纹",@"抚平舒纹",@"童颜提拉",@"轮廓紧致",@"美肌焕新",@"舒敏焕新",@"抗衰",@"嫩颜促吸",@"平痘护肤",@"平痘抑菌"];
+        itemArr = @[HJLocalizedString(@"明眸淡纹"),HJLocalizedString(@"抚平舒纹"),HJLocalizedString(@"童颜提拉"),HJLocalizedString(@"轮廓紧致"),HJLocalizedString(@"美肌焕新"),HJLocalizedString(@"舒敏焕新"),HJLocalizedString(@"抗衰"),HJLocalizedString(@"嫩颜促吸"),HJLocalizedString(@"平痘护肤"),HJLocalizedString(@"平痘抑菌")];
     }
     
     for (int i = 0; i<itemArr.count; i++) {

DJMHomeTY/Page/HomePage/View/XHSmartView.m

@@ -30,9 +30,9 @@
 }
 -(void)createUI{
     if(TargetType == 5){
-        self.modelArr = @[@"明眸淡纹",@"抚平舒纹",@"童颜提拉",@"轮廓紧致",@"美肌焕新",@"舒敏焕新",@"抗衰",@"嫩颜促吸",@"平痘护肤",@"平痘抑菌"];
+        self.modelArr = @[HJLocalizedString(@"明眸淡纹"),HJLocalizedString(@"抚平舒纹"),HJLocalizedString(@"童颜提拉"),HJLocalizedString(@"轮廓紧致"),HJLocalizedString(@"美肌焕新"),HJLocalizedString(@"舒敏焕新"),HJLocalizedString(@"抗衰"),HJLocalizedString(@"嫩颜促吸"),HJLocalizedString(@"平痘护肤"),HJLocalizedString(@"平痘抑菌")];
     }else{
-        self.modelArr = @[@"眼纹",@"深纹",@"提升",@"面部紧致",@"皮肤焕新",@"敏感性皮肤焕新",@"抗衰",@"辅助面部吸收",@"粉刺痤疮",@"丘疹脓疱性痤疮"];
+        self.modelArr = @[HJLocalizedString(@"眼纹"),HJLocalizedString(@"深纹"),HJLocalizedString(@"提升"),HJLocalizedString(@"面部紧致"),HJLocalizedString(@"皮肤焕新"),HJLocalizedString(@"敏感性皮肤焕新"),HJLocalizedString(@"抗衰"),HJLocalizedString(@"辅助面部吸收"),HJLocalizedString(@"粉刺痤疮"),HJLocalizedString(@"丘疹脓疱性痤疮")];
     }
     
     [self creatNoSelectModelView];
@@ -168,7 +168,7 @@
     }];
     
     
-    UILabel *strengthLb1Bottom = [UILabel myUILabelSuperView:self.SelectModelView withNSTextAlignment:NSTextAlignmentCenter withContent:(TargetType==5)?@"3M   档位":@"3M 强度(W/cm²)" withFont:XHFontSize(10) withTextColor:XHBtnTextColor withResize:true];
+    UILabel *strengthLb1Bottom = [UILabel myUILabelSuperView:self.SelectModelView withNSTextAlignment:NSTextAlignmentCenter withContent:(TargetType==5)?HJLocalizedString(@"3M   档位"):HJLocalizedString(@"3M 强度(W/cm²)") withFont:XHFontSize(10) withTextColor:XHBtnTextColor withResize:true];
     [strengthLb1Bottom mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(strengthLb.mas_bottom).offset(0*IPhone6ScaleHeight);
         make.centerX.mas_equalTo(self.SelectModelView);
@@ -240,7 +240,7 @@
         make.width.height.mas_equalTo(49.9*IPhone6ScaleWidth);
     }];
     
-    UILabel *strengthLb2Bottom = [UILabel myUILabelSuperView:self.SelectModelView withNSTextAlignment:NSTextAlignmentCenter withContent:(TargetType==5)?@"10M   档位":@"10M 强度(W/cm²)" withFont:XHFontSize(10) withTextColor:XHBtnTextColor withResize:true];
+    UILabel *strengthLb2Bottom = [UILabel myUILabelSuperView:self.SelectModelView withNSTextAlignment:NSTextAlignmentCenter withContent:(TargetType==5)?HJLocalizedString(@"10M   档位"):HJLocalizedString(@"10M 强度(W/cm²)") withFont:XHFontSize(10) withTextColor:XHBtnTextColor withResize:true];
     [strengthLb2Bottom mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(strengthLb2.mas_bottom).offset(0*IPhone6ScaleHeight);
         make.centerX.mas_equalTo(self.SelectModelView);

DJMHomeTY/Page/SelectDevicePage/Controller/XHSelectDeviceVC.m

@@ -17,7 +17,7 @@
 @implementation XHSelectDeviceVC
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
-    self.title = @"选择设备型号";
+    self.title = HJLocalizedString(@"选择设备型号");
     //隐藏导航栏
     [self.navigationController.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:0];
     self.navigationController.navigationBar.shadowImage=[UIImage new];
@@ -38,7 +38,7 @@
     [self.view addSubview:self.collectionView];
     NSArray *arr = @[
         @{@"imgName":@"Home_DeviceLogo",
-          @"machineName":@"LDM(家居版)",
+          @"machineName":HJLocalizedString(@"LDM(家居版)"),
           @"machineid":@"S01",
           @"tag":@(1)
         }

DJMHomeTY/Page/SetOrPesonalPage/View/XHSetOrPersonalView.m

@@ -47,7 +47,7 @@
     }];
     
     NSArray *imgArr = @[@"Personal_Ico",@"Set_Ico"];
-    NSArray *titleArr = @[@"个人中心",@"设备设置"];
+    NSArray *titleArr = @[HJLocalizedString(@"个人中心"),HJLocalizedString(@"设备设置")];
     for (int i = 0; i<imgArr.count; i++) {
         UIButton *btn = [UIButton myUIButtonSuperView:bgV withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(gotoSetPageAction:) withTag:1000001+i withNormalImg:nil withSelectedImg:nil withHighlightedImg:nil withTitle:nil withFont:XHFontSize(14) withTitleNormalColor:XHTextFieldTextColor withTitleSelectedColor:XHTextFieldTextColor];
         [btn setImage:HJSetImg(imgArr[i]) forState:UIControlStateNormal];

DJMHomeTY/Page/SetPage/Controller/XHSetHomeVC.m

@@ -98,19 +98,19 @@ static NSString *cellID = @"XHSetHomeCell";
               @"rightImgState":@(1),
               @"switchViewState":@(1)
             },
-            @{@"title":@"设置手柄频率",
+            @{@"title":HJLocalizedString(@"设置手柄频率"),
               @"rightStr":@"3M/10M",
               @"rightImgState":@(0),
               @"switchViewState":@(1)},
-            @{@"title":@"设备消毒程序",
+            @{@"title":HJLocalizedString(@"设备消毒程序"),
               @"rightStr":@"",
               @"rightImgState":@(1),
               @"switchViewState":@(0)},
-            @{@"title":@"应用程序版本",
+            @{@"title":HJLocalizedString(@"应用程序版本"),
               @"rightStr":SoftVersion,
               @"rightImgState":@(0),
               @"switchViewState":@(1)},
-            @{@"title":@"固件版本",
+            @{@"title":HJLocalizedString(@"固件版本"),
               @"rightStr":[XHCommonMethods isEmptyOrNull:XHGetDataManager.machineVersion]?@"":XHGetDataManager.machineVersion,
               @"rightImgState":@(0),
               @"switchViewState":@(1)}
@@ -127,16 +127,16 @@ static NSString *cellID = @"XHSetHomeCell";
               @"rightImgState":@(1),
               @"switchViewState":@(1)
             },
-            @{@"title":@"设备id",
+            @{@"title":HJLocalizedString(@"设备id"),
               @"rightStr":[XHCommonMethods isEmptyOrNull:XHGetDataManager.deviceID]?@"":XHGetDataManager.deviceID,
               @"rightImgState":@(1),
               @"switchViewState":@(1)
             },
-            @{@"title":@"应用程序版本",
+            @{@"title":HJLocalizedString(@"应用程序版本"),
               @"rightStr":SoftVersion,
               @"rightImgState":@(1),
               @"switchViewState":@(1)},
-            @{@"title":@"固件版本",
+            @{@"title":HJLocalizedString(@"固件版本"),
               @"rightStr":[XHCommonMethods isEmptyOrNull:XHGetDataManager.machineVersion]?@"":XHGetDataManager.machineVersion,
               @"rightImgState":@(1),
               @"switchViewState":@(1)}
@@ -148,20 +148,20 @@ static NSString *cellID = @"XHSetHomeCell";
               @"rightImgState":@(1),
               @"switchViewState":@(1)
             },
-            @{@"title":@"设备id",
+            @{@"title":HJLocalizedString(@"设备id"),
               @"rightStr":[XHCommonMethods isEmptyOrNull:XHGetDataManager.deviceID]?@"":XHGetDataManager.deviceID,
               @"rightImgState":@(1),
               @"switchViewState":@(1)
             },
-            @{@"title":@"设置手柄频率",
+            @{@"title":HJLocalizedString(@"设置手柄频率"),
               @"rightStr":@"3M/10M",
               @"rightImgState":@(0),
               @"switchViewState":@(1)},
-            @{@"title":@"应用程序版本",
+            @{@"title":HJLocalizedString(@"应用程序版本"),
               @"rightStr":SoftVersion,
               @"rightImgState":@(1),
               @"switchViewState":@(1)},
-            @{@"title":@"固件版本",
+            @{@"title":HJLocalizedString(@"固件版本"),
               @"rightStr":[XHCommonMethods isEmptyOrNull:XHGetDataManager.machineVersion]?@"":XHGetDataManager.machineVersion,
               @"rightImgState":@(1),
               @"switchViewState":@(1)}

Pods/ZFPlayer/ZFPlayer/Classes/ControlView/ZFPlayerControlView.m

@@ -775,7 +775,7 @@
 - (UIButton *)failBtn {
     if (!_failBtn) {
         _failBtn = [UIButton buttonWithType:UIButtonTypeSystem];
-        [_failBtn setTitle:@"加载失败,点击重试" forState:UIControlStateNormal];
+        [_failBtn setTitle:NSLocalizedString(@"加载失败,点击重试",nil) forState:UIControlStateNormal];
         [_failBtn addTarget:self action:@selector(failBtnClick:) forControlEvents:UIControlEventTouchUpInside];
         [_failBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
         _failBtn.titleLabel.font = [UIFont systemFontOfSize:14.0];

Pods/ZFPlayer/ZFPlayer/Classes/ControlView/ZFPlayerStatusBar.m

@@ -266,7 +266,7 @@
             net = @"WIFI";
             break;
         case ZFReachabilityStatusNotReachable:
-            net = @"无网络";
+            net = NSLocalizedString(@"无网络",nil);
             break;
         case ZFReachabilityStatusReachableVia2G:
             net = @"2G";
@@ -281,7 +281,7 @@
             net = @"5G";
             break;
         default:
-            net = @"未知";
+            net = NSLocalizedString(@"未知",nil);
             break;
     }
     return net;