This commit is contained in:
ifish
2017-08-24 11:32:36 +08:00
parent c0c93f9949
commit bce3e594ca
6 changed files with 9 additions and 9 deletions
Vendored
BIN
View File
Binary file not shown.
+2 -2
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.1</string> <string>4.6.2</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.2</string> <string>4.6.1</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
@@ -143,7 +143,7 @@
} }
// 加热制冷 状态 1字节 // 加热制冷 状态 1字节
NSString*stateString6=[backModel.hotCool substringWithRange:NSMakeRange(2, 2)]; NSString*stateString6=[backModel.heatStickState substringWithRange:NSMakeRange(0, 2)];
if ([stateString6 isEqualToString:@"01"]){ if ([stateString6 isEqualToString:@"01"]){
//加热 //加热
@@ -1308,14 +1308,14 @@
LXImageWithImageName(@"bootview_light_off"), LXImageWithImageName(@"bootview_light_off"),
LXImageWithImageName(@"bootview_light_off"), LXImageWithImageName(@"bootview_light_off"),
LXImageWithImageName(@"bootview_light_off"), LXImageWithImageName(@"bootview_light_off"),
LXImageWithImageName(@"bootview_heat_on")]; LXImageWithImageName(@"bootview_heat_off")];
self.btnOnImgArr = @[LXImageWithImageName(@"bootview_light_on"), self.btnOnImgArr = @[LXImageWithImageName(@"bootview_light_on"),
LXImageWithImageName(@"bootview_light_on"), LXImageWithImageName(@"bootview_light_on"),
LXImageWithImageName(@"bootview_light_on"), LXImageWithImageName(@"bootview_light_on"),
LXImageWithImageName(@"bootview_light_on"), LXImageWithImageName(@"bootview_light_on"),
LXImageWithImageName(@"bootview_light_on"), LXImageWithImageName(@"bootview_light_on"),
LXImageWithImageName(@"bootview_heat_off")]; LXImageWithImageName(@"bootview_heat_on")];
}else if ([self.device.type isEqualToString:DECICE_TYPE_JUNENGCC]){ }else if ([self.device.type isEqualToString:DECICE_TYPE_JUNENGCC]){
@@ -387,9 +387,9 @@
//加热棒状态 //加热棒状态
//加热棒状态 加热还是制冷 //加热棒状态 加热还是制冷
//00 加热 01 制冷 //00 加热 01 制冷
//model.heatStickState 加热棒开关状态 非加热制冷状态注意 //model.heatStickState 加热棒开关状态
NSString*stateString=[model.hotCool substringWithRange:NSMakeRange(2, IFISH_LIGHTBTN_BYTE)]; NSString*stateString=[model.heatStickState substringWithRange:NSMakeRange(0, IFISH_LIGHTBTN_BYTE)];
[self btnImgAtIndex:indexPath withStr:stateString addWithOnImg:imgOnArr [self btnImgAtIndex:indexPath withStr:stateString addWithOnImg:imgOnArr
addOffArr:imgOffArr]; addOffArr:imgOffArr];
@@ -428,8 +428,8 @@
[self btnImgAtIndex:indexPath withStr:stateString addWithOnImg:imgOnArr [self btnImgAtIndex:indexPath withStr:stateString addWithOnImg:imgOnArr
addOffArr:imgOffArr]; addOffArr:imgOffArr];
} }else if (index == 4){
else if (index == 4){
//加热棒状态 //加热棒状态
NSString*stateString=[model.heatStickState substringWithRange:NSMakeRange(0, IFISH_LIGHTBTN_BYTE)]; NSString*stateString=[model.heatStickState substringWithRange:NSMakeRange(0, IFISH_LIGHTBTN_BYTE)];
[self btnImgAtIndex:indexPath withStr:stateString addWithOnImg:imgOnArr [self btnImgAtIndex:indexPath withStr:stateString addWithOnImg:imgOnArr