新版本

Ifish/controllers/HotBar/models/IfishConfigVo.h

@@ -0,0 +1,20 @@
+//
+//  IfishConfigVo.h
+//  Ifish
+//
+//  Created by 罗艺 on 2018/9/24.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface IfishConfigVo : NSObject
+//配置tcp连接地址(39字节)            15    数据包头
+//20    tcp连接的域名
+//
+//2    连接环境aaaa测试环境bbbb正式环境
+//2    CRC16校验码
+@property(nonatomic,copy)NSString*tcpAdr;
+@property(nonatomic,copy)NSString*env;
+@property(nonatomic,copy)NSString*crc;
+@end

Ifish/controllers/HotBar/models/IfishConfigVo.m

@@ -0,0 +1,13 @@
+//
+//  IfishConfigVo.m
+//  Ifish
+//
+//  Created by 罗艺 on 2018/9/24.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import "IfishConfigVo.h"
+
+@implementation IfishConfigVo
+
+@end

Ifish/controllers/HotBar/models/IfishHeaterVo.h

@@ -0,0 +1,29 @@
+//
+//  IfishHeaterVo.h
+//  Ifish
+//
+//  Created by 罗艺 on 2018/9/23.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+
+//heaterId : ID
+//heaterMacAddress : mac地址
+//heaterVolume : 鱼缸容积
+//heaterLong : 鱼缸长
+//heaterWidth : 鱼缸宽
+//heaterHeight : 鱼缸高
+//heaterCycle : 换水提醒周期
+//heaterReminderTime : 提醒时间
+@interface IfishHeaterVo : NSObject
+@property(nonatomic,copy)NSString*heaterId;
+@property(nonatomic,copy)NSString*heaterMacAddress;
+@property(nonatomic,copy)NSString*heaterVolume;
+@property(nonatomic,copy)NSString*heaterLong;
+@property(nonatomic,copy)NSString*heaterWidth;
+@property(nonatomic,copy)NSString*heaterHeight;
+@property(nonatomic,copy)NSString*heaterCycle;
+@property(nonatomic,copy)NSString*heaterReminderTime;
+@end

Ifish/controllers/HotBar/models/IfishHeaterVo.m

@@ -0,0 +1,41 @@
+//
+//  IfishHeaterVo.m
+//  Ifish
+//
+//  Created by 罗艺 on 2018/9/23.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import "IfishHeaterVo.h"
+
+@implementation IfishHeaterVo
+-(NSString*)heaterReminderTime{
+    if (!_heaterReminderTime.length||_heaterReminderTime==nil) {
+        return @"";
+    }
+    return _heaterReminderTime;
+}
+
+-(NSString*)heaterVolume{
+    if (!_heaterVolume.length||_heaterVolume==nil) {
+        return @"";
+    }
+    return _heaterVolume;
+}
+
+-(NSString *)heaterCycle{
+    if (!_heaterCycle.length||_heaterCycle==nil) {
+        return @"";
+    }
+    return _heaterCycle;
+}
+
+-(NSString *)heaterId{
+    if (!_heaterId.length||_heaterId==nil) {
+        return @"";
+    }
+    return _heaterId;
+}
+
+
+@end

Ifish/controllers/HotBar/models/IfishHistroyVo.h

@@ -0,0 +1,23 @@
+//
+//  IfishHistroyVo.h
+//  Ifish
+//
+//  Created by 罗艺 on 2018/9/23.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+//heaterWaterTemperature : 温度
+//heaterPh : 水流量
+//heaterGatheringTime : 小时
+
+
+
+@interface IfishHistroyVo : NSObject
+@property(nonatomic,copy)NSString*heaterWaterTemperature;
+@property(nonatomic,copy)NSString*heaterPh;
+@property(nonatomic,copy)NSString*heaterGatheringTime;
+@property(nonatomic,assign)NSInteger heaterGatheringTime_int;
+@property(nonatomic,assign)NSInteger heaterPh_int;
+@end

Ifish/controllers/HotBar/models/IfishHistroyVo.m

@@ -0,0 +1,22 @@
+//
+//  IfishHistroyVo.m
+//  Ifish
+//
+//  Created by 罗艺 on 2018/9/23.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import "IfishHistroyVo.h"
+
+@implementation IfishHistroyVo
+-(void)setHeaterGatheringTime:(NSString *)heaterGatheringTime{
+    _heaterGatheringTime=heaterGatheringTime;
+    _heaterGatheringTime_int=heaterGatheringTime.integerValue;
+}
+
+-(void)setHeaterPh:(NSString *)heaterPh{
+    _heaterPh=heaterPh;
+    _heaterPh_int=heaterPh.integerValue;
+}
+
+@end

