控制名称重名问题

Ifish.xcodeproj/project.pbxproj

@@ -15852,7 +15852,7 @@
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl",
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl",
 				);
-				MARKETING_VERSION = 5.1.9;
+				MARKETING_VERSION = 5.1.11;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -15970,7 +15970,7 @@
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl",
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl",
 				);
-				MARKETING_VERSION = 5.1.9;
+				MARKETING_VERSION = 5.1.11;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-ObjC",

Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToControlNameViewController.m

@@ -185,6 +185,7 @@
     
     //RunSunCHNameCustom 本地处理 保存按钮名称 不与服务器交互
     XuToControlName *name  = [[XuToControlName alloc] init];
+    NSMutableSet*set=[NSMutableSet set];
     if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F])
     {
         name=[UserExtendataArchaver currentXuToControlName:self.device.macAddress];
@@ -211,6 +212,7 @@
                 {
                     name.xunhuanPump=cell.chName.text;
                 }
+                [set addObject:name.xunhuanPump];
             }
             else if ([cell.chTitle.text isEqualToString:@"换气"]) {
                 
@@ -229,6 +231,7 @@
                 {
                     name.zengyangPump=cell.chName.text;
                 }
+                [set addObject:name.zengyangPump];
             }
             else if ([cell.chTitle.text isEqualToString:@"杀菌"]) {
                 
@@ -247,6 +250,7 @@
                 {
                     name.light1=cell.chName.text;
                 }
+                [set addObject:name.light1];
             }
             else if ([cell.chTitle.text isEqualToString:@"恒温"]) {
                 
@@ -265,15 +269,22 @@
                 {
                     name.light2=cell.chName.text;
                 }
+                [set addObject:name.light2];
             }
 
 
 
+        }
+        if (set.count!=4)
+        {
+            [self.view makeToast:@"不允许重名！"];
+            return;
         }
         [UserExtendataArchaver saveNewXuToControlName:name];
         [self upLoadDeviceName];
         return;
     }
+    [set removeAllObjects];
     RuSunChangeNameTextViewCell*cell1 = [self.view viewWithTag:XUTOCHCELL_AIR];
     if (cell1.chName.text.length>3) {
         if (_isNewdevice) {
@@ -296,7 +307,7 @@
     }else{
         name.airPump = cell1.chName.text;
     }
-    
+    [set addObject:cell1.chName.text];
     RuSunChangeNameTextViewCell*cell2 = [self.view viewWithTag:XUTOCHCELL_LIANGHT1];
     if (cell2.chName.text.length>3) {
         if (_isNewdevice) {
@@ -319,7 +330,7 @@
     }else{
         name.light1 = cell2.chName.text;
     }
-    
+    [set addObject:cell2.chName.text];
     RuSunChangeNameTextViewCell*cell3 = [self.view viewWithTag:XUTOCHCELL_LIANGHT2];
     if (cell3.chName.text.length>3) {
         if (_isNewdevice) {
@@ -342,7 +353,7 @@
     }else {
         name.light2 = cell3.chName.text;
     }
-    
+    [set addObject:cell3.chName.text];
     RuSunChangeNameTextViewCell*cell4 = [self.view viewWithTag:XUTOCHCELL_HULI];
     if (cell4.chName.text.length>3) {
         if (_isNewdevice) {
@@ -365,6 +376,7 @@
     }else {
         name.huLiDeng = cell4.chName.text;
     }
+    [set addObject:cell4.chName.text];
     RuSunChangeNameTextViewCell*cell5 = [self.view viewWithTag:XUTOCHCELL_WATER];
     if (cell5.chName.text.length>3) {
         if (_isNewdevice) {
@@ -387,7 +399,7 @@
     }else {
         name.waterPump = cell5.chName.text;
     }
-    
+    [set addObject:cell5.chName.text];
     RuSunChangeNameTextViewCell*cell6 = [self.view viewWithTag:XUTOCHCELL_JIARE];
     if (cell6.chName.text.length>3) {
         if (_isNewdevice) {
@@ -410,7 +422,7 @@
     }else {
         name.jiaRe = cell6.chName.text;
     }
-    
+    [set addObject:cell6.chName.text];
     RuSunChangeNameTextViewCell*cell7 = [self.view viewWithTag:50006];
     if (cell7) {
         if (cell7.chName.text.length>3) {
@@ -423,6 +435,7 @@
         }
         
         name.xunhuanPump = cell7.chName.text;
+        [set addObject:cell7.chName.text];
     }
     
     RuSunChangeNameTextViewCell*cell8 = [self.view viewWithTag:50007];
@@ -437,10 +450,29 @@
         }
         
         name.jiaRe = cell8.chName.text;
+        [set addObject:cell8.chName.text];
     }
 
 
     name.macAddress  = self.device.macAddress;
+    
+    NSInteger cellCount=0;
+    if (self.isNewdevice)
+    {
+        cellCount=8;
+        if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F]) {
+            cellCount=4;
+        }
+    }
+    else
+    {
+        cellCount=6;
+    }
+    if (set.count!=cellCount)
+    {
+        [self.view makeToast:@"不允许重名！"];
+        return;
+    }
     if (_isNewdevice) {
         [UserExtendataArchaver saveNewXuToControlName:name];
     }else {

Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m

@@ -25,7 +25,7 @@
    // CFShow((__bridge CFTypeRef)(infoDic));
     NSString *app_Version=[infoDic objectForKey:@"CFBundleShortVersionString"];
     NSLog(@"app_Version%@",app_Version);
-    app_Version=@"4.7.9";
+    app_Version=@"4.7.11";
     NSString *versionStr = [NSString stringWithFormat:@"v%@",app_Version];
     NSString *buildVersion = [infoDic objectForKey:@"CFBundleVersion"];
     if (buildVersion.length > 0) {