From 7c5930b6d052f387b56f60fa26f7c08f3ebec9aa Mon Sep 17 00:00:00 2001
From: kai60 <zhufadong@163.com>
Date: Sun, 8 Aug 2021 10:44:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=97=B6=E9=97=B4=E6=AE=B5?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=8C=E5=8F=8A=E5=8F=AF=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ifish.xcodeproj/project.pbxproj               |  8 ++++----
 Ifish/Utinitys/dataUnity/dataContorl.m        |  4 ++++
 .../XuTo/Xuanduo2SettingController.m          | 19 +++++++++++++++++++
 .../pushSetControllrs/AboutUsViewController.m |  2 +-
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj
index d2718cf..96d694a 100644
--- a/Ifish.xcodeproj/project.pbxproj
+++ b/Ifish.xcodeproj/project.pbxproj
@@ -15817,7 +15817,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = WFX8GD5HFX;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
@@ -15892,7 +15892,7 @@
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl",
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl",
 				);
-				MARKETING_VERSION = 5.1.15;
+				MARKETING_VERSION = 5.1.16;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -15935,7 +15935,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = WFX8GD5HFX;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
@@ -16010,7 +16010,7 @@
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl",
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl",
 				);
-				MARKETING_VERSION = 5.1.15;
+				MARKETING_VERSION = 5.1.16;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-ObjC",
diff --git a/Ifish/Utinitys/dataUnity/dataContorl.m b/Ifish/Utinitys/dataUnity/dataContorl.m
index 304d225..b1b86dd 100644
--- a/Ifish/Utinitys/dataUnity/dataContorl.m
+++ b/Ifish/Utinitys/dataUnity/dataContorl.m
@@ -260,6 +260,10 @@
     NSString*shiString=@"";
     NSString*fenString=@"";
     UInt64 shi =strtoul([[hexString substringWithRange:NSMakeRange(0, 2)] UTF8String], 0, 16);
+    if(shi>23)
+    {
+        [[UIApplication sharedApplication].delegate.window makeToast:@"数据异常，请删除或重新设置"];
+    }
 
         shiString=[NSString stringWithFormat:@"%llu",shi];
     if ([shiString isEqualToString:@"0"]) {
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2SettingController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2SettingController.m
index c094a00..99f523c 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2SettingController.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2SettingController.m
@@ -795,12 +795,31 @@ static NSString *setTimerflag = @"SetTimerCell";
     NSLog(@"stat %@ end %@",startArr,endArr);
     if (startArr.count == 2 && endArr.count == 2) {
         NSInteger row1 = [[_mydatepicView.dataArr objectAtIndex:0] indexOfObject:startArr[0]];
+        if (row1==NSNotFound)
+        {
+            row1=0;
+        }
         [_mydatepicView.picView selectRow:row1 inComponent:0 animated:NO];
         NSInteger row2 = [[_mydatepicView.dataArr objectAtIndex:1] indexOfObject:startArr[1]];
+        if (row2==NSNotFound)
+        {
+            row2=0;
+        }
+
         [_mydatepicView.picView selectRow:row2 inComponent:1 animated:NO];
         NSInteger row3 = [[_mydatepicView.dataArr objectAtIndex:2] indexOfObject:endArr[0]];
+        if (row3==NSNotFound)
+        {
+            row3=0;
+        }
+
         [_mydatepicView.picView selectRow:row3 inComponent:2 animated:NO];
         NSInteger row4 = [[_mydatepicView.dataArr objectAtIndex:3] indexOfObject:endArr[1]];
+        if (row4==NSNotFound)
+        {
+            row4=0;
+        }
+
         [_mydatepicView.picView selectRow:row4 inComponent:3 animated:NO];
         
         _mydatepicView.startString = startArr[0];
diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m b/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m
index b103f9b..89e46a2 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.15";
+    app_Version=@"4.7.16";
     NSString *versionStr = [NSString stringWithFormat:@"v%@",app_Version];
     NSString *buildVersion = [infoDic objectForKey:@"CFBundleVersion"];
     if (buildVersion.length > 0) {