V5.0.0正式版:

1、加热棒内容修改;
2、首页商品删除,更改为行业资讯;
3、绚多设备更名显示;
4、bugly更换为新版本;
5、摄像头显示bug修复;
6、开屏广告显示不全修复;
This commit is contained in:
wbzhan
2019-08-23 16:11:17 +08:00
parent 374a0fed46
commit 23c5d6f60d
50 changed files with 1499 additions and 897 deletions
@@ -561,10 +561,9 @@
NSLog(@"点击绚多的设置的大响应按钮");
}
//水族箱设置
-(void)pushSetTimeVC{
_xuToSetVC=[[XuToSetViewController alloc] init];
_xuToSetVC.currentdevice=self.currentDevice;
[self.navigationController pushViewController:_xuToSetVC animated:YES];
//self.navigationBarHidden=NO;
@@ -8,6 +8,11 @@
#import "FatherController.h"
#import "Socketsingleton.h"
/**
*/
@interface XuToSetViewController : FatherController
{
@@ -25,5 +30,4 @@
@property(nonatomic)int percent;
@property(nonatomic,strong) DeviceModel* currentdevice;
@end
@@ -37,7 +37,8 @@
#import "BrightnessModel.h"
#import "CreatErWeiMaController.h"
#import "UINavigationBar+Background.h"
#import "XuToControlName.h"
#import "UserExtendataArchaver.h"
@interface XuToSetViewController ()
{
@@ -61,6 +62,8 @@
@property(nonatomic,strong)setRemindWaterModel*waterInfmodel;
@property(nonatomic) NSInteger tian;
Strong XuToControlName *xutoName;//
@end
@implementation XuToSetViewController
@@ -74,7 +77,7 @@
self.navigationController.navigationBar.backItem.title=@"";
[self addTitleViewWithTitle:@"设置"];
[self initData];
self.xutoName = [UserExtendataArchaver currentXuToControlName:self.currentdevice.macAddress];
[self creatIndicatorView];
self.tableView.backgroundColor=COLOR_MIAN;
@@ -447,8 +450,8 @@
}
}
[cell setTuToSetCellBackAtIndex:indexPath];
[cell setTuToSetCellBackAtIndex:indexPath andName1:self.xutoName.airPump andName2:self.xutoName.light1 andName3:self.xutoName.light2];
//cell