新版本

Ifish/Utinitys/Define.h

@@ -87,7 +87,7 @@ alpha:1.0]
 #import "IfishTaskModel.h"
 #import "merchantModel.h"
 #import "dataContorl.h"
-#import "zbar.h"
+//#import "zbar.h"
 #import "AFHttpTool.h"
 #import "AFNOHeaderHttpTool.h"
 #import "IFISHHttpTool.h"
@@ -464,5 +464,17 @@ alpha:1.0]
 #define IFishUserActivitiesMaxCount [NSString stringWithFormat:@"%@/api/userActivitiesMaxCount",JIEKOUPORT]
 
 
+#define NEWServerURL @"http://139.196.24.156:8080"
+//四十二、    保存\修改 智能加热棒信息
+#define SaveHotBarInfo [NSString stringWithFormat:@"%@/api/user/saveOrUpdateDeviceHeaterInfo.do",JIEKOUPORT]
+// 四十三、    获取智能加热棒信息
+#define GetHotBarInfo [NSString stringWithFormat:@"%@/api/user/getDeviceHeaterInfo.do",JIEKOUPORT]
+//四十四、    删除智能加热棒信息
+#define DeleteHotBar [NSString stringWithFormat:@"%@/api/user/deleteDeviceHeaterInfo.do",JIEKOUPORT]
+
+//
+#define getHotBarHistory [NSString stringWithFormat:@"%@/api/user/getDeviceHeaterPhsByDate.do",JIEKOUPORT]
+
+
 
 #endif /* Define_h */

Ifish/Utinitys/IfishHttpRequest/IfishDataUnity.m

@@ -10,6 +10,7 @@
 //#import "JPUSHService.h"
 #import "IfishCameraModel.h"
 #import "IfishNewsModel.h"
+#import "IfishHotBarVc.h"
 
 @implementation IfishDataUnity
 
@@ -64,14 +65,14 @@
     
         if (scanVC) {
             
-            [[UIApplication sharedApplication].delegate.window.rootViewController.view makeToastActivityBlackBack];
+           // [[UIApplication sharedApplication].delegate.window.rootViewController.view makeToastActivityBlackBack];
     
             [scanVC dismissViewControllerAnimated:YES completion:^{
             
+                
+               // [[UIApplication sharedApplication].delegate.window.rootViewController.view hideToastActivity];
+                
                 [self setrootWith:devicemodel];
-                [[UIApplication sharedApplication].delegate.window.rootViewController.view hideToastActivity];
-                
-                
             }];
            
             return;
@@ -83,6 +84,9 @@
 }
 
 -(void)setrootWith:(DeviceModel*)devicemodel{
+    
+//    NSString *tost=[NSString stringWithFormat:@"type%@",devicemodel.type];
+//    [[UIApplication sharedApplication].keyWindow makeToast:tost];
        // 先判断是否授权
     if ([devicemodel.type isEqual:[NSNull null]]||!devicemodel.type) {
         //未知类型 跳转未授权 显示未知类型
@@ -149,7 +153,24 @@
             [nav.navigationBar setBackgroundImage:[UIImage imageNamed:@"blackbar.png"] forBarMetrics:UIBarMetricsDefault];
             app1.window.rootViewController=nav;
             
-        }else{
+        }else if ([devicemodel.type isEqualToString:DECICE_TYPE_hotBar]) {
+           
+            IfishHotBarVc*barVc=[[IfishHotBarVc alloc]initWithNibName:@"IfishHotBarVc" bundle:nil];
+            barVc.devicemodel = devicemodel;
+            barVc.hidesBottomBarWhenPushed=YES;
+            
+            UIApplication*app=[UIApplication sharedApplication];
+            AppDelegate*app1=(AppDelegate*)app.delegate;
+//            UINavigationController*nav=[[UINavigationController alloc]initWithRootViewController:barVc];
+//            [nav.navigationBar setBackgroundImage:[UIImage imageNamed:@"blackbar.png"] forBarMetrics:UIBarMetricsDefault];
+//            app1.window.rootViewController=nav;
+           // [((UINavigationController*)app1.window.rootViewController) pushViewController:barVc animated:YES];
+            UITabBarController*tabVc= (UITabBarController*)app1.window.rootViewController;
+            tabVc.selectedIndex=0;
+            UINavigationController*navVc=(UINavigationController*)tabVc.childViewControllers[tabVc.selectedIndex];
+            [navVc pushViewController:barVc animated:YES];
+        }
+        else{
             
             int controlAmount=[devicemodel.controlAmount intValue];
             
@@ -186,6 +207,7 @@
                     app1.window.rootViewController=nav;
                     
                     
+                    
                 }
                     break;
                     

Ifish/Utinitys/IfishUtils/IfishDeviceInfo.h

@@ -49,4 +49,7 @@
 //瑞美4控
 #define DECICE_TYPE_RUIMEI @"2b"
 
+//加热系统
+#define DECICE_TYPE_hotBar @"3a"
+
 #endif /* IfishDeviceInfo_h */

Ifish/Utinitys/SocketSingleton/Socketsingleton.h

@@ -75,9 +75,7 @@
 @property (nonatomic, copy  ) NSString       *socketHost;   // socket的Host
 @property (nonatomic, assign) UInt16         socketPort;    // socket的prot
 @property (nonatomic, retain) NSTimer        *connectTimer; // 计时器 //心跳
-@property (nonatomic, assign) id<IfishCommuniteDelegate>
-
-communiteDelegate;
+@property (nonatomic, weak) id<IfishCommuniteDelegate> communiteDelegate;
 
 + (Socketsingleton  *)sharedInstance;
 

Ifish/Utinitys/dataUnity/dataContorl.h

@@ -19,6 +19,7 @@
 +(NSString*)tpIntStringToFourHex:(int)intString;
 +(NSString*)hexStringToDateString:(NSString*)hexString;
 +(NSString *)translation:(NSString *)arebic;
++(NSString*)leftAddZero:(NSInteger)totle andStr:(NSString*)str;
 
 //随机生成32位字符
 +(NSString *)get10LengthString;

Ifish/Utinitys/dataUnity/dataContorl.m

@@ -63,6 +63,18 @@
     return hexStr;
 }
 
++(NSString*)leftAddZero:(NSInteger)totle andStr:(NSString*)str{
+    NSMutableString*str1=[NSMutableString string];
+    NSInteger strLenth=str.length;
+    
+    while (strLenth<totle) {
+        [str1 appendString:@"0"];
+        strLenth++;
+    }
+    [str1 appendString:str];
+    return str1;
+}
+
 // 十 转十六 
 +(NSString *)ToHex:(long long int)tmpid
 {