Merge remote-tracking branch 'origin/develop_01' 4.7.7

# Conflicts:
#	.DS_Store

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

Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m

@@ -1283,12 +1283,7 @@ Assign BOOL isPush;
         }
         else if ([model.type isEqualToString:@"camera"]){
             
-           // self.hidesBottomBarWhenPushed = YES;
-           // IfishP2PPlayBackListViewController *cameraShopVC=[[IfishP2PPlayBackListViewController alloc]init];
-          //  cameraShopVC.camera = model.camera;
-           // [self.navigationController pushViewController:cameraShopVC animated:YES];
-           // self.hidesBottomBarWhenPushed = NO;
-            
+                       
             //切换时主动 断开 soket
            [[Socketsingleton sharedInstance] cutOffSocket];
             //进入摄像头页面