diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 0acf175..dd8437c 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -15805,7 +15805,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; @@ -15880,7 +15880,7 @@ "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl", ); - MARKETING_VERSION = 5.1.12; + MARKETING_VERSION = 5.1.13; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "-ObjC", @@ -15923,7 +15923,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; @@ -15998,7 +15998,7 @@ "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl", ); - MARKETING_VERSION = 5.1.12; + MARKETING_VERSION = 5.1.13; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "-ObjC", diff --git a/Ifish/Assets.xcassets/images/revert.imageset/Contents.json b/Ifish/Assets.xcassets/images/revert.imageset/Contents.json new file mode 100644 index 0000000..ec283a8 --- /dev/null +++ b/Ifish/Assets.xcassets/images/revert.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "revert.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "revert@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "revert@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/images/revert.imageset/revert.png b/Ifish/Assets.xcassets/images/revert.imageset/revert.png new file mode 100644 index 0000000..793d322 Binary files /dev/null and b/Ifish/Assets.xcassets/images/revert.imageset/revert.png differ diff --git a/Ifish/Assets.xcassets/images/revert.imageset/revert@2x.png b/Ifish/Assets.xcassets/images/revert.imageset/revert@2x.png new file mode 100644 index 0000000..7ab0dff Binary files /dev/null and b/Ifish/Assets.xcassets/images/revert.imageset/revert@2x.png differ diff --git a/Ifish/Assets.xcassets/images/revert.imageset/revert@3x.png b/Ifish/Assets.xcassets/images/revert.imageset/revert@3x.png new file mode 100644 index 0000000..4ce7648 Binary files /dev/null and b/Ifish/Assets.xcassets/images/revert.imageset/revert@3x.png differ diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m b/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m index 480b2c9..950dc3c 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.12"; + app_Version=@"4.7.13"; NSString *versionStr = [NSString stringWithFormat:@"v%@",app_Version]; NSString *buildVersion = [infoDic objectForKey:@"CFBundleVersion"]; if (buildVersion.length > 0) { diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m index 6fa44d1..e469509 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m @@ -673,7 +673,7 @@ Strong UIImage *screenShotImage;//截图 #pragma mark- 下拉菜单 -(MessageAlertView *)popView{ if (!_popView) { - _popView = [[MessageAlertView alloc]initWithFrame:RECT(screen_width - kSizeFrom750(220), 0, kSizeFrom750(220), kSizeFrom750(270))]; + _popView = [[MessageAlertView alloc]initWithFrame:RECT(screen_width - kSizeFrom750(220), 0, kSizeFrom750(220), kSizeFrom750(337.5))]; WEAK_SELF; //点击 _popView.comboxBlock = ^(NSInteger tag) { @@ -705,6 +705,16 @@ Strong UIImage *screenShotImage;//截图 [weakSelf.view makeToast:@"设备已离线"]; } } + else if (tag == 4){ + //翻转 + [UIView animateWithDuration:2.0f animations:^{ + weakSelf.player.viewController.view.transform = CGAffineTransformMakeRotation(M_PI); + + } completion:^(BOOL finished) { + + }]; + + } [weakSelf popAppear];//隐藏弹出框 }; } @@ -727,8 +737,8 @@ Strong UIImage *screenShotImage;//截图 [self.view addSubview:self.popView]; NSArray *titleImgs =nil; NSArray *titles=nil; - titleImgs = @[@"ifishdropview_edite_device",@"ifishdropview_delect_device",@"Ifish_share_device",@"equipment_icon_equipmentupdate"]; - titles=@[@"修改名称",@"删除设备",@"分享设备",@"设备升级"]; + titleImgs = @[@"ifishdropview_edite_device",@"ifishdropview_delect_device",@"Ifish_share_device",@"equipment_icon_equipmentupdate",@"revert"]; + titles=@[@"修改名称",@"删除设备",@"分享设备",@"设备升级",@"图像翻转"]; [self.popView loadInfoWithTitle:titles Icons:titleImgs]; }