diff --git a/Ifish/Info.plist b/Ifish/Info.plist index b6c28e3..8056cb1 100644 --- a/Ifish/Info.plist +++ b/Ifish/Info.plist @@ -70,7 +70,7 @@ CFBundleVersion - 472 + 473 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiProtocolModel.h b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiProtocolModel.h index 5810be6..ad09e19 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiProtocolModel.h +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiProtocolModel.h @@ -8,7 +8,7 @@ #import -@interface RuiMeiProtocolModel : NSObject +@interface RuiMeiProtocolModel : NSObject @property (nonatomic,copy) NSString *ch1; @property (nonatomic,copy) NSString *ch2; @property (nonatomic,copy) NSString *ch3; diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiProtocolModel.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiProtocolModel.m index 1e859d3..1373f5d 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiProtocolModel.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiProtocolModel.m @@ -10,4 +10,61 @@ @implementation RuiMeiProtocolModel +- (void)encodeWithCoder:(NSCoder *)aCoder { + [aCoder encodeObject:self.ch1 forKey:@"ch1"]; + [aCoder encodeObject:self.ch2 forKey:@"ch2"]; + [aCoder encodeObject:self.ch3 forKey:@"ch3"]; + [aCoder encodeObject:self.ch4 forKey:@"ch4"]; + [aCoder encodeObject:self.customModel forKey:@"customModel"]; + + [aCoder encodeObject:self.timer1 forKey:@"timer1"]; + [aCoder encodeObject:self.timer2 forKey:@"timer2"]; + [aCoder encodeObject:self.timer3 forKey:@"timer3"]; + [aCoder encodeObject:self.timer4 forKey:@"timer4"]; + [aCoder encodeObject:self.timer5 forKey:@"timer5"]; + [aCoder encodeObject:self.timer6 forKey:@"timer6"]; + [aCoder encodeObject:self.timer7 forKey:@"timer7"]; + [aCoder encodeObject:self.timer8 forKey:@"timer8"]; + [aCoder encodeObject:self.heatStickState forKey:@"heatStickState"]; + [aCoder encodeObject:self.wendu forKey:@"wendu"]; + [aCoder encodeObject:self.heatTemperature forKey:@"heatTemperature"]; + + [aCoder encodeObject:self.shiwen forKey:@"shiwen"]; + [aCoder encodeObject:self.baojingSwitch forKey:@"baojingSwitch"]; + [aCoder encodeObject:self.miniTp forKey:@"miniTp"]; + [aCoder encodeObject:self.maxTp forKey:@"maxTp"]; + [aCoder encodeObject:self.funcCode forKey:@"funcCode"]; +} + +- (instancetype)initWithCoder:(NSCoder *)aDecoder { + if (self = [super init]) { + self.ch1 = [aDecoder decodeObjectForKey:@"ch1"]; + self.ch2 = [aDecoder decodeObjectForKey:@"ch2"]; + self.ch3 = [aDecoder decodeObjectForKey:@"ch3"]; + self.ch4 = [aDecoder decodeObjectForKey:@"ch4"]; + self.customModel = [aDecoder decodeObjectForKey:@"customModel"]; + + self.timer1 = [aDecoder decodeObjectForKey:@"timer1"]; + self.timer2 = [aDecoder decodeObjectForKey:@"timer2"]; + self.timer3 = [aDecoder decodeObjectForKey:@"timer3"]; + self.timer4 = [aDecoder decodeObjectForKey:@"timer4"]; + self.timer5 = [aDecoder decodeObjectForKey:@"timer5"]; + self.timer6 = [aDecoder decodeObjectForKey:@"timer6"]; + self.timer7 = [aDecoder decodeObjectForKey:@"timer7"]; + self.timer8 = [aDecoder decodeObjectForKey:@"timer8"]; + self.heatStickState = [aDecoder decodeObjectForKey:@"heatStickState"]; + self.wendu = [aDecoder decodeObjectForKey:@"wendu"]; + + self.heatTemperature = [aDecoder decodeObjectForKey:@"heatTemperature"]; + + self.shiwen = [aDecoder decodeObjectForKey:@"shiwen"]; + self.baojingSwitch = [aDecoder decodeObjectForKey:@"baojingSwitch"]; + self.miniTp = [aDecoder decodeObjectForKey:@"miniTp"]; + self.maxTp = [aDecoder decodeObjectForKey:@"maxTp"]; + self.funcCode = [aDecoder decodeObjectForKey:@"funcCode"]; + } + return self; +} + @end + diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m b/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m index a62a6b4..136f471 100644 --- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m +++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m @@ -25,7 +25,12 @@ // CFShow((__bridge CFTypeRef)(infoDic)); NSString *app_Version=[infoDic objectForKey:@"CFBundleShortVersionString"]; NSLog(@"app_Version%@",app_Version); - self.versionLabel.text=[NSString stringWithFormat:@"v%@",app_Version]; + NSString *versionStr = [NSString stringWithFormat:@"v%@",app_Version]; + NSString *buildVersion = [infoDic objectForKey:@"CFBundleVersion"]; + if (buildVersion.length > 0) { + versionStr = [versionStr stringByAppendingString:[NSString stringWithFormat:@"(%@)", buildVersion]]; + } + self.versionLabel.text=versionStr; //build 版本 // NSString *app_build=[infoDic objectForKey:@"CFBundleVersion"];