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

V5.0.0正式版：

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/controllers/HotBar/Views/IFishWaterChangeView.m
+199 -101
View File
@@ -10,7 +10,6 @@
@interface IFishWaterChangeView()<UIPickerViewDelegate,UIPickerViewDataSource>
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *pickerBottom;
@property(nonatomic,strong)NSMutableArray*data1;
@property(nonatomic,strong)NSMutableArray*data2;
@property(nonatomic,strong)NSMutableArray*templetrueArr;
@@ -20,28 +19,174 @@
@property(nonatomic,copy)NSString*selectVaule2;
@property(nonatomic,copy)NSString*selectVaule3;
@property(nonatomic,copy)NSString*warnCode;
@property (weak, nonatomic) IBOutlet UIView *topTempPicker;
@property (weak, nonatomic) IBOutlet UIView *bottomPicker;
@property (weak, nonatomic) IBOutlet UIView *heightView;
@property (weak, nonatomic) IBOutlet UITextField *longTextF;
@property (weak, nonatomic) IBOutlet UITextField *widthTextF;
@property (weak, nonatomic) IBOutlet UITextField *heightTextF;
@property (weak, nonatomic) IBOutlet UIPickerView *topUiPick;
@property (weak, nonatomic) IBOutlet UIPickerView *bottomUiPicker;
@property (weak, nonatomic) IBOutlet UIButton *openBtn;
@property (weak, nonatomic) IBOutlet UILabel *bottomTextF;
//@property (weak, nonatomic) IBOutlet UIButton *bgButton;
//@property (weak, nonatomic) IBOutlet UIPickerView *topUiPick;
//@property (weak, nonatomic) IBOutlet UIPickerView *bottomUiPicker;
//@property (weak, nonatomic) IBOutlet UIImageView *titleImageView;
//@property (weak, nonatomic) IBOutlet UILabel *titleLabel;
//@property (weak, nonatomic) IBOutlet UIButton *openBtn;//开关
//@property (weak, nonatomic) IBOutlet UIButton *sureBtn;
//@property (weak, nonatomic) IBOutlet UIImageView *sepImage;
Strong UIButton *bgButton;
Strong UIPickerView *topUiPick;
Strong UIPickerView *bottomUiPicker;
Strong UIImageView *titleImageView;
Strong UILabel *titleLabel;
Strong UIButton *openBtn;//开关
Strong UIButton *sureBtn;
Strong UIImageView *sepImage;
@end
@implementation IFishWaterChangeView
-(instancetype)init{
self = [super init];
if (self) {
[self addSubview:self.bgButton];
[self addSubview:self.topUiPick];
[self addSubview:self.bottomUiPicker];
[self addSubview:self.sepImage];
[self addSubview:self.titleImageView];
[self.titleImageView addSubview:self.titleLabel];
[self addSubview:self.openBtn];
[self addSubview:self.sureBtn];
[self loadLayout];
}
return self;
}
#pragma mark --lazyLoading
- (UIButton *)bgButton{
if (!_bgButton) {
_bgButton = InitObject(UIButton);
[_bgButton addTarget:self action:@selector(bgButtonClick:) forControlEvents:UIControlEventTouchUpInside];
[_bgButton setBackgroundColor:RGBA(0, 0, 0, 0.3)];
}
return _bgButton;
}
- (UIPickerView *)topUiPick{
if (!_topUiPick) {
_topUiPick = [[UIPickerView alloc]init];
_topUiPick.delegate = self;
_topUiPick.backgroundColor = [UIColor whiteColor];
}
return _topUiPick;
}
- (UIPickerView *)bottomUiPicker{
if (!_bottomUiPicker) {
_bottomUiPicker = InitObject(UIPickerView);
_bottomUiPicker.delegate = self;
_bottomUiPicker.backgroundColor = [UIColor whiteColor];
}
return _bottomUiPicker;
}
- (UIImageView *)sepImage{
if (!_sepImage) {
_sepImage = InitObject(UIImageView);
[_sepImage setImage:IMAGEBYENAME(@"虚线")];
}
return _sepImage;
}
- (UIButton *)openBtn{
if (!_openBtn) {
_openBtn = InitObject(UIButton);
[_openBtn setBackgroundImage:IMAGEBYENAME(@"graybtn_big") forState:UIControlStateNormal];
[_openBtn setBackgroundImage:IMAGEBYENAME(@"greenbtn_big") forState:UIControlStateSelected];
[_openBtn addTarget:self action:@selector(openBtnClick:) forControlEvents:UIControlEventTouchUpInside];
}
return _openBtn;
}
- (UIImageView *)titleImageView{
if (!_titleImageView) {
_titleImageView = InitObject(UIImageView);
[_titleImageView setImage:IMAGEBYENAME(@"change_tep_title")];
}
return _titleImageView;
}
- (UIButton *)sureBtn{
if (!_sureBtn) {
_sureBtn = InitObject(UIButton);
[_sureBtn setBackgroundImage:IMAGEBYENAME(@"change_tep_bottom") forState:UIControlStateNormal];
[_sureBtn.titleLabel setFont:[UIFont systemFontOfSize:13]];
[_sureBtn setTitleColor:XWhite forState:UIControlStateNormal];
[_sureBtn setTitle:@"确 定" forState:UIControlStateNormal];
[_sureBtn addTarget:self action:@selector(sureBtnClick:) forControlEvents:UIControlEventTouchUpInside];
}
return _sureBtn;
}
- (UILabel *)titleLabel{
if (!_titleLabel) {
_titleLabel = InitObject(UILabel);
_titleLabel.textColor = XWhite;
_titleLabel.font = [UIFont systemFontOfSize:13];
_titleLabel.text = @"设置水温";
}
return _titleLabel;
}
//masonry
-(void)loadLayout{
[self.bgButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.mas_equalTo(self);
}];
[self.topUiPick mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(kSizeFrom750(690));
make.height.mas_equalTo(kSizeFrom750(280));
make.centerY.centerX.mas_equalTo(self);
}];
[self.titleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.width.mas_equalTo(self.topUiPick);
make.bottom.mas_equalTo(self.topUiPick.mas_top);
make.height.mas_equalTo(kSizeFrom750(60));
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.height.mas_equalTo(self.titleImageView);
make.left.mas_equalTo(kSizeFrom750(30));
}];
[self.openBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(kSizeFrom750(86));
make.height.mas_equalTo(kSizeFrom750(50));
make.right.mas_equalTo(self.titleImageView.mas_right).offset(-kSizeFrom750(40));
make.centerY.mas_equalTo(self.titleImageView);
}];
[self.bottomUiPicker mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.width.height.centerX.mas_equalTo(self.topUiPick);
}];
[self.sepImage mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.centerY.mas_equalTo(self.bottomUiPicker);
make.width.mas_equalTo(kSizeFrom750(24));
make.height.mas_equalTo(kSizeFrom750(264));
}];
[self.sureBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.width.height.mas_equalTo(self.titleImageView);
make.top.mas_equalTo(self.bottomUiPicker.mas_bottom);
}];
}
-(NSMutableArray *)data1{
if (_data1==nil) {
_data1=[NSMutableArray array];
_data2=[NSMutableArray array];
if (!_data1) {
_data1=InitObject(NSMutableArray);
}
return _data1;
}
-(NSMutableArray *)data2{
if (!_data2) {
_data2=InitObject(NSMutableArray);
}
return _data2;
}
-(NSMutableArray *)timeArr{
if (_timeArr==nil) {
_timeArr=[NSMutableArray array];
@@ -78,34 +223,36 @@
-(void)setViewType:(NSInteger)viewType{
_viewType=viewType;
self.topTempPicker.hidden=YES;
self.heightView.hidden=YES;
self.bottomPicker.hidden=YES;
self.topUiPick.hidden=YES;
self.bottomUiPicker.hidden=YES;
self.sepImage.hidden = YES;
self.openBtn.hidden = YES;
[self.data1 removeAllObjects];
[self.data2 removeAllObjects];
if (viewType==0) {// 设置水温
self.topTempPicker.hidden=NO;
self.bottomPicker.hidden=NO;
self.bottomTextF.text=@"请输设置预警温度";
self.topUiPick.hidden=NO;
[self.data1 addObjectsFromArray:self.templetrueArr];
[self.data2 addObjectsFromArray:self.templetrueArr];
[self.topUiPick reloadAllComponents];
[self.bottomUiPicker reloadAllComponents];
self.openBtn.hidden=NO;
self.pickerBottom.constant=240.0;
if ([self.hotVo.wornCode isEqualToString:@"01"]) {
self.openBtn.selected=YES;
}else{
self.openBtn.selected=NO;
}
if ( self.hotVo.heaterNum) {
self.hotVo.heaterNum=[self.hotVo.heaterNum stringByReplacingOccurrencesOfString:@"°c" withString:@""];
NSInteger heaterNum=round([self.hotVo.heaterNum integerValue]-20) ;
[self.topUiPick selectRow:heaterNum inComponent:0 animated:NO];
self.selectVaule1=self.hotVo.heaterNum;
}
}else if(viewType==1){//设置预警温度
[self.data1 addObjectsFromArray:self.templetrueArr];
[self.data2 addObjectsFromArray:self.templetrueArr];
self.bottomUiPicker.hidden=NO;
self.sepImage.hidden = NO;
self.openBtn.hidden = NO;
self.titleLabel.text=@"请设置预警温度：";
[self.bottomUiPicker reloadAllComponents];
if ([self.hotVo.wornCode isEqualToString:@"01"]) {
self.openBtn.selected=YES;
}else{
self.openBtn.selected=NO;
}
if (self.hotVo.downTeamp) {
self.hotVo.downTeamp=[self.hotVo.downTeamp stringByReplacingOccurrencesOfString:@"°c" withString:@""];
NSInteger downTeamp=round([self.hotVo.downTeamp integerValue]-20);
@@ -113,7 +260,6 @@
[self.bottomUiPicker selectRow:downTeamp inComponent:0 animated:NO];
self.selectVaule2=self.hotVo.downTeamp;
}
if (self.hotVo.upTeamp) {
self.hotVo.upTeamp=[self.hotVo.upTeamp stringByReplacingOccurrencesOfString:@"°c" withString:@""];
NSInteger upTeamp=round([self.hotVo.upTeamp integerValue]-20) ;
@@ -121,37 +267,17 @@
[self.bottomUiPicker selectRow:upTeamp inComponent:1 animated:NO];
self.selectVaule3=self.hotVo.upTeamp;
}
}else if(viewType==1){//容器大小
self.bottomTextF.text=@"请输入水体部分尺寸：";
self.heightView.hidden=NO;
self.bottomPicker.hidden=NO;
self.openBtn.hidden=YES;
[self.longTextF becomeFirstResponder];
self.pickerBottom.constant=340.0;
if (self.hotVo.heater) {
if(self.hotVo.heater.heaterLong.length){
self.longTextF.text=self.hotVo.heater.heaterLong;
}
if(self.hotVo.heater.heaterWidth.length){
self.widthTextF.text=self.hotVo.heater.heaterWidth;
}
if(self.hotVo.heater.heaterHeight.length){
self.heightTextF.text=self.hotVo.heater.heaterHeight;
}
}
}else if (viewType==2){//流量
self.bottomPicker.hidden=NO;
// self.bottomUiPicker.hidden=NO;
}else if (viewType==4){//换水周期
self.bottomPicker.hidden=NO;
self.bottomUiPicker.hidden=NO;
self.openBtn.hidden = NO;
self.sepImage.hidden = NO;
[self.data1 addObjectsFromArray:self.dayArr];
[self.data2 addObjectsFromArray:self.timeArr];
[self.topUiPick reloadAllComponents];
[self.bottomUiPicker reloadAllComponents];
self.bottomTextF.text=@"换水周期选择：";
self.openBtn.hidden=NO;
self.titleLabel.text=@"换水周期选择：";
self.selectVaule2=self.data1[0];
if (self.hotVo.heater.heaterCycle!=nil) {
@@ -169,21 +295,22 @@
self.openBtn.selected=NO;
self.selectVaule3=@"5";
}
}
// if(self.data1.count>0){
// self.selectVaule1=self.data1[0];
// self.selectVaule2=self.data1[0];
// }
// if (self.data2.count>0) {
// self.selectVaule3=self.data2[0];
// }
}
- (IBAction)clickSubmit:(id)sender {
//点击open按钮
- (void)openBtnClick:(UIButton *)sender {
sender.selected=!sender.selected;
if(self.viewType==0){
self.hotVo.wornCode=sender.selected?@"01":@"00";
[self.myDelegate clickWormCode:self.hotVo.wornCode];
}
}
//点击背景按钮
- (void)bgButtonClick:(UIButton *)sender {
self.hidden=YES;
}
//点击确定按钮
- (void)sureBtnClick:(UIButton *)sender{
self.hidden=YES;
if(_viewType==5){
[self.myDelegate didSelectRow1:self.selectVaule2 andRow2:self.selectVaule3];
@@ -192,8 +319,6 @@
NSString*code=self.openBtn.selected?@"01":@"00";
[self.myDelegate didSelectTeamptrue:self.selectVaule3 andDown:self.selectVaule2 andT:self.selectVaule1 andWarnCode:code];
}else if (_viewType==1){
[self.myDelegate submitText:self.widthTextF.text andh:self.heightTextF.text andV:self.longTextF.text];
}else if(_viewType==4){
// [self.myDelegate didSelectRemindTime:self.selectVaule2];
if(self.openBtn.selected==NO){
@@ -205,13 +330,6 @@
}
-(void)awakeFromNib{
[super awakeFromNib];
}
- (IBAction)clickBg:(id)sender {
self.hidden=YES;
}
//返回多少列
-(NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView{
if (pickerView==self.topUiPick) {
@@ -239,7 +357,6 @@
//选中时的效果
-(void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component{
// self.selectValue = self.data[row];
if (pickerView==self.topUiPick) {
self.selectVaule1=self.data1[row];
}else{
@@ -254,29 +371,10 @@
//返回高度
-(CGFloat)pickerView:(UIPickerView *)pickerView rowHeightForComponent:(NSInteger)component{
return 35.0f;
return kSizeFrom750(50);
}
//返回宽度
//-(CGFloat)pickerView:(UIPickerView *)pickerView widthForComponent:(NSInteger)component{
// return ZYAppWidth;
//}
//-(UIView*)pickerView:(UIPickerView*)pickerView viewForRow:(NSInteger)row forComponent:(NSInteger)component reusingView:(UIView*)view {
// UIView *cellView = view;
// if (!cellView) {
// cellView = [[UIView alloc] init];
// }
// cellView.backgroundColor = [UIColor redColor];
// return cellView;
//}
- (IBAction)clickOpenBtn:(UIButton *)sender {
sender.selected=!sender.selected;
if(self.viewType==0){
self.hotVo.wornCode=sender.selected?@"01":@"00";
[self.myDelegate clickWormCode:self.hotVo.wornCode];
}
}
@end