features:新绚多页面&设置页面&修改名字页面

Ifish/Utinitys/DataCenter/UserExtendataArchaver.h

@@ -54,5 +54,8 @@
 +(void)saveXuToControlName:(XuToControlName *)nameModel;
 +(XuToControlName *)currentXuToControlName:(NSString *)macaddress;
 
+//新绚多
++(void)saveNewXuToControlName:(XuToControlName *)nameModel;
++(XuToControlName *)currentNewXuToControlName:(NSString *)macaddress;
 
 @end

Ifish/Utinitys/DataCenter/UserExtendataArchaver.m

@@ -214,5 +214,34 @@
 
 }
 
++(void)saveNewXuToControlName:(XuToControlName *)nameModel
+{
+    NSString *key = [NSString stringWithFormat:@"newXuTo%@",nameModel.macAddress];
+    NSString *file = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES).firstObject stringByAppendingPathComponent:key];
+    [NSKeyedArchiver archiveRootObject:nameModel toFile:file];
+}
+
++(XuToControlName *)currentNewXuToControlName:(NSString *)macaddress
+{
+    NSString *key = [NSString stringWithFormat:@"newXuTo%@",macaddress];
+    NSString *file = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES).firstObject stringByAppendingPathComponent:key];
+    XuToControlName *controlName = [NSKeyedUnarchiver unarchiveObjectWithFile:file];
+    if (!controlName||[controlName isKindOfClass:[NSNull class]]) {
+        controlName = [[XuToControlName  alloc] init];
+        controlName.shajunLight = @"杀菌灯";
+        controlName.zengyangPump = @"增氧泵";
+        controlName.light1 = @"灯光1";
+        controlName.light2 = @"灯光2";
+        controlName.zaolangPump = @"造浪泵";
+        controlName.huLiDeng = @"护理灯";
+        controlName.xunhuanPump = @"循环泵";
+        controlName.jiaRe = @"加热棒";
+        controlName.macAddress = macaddress;
+    }
+    return controlName;
+    
+}
+
+
 
 @end

Ifish/Utinitys/IfishHttpRequest/IfishDataUnity.h

@@ -9,7 +9,6 @@
 #import <Foundation/Foundation.h>
 
 #import "ScanViewController.h"
-
 #import "SonNuoCenterViewController.h"
 #import "YooseeCenterViewController.h"
 #import "DeviceCameraModel.h"

Ifish/Utinitys/IfishHttpRequest/IfishDataUnity.m

@@ -11,6 +11,7 @@
 #import "IfishCameraModel.h"
 #import "IfishNewsModel.h"
 #import "IfishHotBarVc.h"
+#import "Xuanduo2fController.h"
 
 @implementation IfishDataUnity
 
@@ -169,6 +170,12 @@
             tabVc.selectedIndex=0;
             UINavigationController*navVc=(UINavigationController*)tabVc.childViewControllers[tabVc.selectedIndex];
             [navVc pushViewController:barVc animated:YES];
+        }else if([devicemodel.type isEqualToString:DECICE_TYPE_XUANDUO2F]){
+            //绚多新设备
+            Xuanduo2fController *xuanduo2fVc = [Xuanduo2fController new];
+            xuanduo2fVc.currentDevice = devicemodel;
+            UINavigationController *xuanduo2fNav=[[UINavigationController alloc]initWithRootViewController:xuanduo2fVc];
+            [UIApplication sharedApplication].delegate.window.rootViewController = xuanduo2fNav;
         }
         else{
             

Ifish/Utinitys/IfishHttpRequest/IfishUserDataUnity.m

@@ -128,7 +128,6 @@
     LoginData *data = [[NTESLoginManager sharedManager] currentLoginData];
     NSString *account = [data account];
     NSString *token = [data token];
-    
     //如果有缓存用户名密码推荐使用自动登录
     if ([account length] && [token length])
     {

Ifish/Utinitys/IfishUtils/IfishDeviceInfo.h

@@ -30,6 +30,7 @@
 //绚多
 #define DECICE_TYPE_XUANDUOOF @"0f" //0x0f//无屏幕
 #define DECICE_TYPE_XUANDUO1F @"1f" //0x1f//有屏幕
+#define DECICE_TYPE_XUANDUO2F @"2f" //新设备
 
 //可丽爱
 #define DECICE_TYPE_KELIAI @"aa" //0xaa