epptouch sdk更新，闪退修改强化

Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m

@@ -317,6 +317,10 @@ Copy NSString *deviceId;
 
 
 - (void)udpHelperMessage:(NSString *)msg {
+    if (!self.timer)
+    {
+        return;
+    }
     self.HUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
     self.HUD.mode = MBProgressHUDModeIndeterminate;
     self.HUD.labelText = msg;
@@ -324,6 +328,7 @@ Copy NSString *deviceId;
     {
         [self.HUD hide:YES afterDelay:3];
         [self endProgress];
+        [self.progressView endProgressWithString:@"连接失败"];
     }
 }
 -(void)endProgress{

Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m

@@ -40,7 +40,7 @@
                 xuanduoModel.waterLevel=[dataString substringWithRange:NSMakeRange(84, 2)];
             }
             }
-        else if ([type isEqualToString:DECICE_TYPE_XUANDUO3F]&&[model isKindOfClass:[Xuanduo3fModel class]])
+        else if ([type isEqualToString:DECICE_TYPE_XUANDUO3F]&&[model isKindOfClass:[Xuanduo3fModel class]]&&dataString.length>67)
         {
             
             Xuanduo3fModel*xuanduoModel=model;

Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m

@@ -1038,7 +1038,7 @@
 
 #pragma mark -设置页面 -
 - (void)setting {
-    if (self.dataModel.gasPump) {
+    if (self.dataModel.gasPump.length) {
         Xuanduo2SettingController *_settingVC = [[Xuanduo2SettingController alloc] init];
         _settingVC.currentdevice = self.currentDevice;
         _settingVC.dataModel = self.dataModel;

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.13";
+    app_Version=@"4.7.14";
     NSString *versionStr = [NSString stringWithFormat:@"v%@",app_Version];
     NSString *buildVersion = [infoDic objectForKey:@"CFBundleVersion"];
     if (buildVersion.length > 0) {