Ifish/controllers/HotBar/models/IfishHotBarPackegeVo.h

@@ -0,0 +1,30 @@
+//
+//  IfishHotBarPackegeVo.h
+//  Ifish
+//
+//  Created by 罗艺 on 2018/9/23.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "IfishPackageHeaderVo.h"
+
+
+@interface IfishHotBarPackegeVo : IfishPackageHeaderVo
+
+
+
+//设置报警温度指令(22字节)
+//15    数据包头
+//1    开启关闭报警，00关，01开
+//2    最低报警温度，关闭报警时传0
+//2    最高报警温度，关闭报警时传0
+//2    CRC16校验码
+@property(nonatomic,copy)NSString*warnCode;
+@property(nonatomic,copy)NSString*downTeamptrue;
+@property(nonatomic,copy)NSString*upTeamptrue;
+@property(nonatomic,copy)NSString*crcCode;
+
+
+
+@end

Ifish/controllers/HotBar/models/IfishHotBarPackegeVo.m

@@ -0,0 +1,19 @@
+//
+//  IfishHotBarPackegeVo.m
+//  Ifish
+//
+//  Created by 罗艺 on 2018/9/23.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import "IfishHotBarPackegeVo.h"
+
+@implementation IfishHotBarPackegeVo
+
+
+-(NSString*)getPackege{
+     return [NSString stringWithFormat:@"%@%@%@%@",self.warnCode,self.downTeamptrue,self.upTeamptrue,self.crcCode];
+}
+
+
+@end

Ifish/controllers/HotBar/models/IfishHotBarVo.h

@@ -7,10 +7,23 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "IfishHeaterVo.h"
 
 @interface IfishHotBarVo : NSObject
 @property(nonatomic,copy)NSString*title;
 @property(nonatomic,copy)NSString*subTitle;
 @property(nonatomic,assign)BOOL isShowArrow;
 @property(nonatomic,copy)NSString*iconUrl;
+@property(nonatomic,strong)NSArray* phs;//历史
+@property(nonatomic,strong)IfishHeaterVo*heater ;
+
+@property(nonatomic,copy)NSString*heaterNum;
+@property(nonatomic,copy)NSString*upTeamp;
+@property(nonatomic,copy)NSString*downTeamp;
+@property(nonatomic,copy)NSString*wornCode;
+
+@property(nonatomic,copy)NSString*remindDay;
+@property(nonatomic,copy)NSString*remaindTime;
+@property(nonatomic,assign)UInt64 phv;
+
 @end

Ifish/controllers/HotBar/models/IfishHotBarVo.m

@@ -7,7 +7,13 @@
 //
 
 #import "IfishHotBarVo.h"
+#import "MJExtension.h"
+#import "IfishHistroyVo.h"
 
 @implementation IfishHotBarVo
-
++(NSDictionary*)mj_objectClassInArray{
+    return @{
+             @"phs":@"IfishHistroyVo"
+             };
+}
 @end

Ifish/controllers/HotBar/models/IfishPackageHeaderVo.h

@@ -0,0 +1,26 @@
+//
+//  IfishPackageHeaderVo.h
+//  Ifish
+//
+//  Created by 罗艺 on 2018/9/23.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface IfishPackageHeaderVo : NSObject
+//数据包头(15字节)
+//1    "发送消息类型填充00，回复类型填充01
+//"
+//1    功能码
+//6    发送方MAC地址
+//6    接收方MAC地址
+//1    消息长度,包长度(15+*的长度）
+@property(nonatomic,copy)NSString*msgType;
+@property(nonatomic,copy)NSString*funcCode;
+@property(nonatomic,copy)NSString*sendAdr;
+@property(nonatomic,copy)NSString*reciceAdr;
+@property(nonatomic,copy)NSString*lenth;
+-(NSString*)getHeader;
+-(NSString*)getPackege;
+@end

Ifish/controllers/HotBar/models/IfishPackageHeaderVo.m

@@ -0,0 +1,21 @@
+//
+//  IfishPackageHeaderVo.m
+//  Ifish
+//
+//  Created by 罗艺 on 2018/9/23.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import "IfishPackageHeaderVo.h"
+
+@implementation IfishPackageHeaderVo
+-(NSString*)getPackege{
+    return @"";
+}
+-(NSString*)getHeader{
+    return [NSString stringWithFormat:@"%@%@%@%@%@",self.msgType,self.funcCode,self.sendAdr,self.reciceAdr,self.lenth];
+}
+-(NSString *)description{
+    return [NSString stringWithFormat:@"%@%@",[self getHeader],[self getPackege]];
+}
+@end