diff --git a/.DS_Store b/.DS_Store index 4d873c3..8888e31 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Ifish/Assets.xcassets/.DS_Store b/Ifish/Assets.xcassets/.DS_Store index 415c6c0..d561c4b 100644 Binary files a/Ifish/Assets.xcassets/.DS_Store and b/Ifish/Assets.xcassets/.DS_Store differ diff --git a/Ifish/Assets.xcassets/history_bg_new.imageset/history_bg_new@3x.png b/Ifish/Assets.xcassets/history_bg_new.imageset/history_bg_new@3x.png index 9135fb5..809e5e7 100644 Binary files a/Ifish/Assets.xcassets/history_bg_new.imageset/history_bg_new@3x.png and b/Ifish/Assets.xcassets/history_bg_new.imageset/history_bg_new@3x.png differ diff --git a/Ifish/Info.plist b/Ifish/Info.plist index 709a8d9..d7674d7 100644 --- a/Ifish/Info.plist +++ b/Ifish/Info.plist @@ -70,7 +70,7 @@ CFBundleVersion - 4 + 6 ITSAppUsesNonExemptEncryption LSApplicationCategoryType @@ -407,8 +407,6 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - UIUserInterfaceStyle - Light UIViewControllerBasedStatusBarAppearance diff --git a/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m b/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m index e7192c8..63d2273 100644 --- a/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m +++ b/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m @@ -73,13 +73,13 @@ Assign BOOL isGoChangeWiFi;//更换为设备的WiFi -(void)addContentLabel{ UILabel *preLabel; - NSString*tip1=@"1.请将产品重置后15秒内断电通电3次进入热点模式；"; - NSString*tip2=@"2.点击去设置：设置-WiFi-选择ifish-xxx的网络，输入密码12345678，连接好后返回爱奇鱼app。"; + NSString*tip1=@"1.请将插排15秒内断电通电3次或长按复位键出现红灯快闪进入热点模式。"; + NSString*tip2=@"2.点击去设置:设置-WiFi-选择ifish-xxx的网络，输入密码12345678，连接好后返回爱奇鱼app。"; if (self.deviceType==DEVICECAMERA) { tip1=@"1.请长按摄像头背后复位孔，复位摄像头，进入热点模式"; - tip2=@"2.点击去设置：设置-WiFi-选择GW-AP-xxx的网络，一般无密码或12345678或查看说明书，连接好后返回爱奇鱼app。"; + tip2=@"2.点击去设置:设置-WiFi-选择GW_AP_xxxx的网络，连接好后返回爱奇鱼app。"; } NSArray*textArr=@[tip1,tip2]; for (int i=0; i<2; i++) { diff --git a/Ifish/controllers/HotBar/Views/IFishWaterChangeView.m b/Ifish/controllers/HotBar/Views/IFishWaterChangeView.m index 0fc1c15..5bed238 100644 --- a/Ifish/controllers/HotBar/Views/IFishWaterChangeView.m +++ b/Ifish/controllers/HotBar/Views/IFishWaterChangeView.m @@ -190,7 +190,7 @@ Strong UIImageView *sepImage; -(NSMutableArray *)timeArr{ if (_timeArr==nil) { _timeArr=[NSMutableArray array]; - for (int i=5; i<25; i++) { + for (int i=1; i<25; i++) { NSString*day=[NSString stringWithFormat:@"%d:00",i]; [_timeArr addObject:day]; } @@ -212,7 +212,7 @@ Strong UIImageView *sepImage; -(NSMutableArray*)templetrueArr{ if (_templetrueArr==nil) { _templetrueArr=[NSMutableArray array]; - for (int i=20; i<41; i++) { + for (int i=20; i<36; i++) { NSString*temp=[NSString stringWithFormat:@"%d°c",i]; [_templetrueArr addObject:temp]; } @@ -341,7 +341,14 @@ Strong UIImageView *sepImage; //返回多少行 - (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component{ - return self.data1.count; + if (pickerView==self.topUiPick) { + return self.data1.count; + }else{ + if(component==0){ + return self.data1.count; + } + return self.data2.count; + } } //每一行的数据 diff --git a/Ifish/controllers/HotBar/Views/IfishChatView.m b/Ifish/controllers/HotBar/Views/IfishChatView.m index d5094e0..af3b873 100644 --- a/Ifish/controllers/HotBar/Views/IfishChatView.m +++ b/Ifish/controllers/HotBar/Views/IfishChatView.m @@ -11,7 +11,7 @@ #define Normal_heaterPh 499 //只有499才是正常流量 #define Rect_Width kSizeFrom750(599) -#define Origin_Left kSizeFrom750(59) +#define Origin_Left kSizeFrom750(67) #define Rect_Height kSizeFrom750(420) #define Zero_Y kSizeFrom750(526) @interface IfishChatView() diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm index 3a54ae1..d0a42f1 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm @@ -258,7 +258,7 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) { self.attentionLabel.font=[UIFont systemFontOfSize:13]; self.attentionLabel.textColor=[UIColor blackColor]; self.attentionLabel.numberOfLines=0; -self.attentionLabel.text=@"1、请长按摄像头背后复位孔，复位摄像头。\n2、若Wifi名称有中文，请改成英文字母加数字。\n3、Wifi密码不能包含特殊符号（如,.!@等）。\n4、若多次智能连接未成功，请尝试热点模式连接。"; +self.attentionLabel.text=@"1、请长按摄像头背后复位孔，复位摄像头。\n2、若Wifi名称有中文，请改成英文字母加数字。\n3、Wifi密码不能包含特殊符号（如,.’“!@等）。\n4、若多次智能连接未成功，请尝试热点模式连接。"; [self.view addSubview:self.waveProgressView]; [self.view bringSubviewToFront:self.waveProgressView]; [self.view addSubview:self.attentionLabel]; diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib index 95a72ce..6496494 100644 --- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib +++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib @@ -1,9 +1,11 @@ - - + + + + - + @@ -75,7 +77,7 @@ - +