features:4月新绚多设备适配 & 修复一些已知bug

2019-05-15 20:24:53 +08:00
parent 4b74588759
commit c586949438
59 changed files with 2912 additions and 130 deletions
@@ -17,6 +17,7 @@
 #import "SongNuoBDProtocol.h"
 #import "RunSun84Protocol.h"
 #import "RuiMeiProtocolModel.h"
+#import "Xuanduo2Model.h"

@interface FishControlFourthCell : UICollectionViewCell

@@ -59,6 +60,12 @@
                       atIndex:(NSIndexPath *)indexPath
                      addBackModel:(XutoBackMsgModel *)model;

+//新绚多
+-(void)setXuanduo2ControBtnImg:(NSArray *)imgOffArr
+                         addArr:(NSArray *)imgOnArr
+                        atIndex:(NSIndexPath *)indexPath
+                  addBackModel:(Xuanduo2Model*)model;
+
 //松诺

 -(void)setSongNuoControlBtnImg:(NSArray *)imgOffArr
@@ -88,4 +95,6 @@
                      atIndex:(NSIndexPath *)indexPath
                 addBackModel:(RuiMeiProtocolModel*)model;

+
+
@end
@@ -251,6 +251,63 @@
        
    }
    
+}
+
+-(void)setXuanduo2ControBtnImg:(NSArray *)imgOffArr
+                        addArr:(NSArray *)imgOnArr
+                       atIndex:(NSIndexPath *)indexPath
+                  addBackModel:(Xuanduo2Model*)model {
+    
+    NSInteger index =  indexPath.row - 3;
+    if (index == 0) {
+
+        NSString*stateString=[model.waterPump substringWithRange:NSMakeRange(2, IFISH_LIGHTBTN_BYTE)];
+        [self btnImgAtIndex:indexPath withStr:stateString addWithOnImg:imgOnArr
+                  addOffArr:imgOffArr];
+    }else if (index == 1){
+        
+        NSString*stateString=[model.gasPump substringWithRange:NSMakeRange(2, IFISH_LIGHTBTN_BYTE)];
+        [self btnImgAtIndex:indexPath withStr:stateString addWithOnImg:imgOnArr
+                  addOffArr:imgOffArr];
+        
+    }else if (index == 2){
+        
+        NSString*stateString=[model.light1 substringWithRange:NSMakeRange(2, IFISH_LIGHTBTN_BYTE)];
+        [self btnImgAtIndex:indexPath withStr:stateString addWithOnImg:imgOnArr
+                  addOffArr:imgOffArr];
+        
+    }else if (index == 3){
+        
+        NSString*stateString=[model.light2 substringWithRange:NSMakeRange(2, IFISH_LIGHTBTN_BYTE)];
+        [self btnImgAtIndex:indexPath withStr:stateString addWithOnImg:imgOnArr
+                  addOffArr:imgOffArr];
+        
+    }else if (index == 4){
+        
+        NSString*stateString=[model.waveMakingPump substringWithRange:NSMakeRange(2, IFISH_LIGHTBTN_BYTE)];
+        [self btnImgAtIndex:indexPath withStr:stateString addWithOnImg:imgOnArr
+                  addOffArr:imgOffArr];
+        
+    }else if (index == 5){
+        
+        NSString*stateString=[model.uvLamp substringWithRange:NSMakeRange(2, IFISH_LIGHTBTN_BYTE)];
+        [self btnImgAtIndex:indexPath withStr:stateString addWithOnImg:imgOnArr
+                  addOffArr:imgOffArr];
+        
+    }else if (index == 6){
+        
+        NSString*stateString=[model.huliLight substringWithRange:NSMakeRange(0, IFISH_LIGHTBTN_BYTE)];
+        [self btnImgAtIndex:indexPath withStr:stateString addWithOnImg:imgOnArr
+                  addOffArr:imgOffArr];
+        
+    }else if (index == 7){
+        
+        NSString*stateString=[model.heatStatus substringWithRange:NSMakeRange(0, IFISH_LIGHTBTN_BYTE)];
+        [self btnImgAtIndex:indexPath withStr:stateString addWithOnImg:imgOnArr
+                  addOffArr:imgOffArr];
+        
+    }
+    
    
 }

@@ -38,7 +38,7 @@
        
        formattemp = @"暂无数据";
    }
-
+    self.templabel.font = [UIFont systemFontOfSize:17];
    NSMutableAttributedString * attributedString = [[NSMutableAttributedString alloc] initWithString:formattemp ];

    [attributedString addAttribute:NSForegroundColorAttributeName  value:RGB(253, 188, 63) range:NSMakeRange(0,[formattemp  length])];