root
/
ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

水族箱温度范围调整，闪退修复，曲线图背景修改

This commit is contained in:
kai60 2019-11-15 18:01:03 +08:00
parent 1448a02de0
commit d6b201c341
10 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

BIN
Ifish/Assets.xcassets/.DS_Store vendored
View File

Binary file not shown.

BIN
Ifish/Assets.xcassets/history_bg_new.imageset/history_bg_new@3x.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 160 KiB

4
Ifish/Info.plist
View File

@ -70,7 +70,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>4</string> <string>6</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
@ -407,8 +407,6 @@
<string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string> <string>UIInterfaceOrientationLandscapeRight</string>
</array> </array>
<key>UIUserInterfaceStyle</key>
<string>Light</string>
<key>UIViewControllerBasedStatusBarAppearance</key> <key>UIViewControllerBasedStatusBarAppearance</key>
<false/> <false/>
</dict> </dict>

6
Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m
View File

@ -73,13 +73,13 @@ Assign BOOL isGoChangeWiFi;//更换为设备的WiFi
-(void)addContentLabel{ -(void)addContentLabel{
UILabel *preLabel; UILabel *preLabel;
NSString*tip1=@"1.请将产品重置后15秒内断电通电3次进入热点模式；"; NSString*tip1=@"1.请将插排15秒内断电通电3次或长按复位键出现红灯快闪进入热点模式。";
NSString*tip2=@"2.点击去设置：设置-WiFi-选择ifish-xxx的网络，输入密码12345678，连接好后返回爱奇鱼app。"; NSString*tip2=@"2.点击去设置:设置-WiFi-选择ifish-xxx的网络，输入密码12345678，连接好后返回爱奇鱼app。";
if (self.deviceType==DEVICECAMERA) if (self.deviceType==DEVICECAMERA)
{ {
tip1=@"1.请长按摄像头背后复位孔，复位摄像头，进入热点模式"; tip1=@"1.请长按摄像头背后复位孔，复位摄像头，进入热点模式";
tip2=@"2.点击去设置：设置-WiFi-选择GW-AP-xxx的网络，一般无密码或12345678或查看说明书，连接好后返回爱奇鱼app。"; tip2=@"2.点击去设置:设置-WiFi-选择GW_AP_xxxx的网络，连接好后返回爱奇鱼app。";
} }
NSArray*textArr=@[tip1,tip2]; NSArray*textArr=@[tip1,tip2];
for (int i=0; i<2; i++) { for (int i=0; i<2; i++) {

13
Ifish/controllers/HotBar/Views/IFishWaterChangeView.m
View File

@ -190,7 +190,7 @@ Strong UIImageView *sepImage;
-(NSMutableArray *)timeArr{ -(NSMutableArray *)timeArr{
if (_timeArr==nil) { if (_timeArr==nil) {
_timeArr=[NSMutableArray array]; _timeArr=[NSMutableArray array];
for (int i=5; i<25; i++) { for (int i=1; i<25; i++) {
NSString*day=[NSString stringWithFormat:@"%d:00",i]; NSString*day=[NSString stringWithFormat:@"%d:00",i];
[_timeArr addObject:day]; [_timeArr addObject:day];
} }
@ -212,7 +212,7 @@ Strong UIImageView *sepImage;
-(NSMutableArray*)templetrueArr{ -(NSMutableArray*)templetrueArr{
if (_templetrueArr==nil) { if (_templetrueArr==nil) {
_templetrueArr=[NSMutableArray array]; _templetrueArr=[NSMutableArray array];
for (int i=20; i<41; i++) { for (int i=20; i<36; i++) {
NSString*temp=[NSString stringWithFormat:@"%d°c",i]; NSString*temp=[NSString stringWithFormat:@"%d°c",i];
[_templetrueArr addObject:temp]; [_templetrueArr addObject:temp];
} }
@ -341,7 +341,14 @@ Strong UIImageView *sepImage;
//返回多少行 //返回多少行
- (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component{ - (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;
}
} }
//每一行的数据 //每一行的数据

2
Ifish/controllers/HotBar/Views/IfishChatView.m
View File

@ -11,7 +11,7 @@
#define Normal_heaterPh 499 //只有499才是正常流量 #define Normal_heaterPh 499 //只有499才是正常流量
#define Rect_Width kSizeFrom750(599) #define Rect_Width kSizeFrom750(599)
#define Origin_Left kSizeFrom750(59) #define Origin_Left kSizeFrom750(67)
#define Rect_Height kSizeFrom750(420) #define Rect_Height kSizeFrom750(420)
#define Zero_Y kSizeFrom750(526) #define Zero_Y kSizeFrom750(526)
@interface IfishChatView() @interface IfishChatView()

2
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
View File

@ -258,7 +258,7 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
self.attentionLabel.font=[UIFont systemFontOfSize:13]; self.attentionLabel.font=[UIFont systemFontOfSize:13];
self.attentionLabel.textColor=[UIColor blackColor]; self.attentionLabel.textColor=[UIColor blackColor];
self.attentionLabel.numberOfLines=0; 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 addSubview:self.waveProgressView];
[self.view bringSubviewToFront:self.waveProgressView]; [self.view bringSubviewToFront:self.waveProgressView];
[self.view addSubview:self.attentionLabel]; [self.view addSubview:self.attentionLabel];

20
Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib
View File

@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/> <device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<objects> <objects>
@ -75,7 +77,7 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="linkingdevice_point.png" translatesAutoresizingMaskIntoConstraints="NO" id="ZVX-4y-CYu"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="linkingdevice_point.png" translatesAutoresizingMaskIntoConstraints="NO" id="ZVX-4y-CYu">
<rect key="frame" x="3" y="24" width="19" height="19"/> <rect key="frame" x="13" y="24" width="9" height="9"/>
</imageView> </imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="(暂不支持5G网络，请使用2.4G网络）" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Djf-KM-um4"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="(暂不支持5G网络，请使用2.4G网络）" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Djf-KM-um4">
<rect key="frame" x="23" y="96.5" width="224" height="16"/> <rect key="frame" x="23" y="96.5" width="224" height="16"/>
@ -84,7 +86,7 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pAw-UG-caT"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pAw-UG-caT">
<rect key="frame" x="267" y="48.5" width="93" height="88"/> <rect key="frame" x="267" y="48.5" width="93" height="44"/>
<state key="normal" title="确定" backgroundImage="linkingdevice_botton.png"/> <state key="normal" title="确定" backgroundImage="linkingdevice_botton.png"/>
<connections> <connections>
<action selector="makeSureButton:" destination="-1" eventType="touchUpInside" id="MmM-3q-5Lu"/> <action selector="makeSureButton:" destination="-1" eventType="touchUpInside" id="MmM-3q-5Lu"/>
@ -95,7 +97,7 @@
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<string key="text">1、请将插排通电，长按复位键或开关绑定键（指示灯开始闪烁为复位成功）。 <string key="text">1、请将插排通电，长按复位键或开关绑定键（指示灯开始闪烁为复位成功）。
2、若Wifi名称有中文，请改成英文字母加数字。 2、若Wifi名称有中文，请改成英文字母加数字。
3、Wifi密码不能包含特殊符号（如,.!@等）。 3、Wifi密码不能包含特殊符号（如,.!‘”@等）。
4、若多次智能连接未成功，请尝试热点模式连接。</string> 4、若多次智能连接未成功，请尝试热点模式连接。</string>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/> <nil key="textColor"/>
@ -127,8 +129,8 @@
</view> </view>
</objects> </objects>
<resources> <resources>
<image name="linkingdevice_botton.png" width="84.5" height="44"/> <image name="linkingdevice_botton.png" width="84" height="44"/>
<image name="linkingdevice_point.png" width="9.5" height="9.5"/> <image name="linkingdevice_point.png" width="9" height="9"/>
<image name="linkingdevice_setting.png" width="360" height="404.5"/> <image name="linkingdevice_setting.png" width="360" height="404"/>
</resources> </resources>
</document> </document>

7
Ifish/controllers/logAddRegistController/LogInViewController.m
View File

@ -276,6 +276,9 @@
longitude:self.longitude longitude:self.longitude
latitude:self.latitude latitude:self.latitude
success:^(id response) { success:^(id response) {
if (!response) {
return ;
}
NSDictionary*dict=[NSJSONSerialization JSONObjectWithData:response options:NSJSONReadingMutableContainers error:nil]; NSDictionary*dict=[NSJSONSerialization JSONObjectWithData:response options:NSJSONReadingMutableContainers error:nil];
NSString *result=dict[@"result"]; NSString *result=dict[@"result"];
btn.userInteractionEnabled = YES; btn.userInteractionEnabled = YES;
@ -289,8 +292,8 @@
[[IfishUserDataUnity shareDataInstance] userloginValidationSuccsess:DataDic phoneNumber:phoneNumber passward:password]; [[IfishUserDataUnity shareDataInstance] userloginValidationSuccsess:DataDic phoneNumber:phoneNumber passward:password];
//重新登陆成功之后，上送deviceToken到服务器 //重新登陆成功之后，上送deviceToken到服务器
UserModel *model=[[UserModel alloc] initWithDict:[DataDic objectForKey:@"userInfo"]]; UserModel *model=[[UserModel alloc] initWithDict:[DataDic objectForKey:@"userInfo"]];
NSDictionary *params = @{@"deviceId":[FuncUserDefault strForKey:kDeviceToken], NSDictionary *params = @{@"deviceId":([FuncUserDefault strForKey:kDeviceToken].length?[FuncUserDefault strForKey:kDeviceToken]:@""),
@"userId":model.userId, @"userId":(model.userId.integerValue?model.userId:@(0)),
@"phoneType":@"iOS" @"phoneType":@"iOS"
}; };
[AFNOHeaderHttpTool requestWihtMethod:RequestTypePost url:Push_BindDevice_Url params:params success:^(id response) { [AFNOHeaderHttpTool requestWihtMethod:RequestTypePost url:Push_BindDevice_Url params:params success:^(id response) {