宠物店修改

Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m

@@ -2211,7 +2211,15 @@ Strong UIImage *screenShotImage;//截图
     [[Socketsingleton sharedInstance] cutOffSocket];
     [AppDelegate sharedDefault].canFullScreen = NO;
     //改 tab 栏后新增
-    [self setAppTabRoot];
+    if ([self.navigationController.viewControllers firstObject]==self)
+    {
+      [self setAppTabRoot];
+    }
+    else
+    {
+        [self.navigationController popViewControllerAnimated:YES];
+    }
+    
 
     
 }

Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m

@@ -1799,7 +1799,7 @@
         if (!_xuanduoBack) {
             _xuanduoBack = [[Xuanduo2Model alloc] init];
         }
-        [Xuanduo2DataUtility readSocketDataWithBackMsgModel:_xuanduoBack addWithBackData:data];
+        [Xuanduo2DataUtility readSocketDataWithBackMsgModel:_xuanduoBack addWithBackData:data type:DECICE_TYPE_XUANDUO2F];
         self.temperature = [BootomViewSoketBackMasgConreol getTempNewWayWithSoketData:data adddeviceType:DECICE_TYPE_XUANDUO2F];
         [self.collectionView reloadData];
     }else{

Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/Constants.h

@@ -197,7 +197,8 @@ typedef NS_ENUM(NSUInteger, SmartDeviceType) {
     DEVICEAQUARIUM ,
     
     /// 加热
-    DEVICEHEATING
+    DEVICEHEATING,
+    DEVICEPETS
 };
 #define Ali_Push_APPKey @"26007228"
 #define Ali_Push_APPSecret @"87c9206424399968ba11a56a9a979cfe"