宠物店修改

Ifish/Utinitys/IfishHttpRequest/AFNOHeaderHttpTool.m

@@ -313,10 +313,24 @@ methodType url : (NSString *)url
                      failure:(void (^)(NSError* err))failure
 {
     
+    NSString*macid=[[deviceId componentsSeparatedByString:@"_"] firstObject];
+    
+    NSString*deviceType=[[deviceId componentsSeparatedByString:@"_"] lastObject];
+    
+    NSString*type=@"0";//0换水 1杀菌
+    
+    if ([deviceType isEqualToString:@"3f"])
+    {
+        type=@"1";
+    }
+    
+    
+    
     NSDictionary*para=@{
-                        @"deviceId":deviceId,
+                        @"deviceId":macid,
                         @"waterRemind":waterRemind,
-                        @"remindCycle":remindCycle
+                        @"remindCycle":remindCycle,
+                        @"type":type
                         
                         };
     [AFNOHeaderHttpTool requestWihtMethod:RequestTypePost url:kSetRemindWaterInf params:para success:success failure:failure];

Ifish/Utinitys/IfishHttpRequest/IfishDataUnity.m

@@ -173,6 +173,13 @@
             UINavigationController *xuanduo2fNav=[[UINavigationController alloc]initWithRootViewController:xuanduo2fVc];
             [UIApplication sharedApplication].delegate.window.rootViewController = xuanduo2fNav;
         }
+        else if([devicemodel.type isEqualToString:DECICE_TYPE_XUANDUO3F]){
+            //绚多新设备
+            Xuanduo2fController *xuanduo2fVc = [Xuanduo2fController new];
+            xuanduo2fVc.currentDevice = devicemodel;
+            UINavigationController *xuanduo2fNav=[[UINavigationController alloc]initWithRootViewController:xuanduo2fVc];
+            [UIApplication sharedApplication].delegate.window.rootViewController = xuanduo2fNav;
+        }
         else{
             
             int controlAmount=[devicemodel.controlAmount intValue];

Ifish/Utinitys/IfishHttpRequest/IfishUserDataUnity.m

@@ -32,7 +32,9 @@
     
     NSDictionary *userDic=dataDic[@"userInfo"];
     UserModel *model=[[UserModel alloc] initWithDict:userDic];
+    
     [[DataCenter defaultDtacenter]setValue:model forKey:@"UserLogIn"];
+    [[DataCenter defaultDtacenter] cacheinit:[model.userId stringValue]];
     
     //金币任务等级
     NSDictionary *userAssetDic=dataDic[@"userAsset"];
@@ -88,6 +90,7 @@
     NSDictionary *userDic=dataDic[@"userInfo"];
     UserModel *model=[[UserModel alloc] initWithDict:userDic];
     [[DataCenter defaultDtacenter]setValue:model forKey:@"UserLogIn"];
+    [[DataCenter defaultDtacenter] cacheinit:[model.userId stringValue]];
      NSUserDefaults*userdefult=[NSUserDefaults standardUserDefaults];
     if (model.unionId.length) {
         [userdefult setObject:model.unionId forKey:@"unionId"];