diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index e885a08..bce6f5f 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -239,7 +239,6 @@ 3D4AFF6021F34E1C0053BAA0 /* libstdc++.6.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4AFF5E21F34E1C0053BAA0 /* libstdc++.6.tbd */; }; 3D4AFF6221F350820053BAA0 /* libstdc++.6.0.9.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4AFF6121F350820053BAA0 /* libstdc++.6.0.9.tbd */; }; 3D5C436E21339E9D00E15B66 /* IfishHistoryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D5C436D21339E9D00E15B66 /* IfishHistoryView.m */; }; - 3D5C437021339EAB00E15B66 /* IfishHistoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D5C436F21339EAB00E15B66 /* IfishHistoryView.xib */; }; 3D5C437321339F8F00E15B66 /* IfishChatView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D5C437221339F8F00E15B66 /* IfishChatView.m */; }; 3D8F649721568AE500F04BD3 /* ConnectHotspotTipViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E52B400321042ED2003BBA3E /* ConnectHotspotTipViewController.m */; }; 3D8F649A21571D7C00F04BD3 /* HitbarWifeVc.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D8F649921571D7C00F04BD3 /* HitbarWifeVc.m */; }; @@ -2805,7 +2804,6 @@ 3D4AFF6121F350820053BAA0 /* libstdc++.6.0.9.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.6.0.9.tbd"; path = "usr/lib/libstdc++.6.0.9.tbd"; sourceTree = SDKROOT; }; 3D5C436C21339E9D00E15B66 /* IfishHistoryView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IfishHistoryView.h; sourceTree = ""; }; 3D5C436D21339E9D00E15B66 /* IfishHistoryView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IfishHistoryView.m; sourceTree = ""; }; - 3D5C436F21339EAB00E15B66 /* IfishHistoryView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IfishHistoryView.xib; sourceTree = ""; }; 3D5C437121339F8F00E15B66 /* IfishChatView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IfishChatView.h; sourceTree = ""; }; 3D5C437221339F8F00E15B66 /* IfishChatView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IfishChatView.m; sourceTree = ""; }; 3D8F649821571D7C00F04BD3 /* HitbarWifeVc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HitbarWifeVc.h; sourceTree = ""; }; @@ -6506,7 +6504,6 @@ 3D13F834212FE2C200D725F7 /* IFishWaterChangeView.m */, 3D5C436C21339E9D00E15B66 /* IfishHistoryView.h */, 3D5C436D21339E9D00E15B66 /* IfishHistoryView.m */, - 3D5C436F21339EAB00E15B66 /* IfishHistoryView.xib */, 3D5C437121339F8F00E15B66 /* IfishChatView.h */, 3D5C437221339F8F00E15B66 /* IfishChatView.m */, 3D1C5066215CB6E300A2E5D6 /* IfishHotBarHeader.xib */, @@ -7775,6 +7772,7 @@ 882953EA1DBDA3A000E9DDD7 /* ifishImgSouce */ = { isa = PBXGroup; children = ( + CB5BB482231388A900860E71 /* HotBarImage */, CBA6169022924E1D00ED380D /* messageImages */, 8891330C1ECE99B900F52EBC /* ShopVideoSource */, 8871FAC01EBC58D70038E99A /* shopCerImg */, @@ -7799,7 +7797,6 @@ 882955821DBDA3A100E9DDD7 /* switchButton */, 882955921DBDA3A100E9DDD7 /* wifiviewImg */, 8829559D1DBDA3A100E9DDD7 /* XuToImg */, - 882955D81DBDA3A100E9DDD7 /* YunXinSourceFile */, ); path = ifishImgSouce; sourceTree = ""; @@ -8774,13 +8771,6 @@ path = XuToImg; sourceTree = ""; }; - 882955D81DBDA3A100E9DDD7 /* YunXinSourceFile */ = { - isa = PBXGroup; - children = ( - ); - path = YunXinSourceFile; - sourceTree = ""; - }; 882A75F41EBABB8F00AD1D15 /* ShopCertificationNewFile */ = { isa = PBXGroup; children = ( @@ -12347,6 +12337,13 @@ path = Frameworks; sourceTree = ""; }; + CB5BB482231388A900860E71 /* HotBarImage */ = { + isa = PBXGroup; + children = ( + ); + path = HotBarImage; + sourceTree = ""; + }; CB7D6A9722953BEB0014E5C7 /* YYCache */ = { isa = PBXGroup; children = ( @@ -13943,7 +13940,6 @@ 882955F31DBDA3A100E9DDD7 /* pencil .png in Resources */, 8815D1E51E02662500BEA2DA /* FullPlay_Play.png in Resources */, 882956261DBDA3A100E9DDD7 /* neves0041.png in Resources */, - 3D5C437021339EAB00E15B66 /* IfishHistoryView.xib in Resources */, 88742C3E1D63FA270074F1F8 /* CertifyListFourthCell.xib in Resources */, 8864844A1EE171D30046C3BD /* redact_line@3x.png in Resources */, 8869B3A71E6967DF0010F099 /* levelUp_totoise@3x.png in Resources */, diff --git a/Ifish/Assets.xcassets/history_bg.imageset/Contents.json b/Ifish/Assets.xcassets/history_bg.imageset/Contents.json index 0919b96..658ff7c 100644 --- a/Ifish/Assets.xcassets/history_bg.imageset/Contents.json +++ b/Ifish/Assets.xcassets/history_bg.imageset/Contents.json @@ -6,11 +6,11 @@ }, { "idiom" : "universal", - "filename" : "history_bg@2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "history_bg@3x.png", "scale" : "3x" } ], diff --git a/Ifish/Assets.xcassets/history_bg.imageset/history_bg@2x.png b/Ifish/Assets.xcassets/history_bg.imageset/history_bg@3x.png similarity index 100% rename from Ifish/Assets.xcassets/history_bg.imageset/history_bg@2x.png rename to Ifish/Assets.xcassets/history_bg.imageset/history_bg@3x.png diff --git a/Ifish/Info.plist b/Ifish/Info.plist index 009f9e9..2c93a48 100644 --- a/Ifish/Info.plist +++ b/Ifish/Info.plist @@ -70,7 +70,7 @@ CFBundleVersion - 10.0.1 + 10.0.5 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/Ifish/controllers/HotBar/IfishHotBarVc.m b/Ifish/controllers/HotBar/IfishHotBarVc.m index 489a40f..dd140c3 100644 --- a/Ifish/controllers/HotBar/IfishHotBarVc.m +++ b/Ifish/controllers/HotBar/IfishHotBarVc.m @@ -149,7 +149,7 @@ Assign BOOL isInitHostoryView; _changeWaterView.hidden=NO; return _changeWaterView; } - +//设置换水周期 -(void)didSelectRow1:(NSString *)v andRow2:(NSString *)v2{ v=[v stringByReplacingOccurrencesOfString:@"天" withString:@""]; v2=[v2 stringByReplacingOccurrencesOfString:@":00" withString:@""]; @@ -159,54 +159,31 @@ Assign BOOL isInitHostoryView; } IfishHotBarVo*vo=self.datas[4]; vo.title=str; - + if (!self.vo.heater) { + self.vo.heater = InitObject(IfishHeaterVo); + } self.vo.heater.heaterCycle=v; self.vo.heater.heaterReminderTime=v2; [self setTeampleture]; [self.mainTableView reloadData]; } - --(void)submitText:(NSString *)w andh:(NSString *)h andV:(NSString *)v{ - IfishHotBarVo*vo=self.datas[1]; - float heaterVolume; - if (w&&h&&v) { - heaterVolume=[w integerValue]*[h integerValue]*[v integerValue]*0.001; - self.vo.heater.heaterVolume=[NSString stringWithFormat:@"%0.1f",heaterVolume]; - self.vo.heater.heaterLong=v; - self.vo.heater.heaterWidth=w; - self.vo.heater.heaterHeight=h; - } - if (self.vo.heater.heaterVolume.length) { - vo.title=[NSString stringWithFormat:@"鱼缸容量 %@L",self.vo.heater.heaterVolume]; - vo.subTitle=[NSString stringWithFormat:@"推荐流量：%.1fL--%.1fL",[self.vo.heater.heaterVolume intValue]*1.5,[self.vo.heater.heaterVolume intValue]*2.0]; - [self.mainTableView reloadData]; - } - [self setHeigh:h andW:w andLong:v]; - - -} - - --(void)didSelectTeamptrue:(NSString *)up andDown:(NSString *)down andT:(NSString *)t andWarnCode:(NSString *)code{ - up=[up stringByReplacingOccurrencesOfString:@"°c" withString:@""]; - down=[down stringByReplacingOccurrencesOfString:@"°c" withString:@""]; - t=[t stringByReplacingOccurrencesOfString:@"°c" withString:@""]; - -// [self setHeatTeapWith:t]; +//设置加热温度 +-(void)didChangeTemperature:(NSString *)temp{ + temp=[temp stringByReplacingOccurrencesOfString:@"°c" withString:@""]; IfishHotBarVo*vo=self.datas[0]; - self.vo.heaterNum=[NSString stringWithFormat:@"%f",t.floatValue]; - + self.vo.heaterNum=[NSString stringWithFormat:@"%f",temp.floatValue]; vo.title=[NSString stringWithFormat:@"设置温度 %.1f°c",[self.vo.heaterNum floatValue]]; [self.mainTableView reloadData]; + [self setHeatTeapWith:temp]; +} +//设置预警温度 +-(void)didSelectTeamptrue:(NSString *)up andDown:(NSString *)down andWarnCode:(NSString *)code{ + up=[up stringByReplacingOccurrencesOfString:@"°c" withString:@""]; + down=[down stringByReplacingOccurrencesOfString:@"°c" withString:@""]; self.vo.wornCode=code; - // self.vo.wornCode=[NSString stringWithFormat:@"%llu",[dataContorl hexToTen:self.vo.wornCode]]; - self.vo.upTeamp=up; - self.vo.downTeamp=down; - - [self setHeatTeapWith:t]; - // [self setTeampletureWithUp:self.vo.upTeamp andDown:self.vo.downTeamp andHnum:0 andWarmC:self.vo.wornCode]; + [self setTeampletureWithUp:self.vo.upTeamp andDown:self.vo.downTeamp andHnum:0 andWarmC:self.vo.wornCode]; } @@ -321,66 +298,7 @@ Assign BOOL isInitHostoryView; } #pragma mark------请求服务器------- - --(void)setHeigh:(NSString*)h andW:(NSString*)w andLong:(NSString*)l{ - // 参数名称 参数类型 是否必须 说明描述 - // heaterId Integer 是 保存信息此字段为空 - // 修改信息此字段有值 - // heaterMacAddress String 是 加热棒mac地址 - // heaterVolume String 是 鱼缸容积 - // heaterLong String 是 鱼缸长 - // heaterWidth String 是 鱼缸宽 - // heaterHeight String 是 鱼缸高 - // heaterCycle String 是 换水提醒周期 - // c String 是 提醒时间 - if ([l isEqualToString:@""]) { - [self.view makeToast:@"请输入鱼缸长"]; - return; - }else if ([w isEqualToString:@""]){ - [self.view makeToast:@"请输入鱼缸宽"]; - return; - }else if([h isEqualToString:@""]) - { - [self.view makeToast:@"请输入鱼缸高"]; - return; - } - NSString*v=@""; - NSString*r=@""; - NSString*c=@""; - NSString*heaterId=@""; - if (self.vo.heater) { - v=self.vo.heater.heaterVolume; - c=self.vo.heater.heaterCycle; - r=self.vo.heater.heaterReminderTime; - heaterId=self.vo.heater.heaterId; - } - - NSDictionary*para=@{ - @"heaterId":heaterId, - @"heaterMacAddress":self.devicemodel.macAddress, - @"heaterVolume":v, - @"heaterLong":l, - @"heaterWidth":w, - @"heaterHeight":h, - @"heaterCycle":c, - @"heaterRemindTime":r - }; - [SVProgressHUD showWithMaskType:SVProgressHUDMaskTypeBlack]; - [AFHttpTool requestWihtMethod:RequestMethodTypePost url:SaveHotBarInfo params:para success:^(id response) { - NSLog(@"-----------%@",response); - NSDictionary*dict=[NSJSONSerialization JSONObjectWithData:response options:NSJSONReadingMutableContainers error:nil]; - NSString*result=dict[@"result"]; - if ([result integerValue]==100) { - // self.vo=[IfishHotBarVo mj_objectWithKeyValues:dict[@"data"]]; - [SVProgressHUD dismiss]; - [self showLableAction:@"修改成功"]; - } - } failure:^(NSError *err) { - - }]; -} - - +//删除加热棒 -(void)deleteHotBarInfo{ NSDictionary*para=@{ @@ -401,17 +319,11 @@ Assign BOOL isInitHostoryView; //重置数据库 NSArray*deviceArry=[[DataCenter defaultDtacenter]valueForKey:@"deviceInfo"]; NSMutableArray *newArr = [NSMutableArray arrayWithArray:deviceArry]; - for (DeviceModel *model in deviceArry) { - if ([model.deviceId isEqual:self.devicemodel.deviceId]) { - [newArr removeObject:model]; - } - } - [[DataCenter defaultDtacenter] setValue: newArr forKey:@"deviceInfo"]; if ([newArr count]==0) { @@ -444,7 +356,6 @@ Assign BOOL isInitHostoryView; [SVProgressHUD dismiss]; if ([result integerValue]==100) { self.vo=[IfishHotBarVo mj_objectWithKeyValues:dict[@"data"]]; - if (self.vo.phs.count>0) { NSDate *curDate = [NSDate dateWithTimeInterval:self.curDay*60*60*-24 sinceDate:[NSDate date]]; NSDateFormatter *dateFormatter=[[NSDateFormatter alloc]init];//创建一个日期格式化器 @@ -456,8 +367,7 @@ Assign BOOL isInitHostoryView; self.historyView.datas=self.vo.phs; self.historyView.hidden=YES; } - //去除鱼缸容积，改为设置预警温度 - + //去除鱼缸容积 IfishHotBarVo*vo1=self.datas[4]; if (self.vo.heater.heaterCycle.length) { if (self.vo.heater.heaterReminderTime.length) { @@ -491,16 +401,16 @@ Assign BOOL isInitHostoryView; } -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ - if (indexPath.row==3) { + + if (indexPath.row==2){//水泵流量，点击无效果 + + }else if (indexPath.row==3) {//历史趋势 if (!self.isInitHostoryView) { [self getHistoryDataRequest]; } self.historyView.hidden=NO; - - }else if (indexPath.row==2){ - } - else{ + }else{ [self changeWaterView]; self.changeWaterView.hotVo=self.vo; self.changeWaterView.viewType=indexPath.row; @@ -575,8 +485,6 @@ Assign BOOL isInitHostoryView; self.vo.downTeamp=[info substringWithRange:NSMakeRange(50, 4)]; self.vo.downTeamp=[NSString stringWithFormat:@"%f",[dataContorl hexToTen:self.vo.downTeamp]*0.1]; - - [self.mainTableView reloadData]; } @@ -599,6 +507,7 @@ Assign BOOL isInitHostoryView; //2 最低报警温度，关闭报警时传0 //2 最高报警温度，关闭报警时传0 //2 CRC16校验码 +//设置换水周期 -(void)setTeampleture{ if (!self.vo.heater.heaterCycle||!self.vo.heater.heaterReminderTime) { return; @@ -610,14 +519,12 @@ Assign BOOL isInitHostoryView; NSString*heaterHeight=@""; NSString*heaterId=@""; NSString*heaterVolume=@""; - if (self.vo.heater) { - longNum=self.vo.heater.heaterLong; - heaterWidth=self.vo.heater.heaterWidth; - heaterHeight=self.vo.heater.heaterHeight; + if (self.vo.heater.heaterId) { heaterId=self.vo.heater.heaterId; - heaterVolume=self.vo.heater.heaterVolume; } - + if (self.vo.heater.heaterVolume) { + heaterVolume=self.vo.heater.heaterVolume; + } NSDictionary*para=@{ @"heaterId":heaterId, @"heaterMacAddress":self.devicemodel.macAddress, @@ -641,30 +548,19 @@ Assign BOOL isInitHostoryView; }]; } - -#pragma mark-----打开开关---- +#pragma mark-----打开预警温度开关---- -(void)clickWormCode:(NSString *)code{ IfishHotBarPackegeVo*pvo=[[IfishHotBarPackegeVo alloc]init]; - pvo.msgType=@"00"; pvo.funcCode=@"05"; pvo.sendAdr=self.devicemodel.macAddress; pvo.reciceAdr=self.devicemodel.macAddress; pvo.lenth=@"16"; - pvo.warnCode=code; - pvo.downTeamptrue=@"0000"; pvo.upTeamptrue=@"0000"; - - - - pvo.crcCode=@"0000"; - - NSString*stateString=[pvo description]; - NSData*selctorData=[dataContorl stringToHexData:stateString]; [[Socketsingleton sharedInstance].clientSocket writeData:selctorData withTimeout:-1 tag:0]; [[Socketsingleton sharedInstance].clientSocket readDataWithTimeout:-1 tag:0]; @@ -700,21 +596,14 @@ Assign BOOL isInitHostoryView; pvo.upTeamptrue=[dataContorl leftAddZero:4 andStr:pvo.upTeamptrue]; } } - - - pvo.crcCode=@"0000"; - - NSString*stateString=[pvo description]; NSData*selctorData=[dataContorl stringToHexData:stateString]; self.vo.heaterNum=num; [[Socketsingleton sharedInstance].clientSocket writeData:selctorData withTimeout:-1 tag:0]; [[Socketsingleton sharedInstance].clientSocket readDataWithTimeout:-1 tag:0]; -// [self showLableAction:@"发送成功"]; - - + [self showLableAction:@"发送成功"]; } @@ -725,11 +614,7 @@ Assign BOOL isInitHostoryView; -(void)setHeatTeapWith:(NSString*)num{ if(!num){ -// [self.view makeToast:@"请选择加热温度"]; - - // self.vo.wornCode=[NSString stringWithFormat:@"%llu",[dataContorl hexToTen:self.vo.wornCode]]; - - [self setTeampletureWithUp:self.vo.upTeamp andDown:self.vo.downTeamp andHnum:0 andWarmC:self.vo.wornCode]; + [self.view makeToast:@"请选择加热温度"]; return; } IfishPackageHeaderVo*header=[[IfishPackageHeaderVo alloc]init]; @@ -749,7 +634,7 @@ Assign BOOL isInitHostoryView; NSString*stateString=[NSString stringWithFormat:@"%@%@%@",[header getHeader],num,crc]; NSData*selctorData=[dataContorl stringToHexData:stateString]; -[[Socketsingleton sharedInstance].clientSocket writeData:selctorData withTimeout:-1 tag:0]; + [[Socketsingleton sharedInstance].clientSocket writeData:selctorData withTimeout:-1 tag:0]; [[Socketsingleton sharedInstance].clientSocket readDataWithTimeout:-1 tag:0]; [self showLableAction:@"发送成功"]; diff --git a/Ifish/controllers/HotBar/Views/IFishWaterChangeView.h b/Ifish/controllers/HotBar/Views/IFishWaterChangeView.h index fe5774c..4ab5cfd 100644 --- a/Ifish/controllers/HotBar/Views/IFishWaterChangeView.h +++ b/Ifish/controllers/HotBar/Views/IFishWaterChangeView.h @@ -12,7 +12,11 @@ @optional -(void)didSelectRow1:(NSString*)v andRow2:(NSString*)v2; -(void)submitText:(NSString*)w andh:(NSString*)h andV:(NSString*)v; --(void)didSelectTeamptrue:(NSString*)up andDown:(NSString*)down andT:(NSString*)t andWarnCode:(NSString*)code; +//设置预警温度 +-(void)didSelectTeamptrue:(NSString*)up andDown:(NSString*)down andWarnCode:(NSString*)code; +//设置加热温度 +-(void)didChangeTemperature:(NSString*)temp; +//设置换水周期 -(void)didSelectRemindTime:(NSString*)time; -(void)clickWormCode:(NSString*)code; @end diff --git a/Ifish/controllers/HotBar/Views/IFishWaterChangeView.m b/Ifish/controllers/HotBar/Views/IFishWaterChangeView.m index c7dbaef..0fc1c15 100644 --- a/Ifish/controllers/HotBar/Views/IFishWaterChangeView.m +++ b/Ifish/controllers/HotBar/Views/IFishWaterChangeView.m @@ -229,6 +229,7 @@ Strong UIImageView *sepImage; self.openBtn.hidden = YES; [self.data1 removeAllObjects]; [self.data2 removeAllObjects]; + self.titleLabel.text=@"请设置加热温度："; if (viewType==0) {// 设置水温 self.topUiPick.hidden=NO; [self.data1 addObjectsFromArray:self.templetrueArr]; @@ -280,7 +281,6 @@ Strong UIImageView *sepImage; self.titleLabel.text=@"换水周期选择："; self.selectVaule2=self.data1[0]; if (self.hotVo.heater.heaterCycle!=nil) { - [self.bottomUiPicker selectRow:[self.hotVo.heater.heaterCycle integerValue]-1 inComponent:0 animated:NO]; self.selectVaule2=self.hotVo.heater.heaterCycle; }else{ @@ -300,7 +300,7 @@ Strong UIImageView *sepImage; //点击open按钮 - (void)openBtnClick:(UIButton *)sender { sender.selected=!sender.selected; - if(self.viewType==0){ + if(self.viewType==1){//设置预警温度 self.hotVo.wornCode=sender.selected?@"01":@"00"; [self.myDelegate clickWormCode:self.hotVo.wornCode]; } @@ -312,15 +312,16 @@ Strong UIImageView *sepImage; //点击确定按钮 - (void)sureBtnClick:(UIButton *)sender{ self.hidden=YES; - if(_viewType==5){ - [self.myDelegate didSelectRow1:self.selectVaule2 andRow2:self.selectVaule3]; - }else if (_viewType==0){ -// [self.myDelegate didSelectTeamptrue:self.selectVaule2]; +// if(_viewType==5){ +// [self.myDelegate didSelectRow1:self.selectVaule2 andRow2:self.selectVaule3]; +// }else + if (_viewType==0) {//设置加热温度 + [self.myDelegate didChangeTemperature:self.selectVaule1]; + } + if (_viewType==1){//设置预警温度 NSString*code=self.openBtn.selected?@"01":@"00"; - - [self.myDelegate didSelectTeamptrue:self.selectVaule3 andDown:self.selectVaule2 andT:self.selectVaule1 andWarnCode:code]; - }else if(_viewType==4){ -// [self.myDelegate didSelectRemindTime:self.selectVaule2]; + [self.myDelegate didSelectTeamptrue:self.selectVaule3 andDown:self.selectVaule2 andWarnCode:code]; + }else if(_viewType==4){//设置换水周期 if(self.openBtn.selected==NO){ [self.myDelegate didSelectRow1:self.selectVaule2 andRow2:@""]; }else{ diff --git a/Ifish/controllers/HotBar/Views/IfishChatView.m b/Ifish/controllers/HotBar/Views/IfishChatView.m index 59c89b5..315eb3d 100644 --- a/Ifish/controllers/HotBar/Views/IfishChatView.m +++ b/Ifish/controllers/HotBar/Views/IfishChatView.m @@ -10,7 +10,9 @@ #import "IfishHistroyVo.h" #define Normal_heaterPh 499 //只有499才是正常流量 -#define Rect_Width 248.f +#define Rect_Width kSizeFrom750(568) +#define Origin_Left kSizeFrom750(72) +#define Rect_Height kSizeFrom750(185) @interface IfishChatView() @property(nonatomic,strong)NSMutableArray*line1; @property(nonatomic,strong)UIView *lablesView; @@ -25,6 +27,7 @@ Strong NSMutableArray * heaterPhArray;//流量走势 if (_numLable==nil) { _numLable=[[UILabel alloc]init]; [self addSubview:_numLable]; + } return _numLable; } @@ -40,13 +43,13 @@ Strong NSMutableArray * heaterPhArray;//流量走势 // CGFloat gapW= 357*scale*0.1; for (int i=0; i350){ vo.heaterWaterTemperature=@"350"; }else if(vo.heaterWaterTemperature.integerValue<250){ continue; } - CGFloat y=80*(1-((vo.heaterWaterTemperature.integerValue*0.1-25)/10))+19;//*-1*+158; + CGFloat y=Rect_Height*(1-((vo.heaterWaterTemperature.integerValue*0.1-25)/10))+kSizeFrom750(43);//*-1*+158; CGPoint p1=CGPointMake(x, y); // NSLog(@"%f-------%f--%f-",y,vo.heaterWaterTemperature.integerValue*0.1,x); [_line1 addObject:NSStringFromCGPoint(p1)]; @@ -66,10 +69,10 @@ Strong NSMutableArray * heaterPhArray;//流量走势 _heaterPhArray = InitObject(NSMutableArray); //添加流量 for (int i=0; i<23; i++) { - CGFloat x=(i*(Rect_Width/24)+32); - CGFloat y=104; + CGFloat x=(i*(Rect_Width/24)+Origin_Left); + CGFloat y=kSizeFrom750(236); UIView *lineView = [[UIView alloc] initWithFrame:RECT(x, y, Rect_Width/24, 1)]; - lineView.tag = i+1000; + lineView.tag = i+100; [self addSubview:lineView]; [_heaterPhArray addObject:lineView]; } @@ -88,11 +91,11 @@ Strong NSMutableArray * heaterPhArray;//流量走势 //如果有时间段的数据拿不到，则直接使用虚线 if ([nextVo.heaterGatheringTime integerValue]-[vo.heaterGatheringTime integerValue]>1) { for (int i=[vo.heaterGatheringTime intValue]; i<[nextVo.heaterGatheringTime intValue]; i++) { - UIView *emptyView = [self viewWithTag:i+1000]; + UIView *emptyView = [self viewWithTag:i+100]; [self drawDashLine:emptyView lineLength:2 lineSpacing:1 lineColor:[UIColor redColor]]; } }else{ - UIView *lineView = [self viewWithTag:[vo.heaterGatheringTime integerValue]+1000]; + UIView *lineView = [self viewWithTag:[vo.heaterGatheringTime integerValue]+100]; if([vo.heaterPh integerValue]==Normal_heaterPh&&[nextVo.heaterPh integerValue]==Normal_heaterPh){//正常流量 lineView.layer.backgroundColor = [UIColor greenColor].CGColor; @@ -124,51 +127,7 @@ Strong NSMutableArray * heaterPhArray;//流量走势 // [path closePath];//第五条线通过调用closePath方法得到的 [path stroke];//Draws line 根据坐标点连线 - //添加坐标点 -// for (int i=0; i - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Ifish/controllers/IfishTabControllers/消息/PushMasssageWebViewController.m b/Ifish/controllers/IfishTabControllers/消息/PushMasssageWebViewController.m index 2439353..c3ba4d0 100644 --- a/Ifish/controllers/IfishTabControllers/消息/PushMasssageWebViewController.m +++ b/Ifish/controllers/IfishTabControllers/消息/PushMasssageWebViewController.m @@ -9,14 +9,16 @@ #import "PushMasssageWebViewController.h" #import #import -#import "NJKWebViewProgressView.h" -#import "NJKWebViewProgress.h" -@interface PushMasssageWebViewController () +//#import "NJKWebViewProgressView.h" +//#import "NJKWebViewProgress.h" +@interface PushMasssageWebViewController () { - NJKWebViewProgressView *_progressView; - NJKWebViewProgress *_progressProxy; +// NJKWebViewProgressView *_progressView; +// NJKWebViewProgress *_progressProxy; } -@property(nonatomic,strong)UIWebView*myWebView; +//@property(nonatomic,strong)UIWebView*myWebView; +Strong WKWebView *webView; +Strong UIProgressView *wkProgressView; @property(nonatomic,strong)UIActivityIndicatorView*indicator; @end @@ -28,7 +30,7 @@ // Do any additional setup after loading the view. [self addTitleViewWithTitle:self.pushtitle]; - [self creatwebView]; + [self creatWkwebView]; [self.navigationController.navigationBar setBackgroundImage:[UIImage imageNamed:@"blackbar.png"] forBarMetrics:UIBarMetricsDefault]; if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) @@ -58,32 +60,60 @@ } --(void)initWebView -{ - self.myWebView=[[UIWebView alloc]initWithFrame:self.view.bounds]; - NSString*filepath=[[NSBundle mainBundle]pathForResource:@"shuomingshu" ofType:@"html"]; - NSString*html=[NSString stringWithContentsOfFile:filepath encoding:NSUTF8StringEncoding error:nil]; - - [self.myWebView loadHTMLString:html baseURL:[NSURL URLWithString:filepath]]; - - [self.view addSubview:self.myWebView]; - -} +//-(void)initWebView +//{ +// self.myWebView=[[UIWebView alloc]initWithFrame:self.view.bounds]; +// NSString*filepath=[[NSBundle mainBundle]pathForResource:@"shuomingshu" ofType:@"html"]; +// NSString*html=[NSString stringWithContentsOfFile:filepath encoding:NSUTF8StringEncoding error:nil]; +// +// [self.myWebView loadHTMLString:html baseURL:[NSURL URLWithString:filepath]]; +// +// [self.view addSubview:self.myWebView]; +// +//} #pragma mark - WKWeb IOS 8之后用 -(void)creatWkwebView { - WKWebView *webView = [[WKWebView alloc] initWithFrame:self.view.bounds]; - //NSString*url=[NSString stringWithFormat:@"http://www.baidu.com"]; - //NSURLRequest*requst=[NSURLRequest requestWithURL:[NSURL URLWithString:url]]; - NSURLRequest*requst=[NSURLRequest requestWithURL:[NSURL URLWithString:self.pushlink]]; - [webView loadRequest:requst]; - [self.view addSubview:webView]; - //webView.navigationDelegate = self; + self.webView = [[WKWebView alloc]init]; + self.webView.UIDelegate = self; + self.webView.navigationDelegate = self; + [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.pushlink]]]; + [self.view addSubview:self.webView]; + self.wkProgressView = [[UIProgressView alloc]initWithFrame:CGRectMake(0, 0, CGRectGetWidth(self.view.frame), 2)]; + self.wkProgressView.progressTintColor = [UIColor greenColor]; + [self.view addSubview:self.wkProgressView]; + + // 给webview添加监听 + [self.webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionOld | NSKeyValueObservingOptionNew context:nil]; + + [self.webView mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.mas_equalTo(self.view); + }]; +} +- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context{ + if ([keyPath isEqual:@"estimatedProgress"] && object == self.webView) { + [self.wkProgressView setAlpha:1.0f]; + [self.wkProgressView setProgress:self.webView.estimatedProgress animated:YES]; + if (self.webView.estimatedProgress >= 1.0f) { + [UIView animateWithDuration:0.3 delay:0.3 options:UIViewAnimationOptionCurveEaseOut animations:^{ + [self.wkProgressView setAlpha:0.0f]; + } completion:^(BOOL finished) { + [self.wkProgressView setProgress:0.0f animated:YES]; + }]; + } + }else{ + [super observeValueForKeyPath:keyPath ofObject:object change:change context:context]; + } } +- (void)dealloc{ + [self.webView removeObserver:self forKeyPath:@"estimatedProgress"]; + [self.webView setNavigationDelegate:nil]; + [self.webView setUIDelegate:nil]; +} // 页面开始加载时调用 - (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation { @@ -109,84 +139,84 @@ [super viewDidDisappear:animated]; } --(void)viewWillAppear:(BOOL)animated{ - - [super viewWillAppear:animated]; - [self.navigationController.navigationBar addSubview:_progressView]; -} - --(void)viewWillDisappear:(BOOL)animated{ - [super viewWillDisappear:animated]; - [_progressView removeFromSuperview]; - -} +//-(void)viewWillAppear:(BOOL)animated{ +// +// [super viewWillAppear:animated]; +// [self.navigationController.navigationBar addSubview:_progressView]; +//} +// +//-(void)viewWillDisappear:(BOOL)animated{ +// [super viewWillDisappear:animated]; +// [_progressView removeFromSuperview]; +// +//} - (void)didReceiveMemoryWarning { [super didReceiveMemoryWarning]; // Dispose of any resources that can be recreated. } --(void)creatwebView{ - - self.myWebView.opaque=NO; - self.myWebView.backgroundColor=[UIColor clearColor]; - self.myWebView=[[UIWebView alloc]initWithFrame:self.view.bounds]; - [self.view addSubview:self.myWebView]; - - //self.myWebView.delegate=self; - - _progressProxy = [[NJKWebViewProgress alloc] init]; // instance variable - self.myWebView.delegate = _progressProxy; - _progressProxy.webViewProxyDelegate = self; - _progressProxy.progressDelegate = self; - CGFloat progressBarHeight = 2.f; - CGRect navigationBarBounds = self.navigationController.navigationBar.bounds; - CGRect barFrame = CGRectMake(0, navigationBarBounds.size.height - progressBarHeight, navigationBarBounds.size.width, progressBarHeight); - _progressView = [[NJKWebViewProgressView alloc] initWithFrame:barFrame]; - _progressView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin; - - NSURLRequest*requst=[NSURLRequest requestWithURL:[NSURL URLWithString:self.pushlink]]; - - //NSString*url=[NSString stringWithFormat:@"https://bg.zhangxinyanv5.top/ueditorHtml/1484032071200.html"]; - //NSURLRequest*requst=[NSURLRequest requestWithURL:[NSURL URLWithString:url]]; - [self.myWebView loadRequest:requst]; - - -} - --(void)webViewDidStartLoad:(UIWebView *)webView{ - - [_indicator startAnimating]; - -} --(void)webViewDidFinishLoad:(UIWebView *)webView{ - - [_indicator stopAnimating]; - -} --(void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error{ - - [_indicator stopAnimating]; -} - --(void)initIndicatorView{ - - _indicator=[[UIActivityIndicatorView alloc]initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; - _indicator.frame=CGRectMake(0.f,0.f,100.f, 100.f); - _indicator.backgroundColor=[UIColor colorWithRed:0 green:0 blue:0 alpha:0.5]; - _indicator.center=self.view.center; - _indicator.layer.masksToBounds=YES; - _indicator.layer.cornerRadius=5; - [self.view addSubview:_indicator]; - -} - -#pragma mark - NJKWebViewProgressDelegate --(void)webViewProgress:(NJKWebViewProgress *)webViewProgress updateProgress:(float)progress -{ - [_progressView setProgress:progress animated:YES]; - //self.title = [self.myWebView stringByEvaluatingJavaScriptFromString:@"document.title"]; -} +//-(void)creatwebView{ +// +// self.myWebView.opaque=NO; +// self.myWebView.backgroundColor=[UIColor clearColor]; +// self.myWebView=[[UIWebView alloc]initWithFrame:self.view.bounds]; +// [self.view addSubview:self.myWebView]; +// +// //self.myWebView.delegate=self; +// +// _progressProxy = [[NJKWebViewProgress alloc] init]; // instance variable +// self.myWebView.delegate = _progressProxy; +// _progressProxy.webViewProxyDelegate = self; +// _progressProxy.progressDelegate = self; +// CGFloat progressBarHeight = 2.f; +// CGRect navigationBarBounds = self.navigationController.navigationBar.bounds; +// CGRect barFrame = CGRectMake(0, navigationBarBounds.size.height - progressBarHeight, navigationBarBounds.size.width, progressBarHeight); +// _progressView = [[NJKWebViewProgressView alloc] initWithFrame:barFrame]; +// _progressView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin; +// +// NSURLRequest*requst=[NSURLRequest requestWithURL:[NSURL URLWithString:self.pushlink]]; +// +// //NSString*url=[NSString stringWithFormat:@"https://bg.zhangxinyanv5.top/ueditorHtml/1484032071200.html"]; +// //NSURLRequest*requst=[NSURLRequest requestWithURL:[NSURL URLWithString:url]]; +// [self.myWebView loadRequest:requst]; +// +// +//} +// +//-(void)webViewDidStartLoad:(UIWebView *)webView{ +// +// [_indicator startAnimating]; +// +//} +//-(void)webViewDidFinishLoad:(UIWebView *)webView{ +// +// [_indicator stopAnimating]; +// +//} +//-(void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error{ +// +// [_indicator stopAnimating]; +//} +// +//-(void)initIndicatorView{ +// +// _indicator=[[UIActivityIndicatorView alloc]initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; +// _indicator.frame=CGRectMake(0.f,0.f,100.f, 100.f); +// _indicator.backgroundColor=[UIColor colorWithRed:0 green:0 blue:0 alpha:0.5]; +// _indicator.center=self.view.center; +// _indicator.layer.masksToBounds=YES; +// _indicator.layer.cornerRadius=5; +// [self.view addSubview:_indicator]; +// +//} +// +//#pragma mark - NJKWebViewProgressDelegate +//-(void)webViewProgress:(NJKWebViewProgress *)webViewProgress updateProgress:(float)progress +//{ +// [_progressView setProgress:progress animated:YES]; +// //self.title = [self.myWebView stringByEvaluatingJavaScriptFromString:@"document.title"]; +//} diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m index f2f618a..de19555 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m @@ -98,8 +98,6 @@ @property(nonatomic,strong) RusunHaveHeateSetViewController *rusunSet; @property(nonatomic,strong) RunSun84CHSetViewController *rusun84Set; @property (nonatomic, strong) RuiMeiSetViewController *ruimeiSet; -//@property(nonatomic,strong) DXPopover *popover; -//@property(nonatomic,strong) LXPopView *popView; Strong MessageAlertView *popView; @property(nonatomic,strong) UIButton *rightPopButton; @property (nonatomic,strong) SetNameTextViewController *setNameVC; @@ -110,7 +108,6 @@ Strong MessageAlertView *popView; @property(nonatomic,strong) HaveHotCoolWenDuPicview *xuanduoPicView; Weak UIView *remoteView;//显示player的载体 Strong UIImage *screenShotImage;//截图 - @end extern BOOL formLogIn;//连接页面是否来自登录界面 BOOL isfromCameraView;//未绑定鱼缸时，去绑定鱼缸 判断是否从摄像头界面进入 @@ -128,6 +125,7 @@ Strong UIImage *screenShotImage;//截图 -(void)viewWillAppear:(BOOL)animated{ [super viewWillAppear:animated]; + //跳转到录制界面会将cameraHViewDelegate 置nil _bottomToolHView.cameraHViewDelegate=self; //扫码激活用 更新isActive @@ -145,7 +143,6 @@ Strong UIImage *screenShotImage;//截图 _isCanAutoOrientation = YES; //设置默认竖屏 [[AppDelegate sharedDefault] application:[UIApplication sharedApplication] supportedInterfaceOrientationsForWindow:[AppDelegate sharedDefault].window]; - [self.view hideToast]; //先判断是否授权 if (!self.contact.isActive) { @@ -200,6 +197,7 @@ Strong UIImage *screenShotImage;//截图 -(void)viewWillDisappear:(BOOL)animated{ [super viewWillDisappear:animated]; + [self.view hideToast];//隐藏所有弹出框 //屏幕长亮关闭 [[ UIApplication sharedApplication] setIdleTimerDisabled:NO]; @@ -215,7 +213,6 @@ Strong UIImage *screenShotImage;//截图 } [self.player p2pStop]; [[NSNotificationCenter defaultCenter] removeObserver:self name:RECEIVE_REMOTE_MESSAGE object:nil]; - [self.bottomToolHView removeObViserFromSelf]; } - (void)dealloc { @@ -344,6 +341,7 @@ Strong UIImage *screenShotImage;//截图 _isReject=YES; NSLog(@"摄像头连接失败"); dispatch_async(dispatch_get_main_queue(), ^{ + [self.view hideToast]; [self.view makeToast:@"连接失败"]; [self hiddenMonitoringUI:NO callWithErrorType:(NSInteger)error isReCall:NO]; }); @@ -2738,6 +2736,7 @@ Strong UIImage *screenShotImage;//截图 [self.canvasView bringSubviewToFront:self.promptButton]; } + } /* GWP2PCallErrorNone = 0, //0无原因 diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomHView.h b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomHView.h index 04d4879..cdbd31e 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomHView.h +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomHView.h @@ -19,8 +19,4 @@ @property (strong, nonatomic) MBProgressHUD *progressAlert; @property (nonatomic,strong) IfishCameraModel *camera; --(void)removeObViserFromSelf; - --(void)addObViserFromSelf; - @end diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomHView.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomHView.m index a80a182..960311a 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomHView.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomHView.m @@ -28,10 +28,8 @@ static NSString *bootomRecCellIdentifier = @"IfishRecVideoViewCell"; - (instancetype)initWithFrame:(CGRect)frame { self = [super initWithFrame:frame]; if (self) { - //[self addObViserFromSelf]; [self setCollectionFrame:frame]; - } return self; } @@ -39,26 +37,12 @@ static NSString *bootomRecCellIdentifier = @"IfishRecVideoViewCell"; -(void)dealloc{ - //[[NSNotificationCenter defaultCenter] removeObserver:self name:ACK_RECEIVE_REMOTE_MESSAGE object:nil]; - // [[NSNotificationCenter defaultCenter] removeObserver:self name:RECEIVE_REMOTE_MESSAGE object:nil]; if (_progressAlert) { _progressAlert =nil; } } --(void)removeObViserFromSelf{ - ////录制回放功能打开 - // [[NSNotificationCenter defaultCenter] removeObserver:self name:ACK_RECEIVE_REMOTE_MESSAGE object:nil]; - //[[NSNotificationCenter defaultCenter] removeObserver:self name:RECEIVE_REMOTE_MESSAGE object:nil]; - -} - --(void)addObViserFromSelf{ - - //[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(ack_receiveRemoteMessage:) name:ACK_RECEIVE_REMOTE_MESSAGE object:nil]; - //[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveRemoteMessage:) name:RECEIVE_REMOTE_MESSAGE object:nil]; -} -(void)setCollectionFrame:(CGRect)frame{ diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm index 4698879..bfaf489 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm @@ -741,7 +741,8 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) { } //存储摄像头设备关系数组 [[DataCenter defaultDtacenter]setValue:devicamerArr forKey:@"devicamerArr"]; - + //添加设备之后，先断开device连接，之后进入摄像头页面再重新添加链接 + [[GWP2PClient sharedClient] disconnect]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ IfishP2PMonitorController *monitorVC=[[IfishP2PMonitorController alloc] init]; monitorVC.contact = cameraMdel; diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m index d4d0564..a47df46 100644 --- a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m +++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m @@ -22,6 +22,7 @@ @property (strong, nonatomic) IBOutletCollection(UIImageView) NSArray *dashView; @property (weak, nonatomic) IBOutlet UITextField *pwdTf; @property (weak, nonatomic) IBOutlet UIView *containerView; +@property (weak, nonatomic) IBOutlet UITextField *wifiNameTextField; @property (nonatomic, strong) ESPTouchTask* epTask; @@ -43,6 +44,8 @@ @property (nonatomic, assign) NSInteger retryTimes; +Copy NSString *wifiName;//当前wifi名称 + @end @implementation ConnectHotpotViewController @@ -72,8 +75,26 @@ UIBarButtonItem * backItem=[[UIBarButtonItem alloc] initWithCustomView:back]; self.navigationItem.leftBarButtonItem=backItem; + + NSDictionary *wifiDic = [self fetchSSIDInfo]; + NSString *wifiName = [wifiDic objectForKey:@"SSID"]; + self.wifiNameTextField.text = wifiName; +} +//获取当前链接WiFi信息 +- (id)fetchSSIDInfo +{ + NSArray *ifs = (id)CFBridgingRelease(CNCopySupportedInterfaces()); + NSLog(@"%s: Supported interfaces: %@", __func__, ifs); + id info = nil; + for (NSString *ifnam in ifs) { + info = (id)CFBridgingRelease(CNCopyCurrentNetworkInfo((CFStringRef)ifnam)); + if (info && [info count]) { + break; + } + + } + return info ; } - -(void)clickBack{ [self.navigationController popViewControllerAnimated:YES]; } diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib index 910c801..9dae9b1 100644 --- a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib +++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib @@ -1,11 +1,11 @@ - + - + @@ -16,6 +16,7 @@ + @@ -29,7 +30,7 @@ - + @@ -39,38 +40,38 @@ - + - + - + @@ -110,7 +111,7 @@ - + @@ -155,7 +156,7 @@