diff --git a/.DS_Store b/.DS_Store index 41700b7..84c23c2 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index ea05407..39405e5 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -15852,7 +15852,7 @@ "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl", ); - MARKETING_VERSION = 5.1.8; + MARKETING_VERSION = 5.1.9; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "-ObjC", @@ -15970,7 +15970,7 @@ "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl", ); - MARKETING_VERSION = 5.1.8; + MARKETING_VERSION = 5.1.9; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "-ObjC", @@ -15981,7 +15981,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - PROVISIONING_PROFILE_SPECIFIER = fishdis11; + PROVISIONING_PROFILE_SPECIFIER = fishdis12; TARGETED_DEVICE_FAMILY = 1; USER_HEADER_SEARCH_PATHS = ""; VERSIONING_SYSTEM = "apple-generic"; diff --git a/Ifish/Assets.xcassets/说明书/instruction.imageset/instruction.png b/Ifish/Assets.xcassets/说明书/instruction.imageset/instruction.png index 8e2f2b9..03601f1 100644 Binary files a/Ifish/Assets.xcassets/说明书/instruction.imageset/instruction.png and b/Ifish/Assets.xcassets/说明书/instruction.imageset/instruction.png differ diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RuSun84BackMsgUtils.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RuSun84BackMsgUtils.m index ccdacea..cf535be 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RuSun84BackMsgUtils.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RuSun84BackMsgUtils.m @@ -13,7 +13,12 @@ addWithBackData:(NSData*)data { + NSString*totalString=[dataContorl dataToHexString:data]; + if (totalString.length<172) + { + return; + } //无运行模式 ruSunModel.ch1=[totalString substringWithRange:NSMakeRange(30, 4)]; ruSunModel.ch2=[totalString substringWithRange:NSMakeRange(34, 4)]; diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToSoketBackMsgDataUnity.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToSoketBackMsgDataUnity.m index 929bc9d..6905a1a 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToSoketBackMsgDataUnity.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToSoketBackMsgDataUnity.m @@ -46,6 +46,9 @@ NSString*str=[dataContorl dataToHexString:data]; + if (str.length<127) { + return; + } str=[str substringWithRange:NSMakeRange(124,4)]; UInt64 mac=[dataContorl hexToTen:str]; NSLog(@"%llu",mac); diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m b/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m index d7d1f68..158d425 100644 --- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m +++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m @@ -25,7 +25,7 @@ // CFShow((__bridge CFTypeRef)(infoDic)); NSString *app_Version=[infoDic objectForKey:@"CFBundleShortVersionString"]; NSLog(@"app_Version%@",app_Version); - app_Version=@"4.7.8"; + app_Version=@"4.7.9"; NSString *versionStr = [NSString stringWithFormat:@"v%@",app_Version]; NSString *buildVersion = [infoDic objectForKey:@"CFBundleVersion"]; if (buildVersion.length > 0) {