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

bug fix

This commit is contained in:
ifish 2017-09-17 14:29:15 +08:00
parent bce3e594ca
commit ada819836c
6 changed files with 14 additions and 10 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.xcodeproj/project.xcworkspace/xcuserdata/imac.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

4
Ifish/Info.plist
View File

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>4.6.2</string> <string>4.6.3</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
@ -70,7 +70,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>4.6.1</string> <string>4.6.3</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>

2
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m
View File

@ -489,7 +489,6 @@
[RuSun84BackMsgUtils readSoketDataWithBaackMassgModel:_backmodel addWithBackData:data]; [RuSun84BackMsgUtils readSoketDataWithBaackMassgModel:_backmodel addWithBackData:data];
// 温度 等状态 // 温度 等状态
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
[RuSun84BackMsgUtils setTemperaturelabel:self.temperature addbubleImge:self.bubble WithBackData:data addWithBackMassageModel:_backmodel addWithTableview:self.tableView]; [RuSun84BackMsgUtils setTemperaturelabel:self.temperature addbubleImge:self.bubble WithBackData:data addWithBackMassageModel:_backmodel addWithTableview:self.tableView];
@ -527,6 +526,7 @@
}); });
// 刷新设置界面 // 刷新设置界面
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{

13
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
View File

@ -3528,7 +3528,6 @@
} }
//开始渲染 //开始渲染
self.isReject = NO; self.isReject = NO;
[NSThread detachNewThreadSelector:@selector(renderView) toTarget:self withObject:nil]; [NSThread detachNewThreadSelector:@selector(renderView) toTarget:self withObject:nil];
@ -4520,7 +4519,6 @@
NSString *stringFloat = [NSString stringWithFormat:@"%d",temp]; NSString *stringFloat = [NSString stringWithFormat:@"%d",temp];
NSLog(@"%@",stringFloat); NSLog(@"%@",stringFloat);
NSArray*wenDuArr=[_ruSunPicview.picArr objectAtIndex:0]; NSArray*wenDuArr=[_ruSunPicview.picArr objectAtIndex:0];
//主线程名字和炫多通用 _xutoMainQueue 无影响 //主线程名字和炫多通用 _xutoMainQueue 无影响
@ -4560,7 +4558,7 @@
-(void)selectRuSun84Index:(NSIndexPath*)index withbackModle:(RunSun84Protocol *)backModel -(void)selectRuSun84Index:(NSIndexPath*)index withbackModle:(RunSun84Protocol *)backModel
{ {
//有加热制冷 //有加热制冷
[self showRunHotCoolPic]; [self showRunHotCoolPic:backModel];
[self ruSun84MianQueWith]; [self ruSun84MianQueWith];
} }
@ -4609,13 +4607,20 @@
#pragma mark - 制冷 制热 类型 温度选择 #pragma mark - 制冷 制热 类型 温度选择
-(void)showRunHotCoolPic -(void)showRunHotCoolPic:(RunSun84Protocol *)backModel
{ {
_ruSunPicview=[[HaveHotCoolWenDuPicview alloc] init]; _ruSunPicview=[[HaveHotCoolWenDuPicview alloc] init];
_ruSunPicview.frame=CGRectMake(0, 0, kScreenSize.width, kScreenSize.height); _ruSunPicview.frame=CGRectMake(0, 0, kScreenSize.width, kScreenSize.height);
[_ruSunPicview.sureBtn addTarget:self action:@selector(hotCoolBtnClick:) forControlEvents:UIControlEventTouchUpInside]; [_ruSunPicview.sureBtn addTarget:self action:@selector(hotCoolBtnClick:) forControlEvents:UIControlEventTouchUpInside];
[self.view.window addSubview:_ruSunPicview]; [self.view.window addSubview:_ruSunPicview];
_ruSunPicview.wenDuPicviewDelegate = self; _ruSunPicview.wenDuPicviewDelegate = self;
NSString *stateStr =nil;
if ([backModel.hotCool isKindOfClass:[NSNull class]]||!backModel.hotCool) {
backModel.hotCool = @"0000";
}
stateStr = [backModel.hotCool substringWithRange:NSMakeRange(2, 2)];
[_ruSunPicview initCateBtnSate:stateStr];
if (!_xutoMainQueue) { if (!_xutoMainQueue) {
_xutoMainQueue = dispatch_get_main_queue(); _xutoMainQueue = dispatch_get_main_queue();
} }

5
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m
View File

@ -1598,12 +1598,11 @@
} }
[RuSun84BackMsgUtils readSoketDataWithBaackMassgModel:_ruSun84Back addWithBackData:data]; [RuSun84BackMsgUtils readSoketDataWithBaackMassgModel:_ruSun84Back addWithBackData:data];
self.temperature = [BootomViewSoketBackMasgConreol getTempNewWayWithSoketData:data adddeviceType:DECICE_TYPE_THREETMP]; self.temperature = [BootomViewSoketBackMasgConreol getTempNewWayWithSoketData:data adddeviceType:DECICE_TYPE_RUSUN2A];
[self.collectionView reloadData]; [self.collectionView reloadData];
NSArray *timerArr=[RuSunBackMessageUtils refreshRuSunTimerAddTemperatureWithBackMassageModel:_ruSunBack]; NSArray *timerArr=[RuSun84BackMsgUtils refreshRuSunTimerAddTemperatureWithBackMassageModel:_ruSun84Back];
[self.MonitorBottomDelegate setTimeVCReloadDatawithTimerArr:timerArr [self.MonitorBottomDelegate setTimeVCReloadDatawithTimerArr:timerArr
withData:self.device withData:self.device
addMassglength:string1.length]; addMassglength:string1.length];