From ef2a9df60599c9e27ebfa9bb2550620210734c7d Mon Sep 17 00:00:00 2001 From: kai60 Date: Tue, 15 Jun 2021 17:57:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E9=9D=A2=E7=BF=BB=E8=BD=AC=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ifish.xcodeproj/project.pbxproj | 8 +++--- .../images/revert.imageset/Contents.json | 23 ++++++++++++++++++ .../images/revert.imageset/revert.png | Bin 0 -> 1022 bytes .../images/revert.imageset/revert@2x.png | Bin 0 -> 1532 bytes .../images/revert.imageset/revert@3x.png | Bin 0 -> 2318 bytes .../pushSetControllrs/AboutUsViewController.m | 2 +- .../IfishP2PMonitorController.m | 16 +++++++++--- 7 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 Ifish/Assets.xcassets/images/revert.imageset/Contents.json create mode 100644 Ifish/Assets.xcassets/images/revert.imageset/revert.png create mode 100644 Ifish/Assets.xcassets/images/revert.imageset/revert@2x.png create mode 100644 Ifish/Assets.xcassets/images/revert.imageset/revert@3x.png 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 0000000000000000000000000000000000000000..793d322276d98495d42d343285e2eb90f29001c6 GIT binary patch literal 1022 zcmeAS@N?(olHy`uVBq!ia0vp^;vmey3?#3AQJDm!SkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g24Xjs9VU4b@0eMSL3 zA+A6LqkyCk*z@UI9Z*ARNswPK!}>cS(qW}d1(7=DlWq4uy!K0jvH9O7$KNNG&Ru); z&pD>^ZQ?waqHgKc%6t615X`J~{6L4d0O!2>pR8hB`|OhI@~*SBDuz6^6ir!n=-J&D z?_~6UPI>7h^!n!ad-eQj90tA)az__GR{R3AkTJ>I-G!lpRn`N@;VkfoEC$jbwg-dT z$!t3ye;Mk~%5QD%RWA>1tuFXL@y(qMf3Sp{C@~YOW;Bj~RAs48LCb z*mdNt$pLy_wZt`|BqgyV)hf9t6-Y4{85kMr8kp%CnuZvfTbY-O{2=hP2F_R4aXb{fzwFRQ<%1+{`@v z%;fw$-L(9?68)0g0x&N=E3YyyGbP0`-K0RjIHNSNA~R19Xv~vGE9L-AW$<+Mb6Mw< G&;$TX`t>>h literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7ab0dff81e4c0936bf59a0e112a07fd6613e0479 GIT binary patch literal 1532 zcmeAS@N?(olHy`uVBq!ia0vp^dLYcf3?viMZ?gg^mUKs7M+SzC{oH>NL43yIAa^H* zb?0PW0yzrF9znhg3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@h0??Hf1 zh$~RRC>X{eFriyI6zIMAB|(0{3`*zUHysPIxXUgSIb;9RufN}3T+`spy`*6KpYQ9F ze`+1=EB>LvJjJH)9FuVr%h`7uOTrvOGA14V{D33vNI0ursLKIJCt|*<&yn( znm2Xgj&BFt>X&UPw_=mqyf8;yCgHI?zyIWFyA>|FTfYRDeY~*zQDCi@Hc$SGtULXj z;+IeC{$+hgTH=*v=?x7&_YJvE6raVcTs1+yMZxIGQ(1=fK&LV$dAqwXbg;^L06Clm z9+AaB8pQTsa66f8$H2hE>FMGa;&D7VL4iSH=8Q;=m5xknK0iO7t{i1*9q_e=&rfDk z%pIFOHGe)o=jPzz?C$6?H0Wraa(?=ORS_XUS$0MfrcIp6Y|OILK=icsnd6)yh9TOT zkHc)^{a8acuDVsT$3Y_0@_Y@GgKXqhHpQ!-O}7fH+PaiOYyNuX@U^Si#V(i|m>69X zGc`0d-hLn?FOxMmkN4578@CkKT;5b(;1d3xWomKRO#Ay+d6iS{UYPRwwbPNi&(E75 zo}^`Sq4#@BM|I`tBu_!Rri@iz6_)+}6`AbquuLP1^^Yr)!lOpVh|AFiF_|73-VqEj zHZs*&eGJ;EeLY=$j$+qRkF1)dXr`fOcQB4S_QuRa7luoFW_Aerc%FQu`8hUt z+N-2hdfK!2OS#3X%ruS%%vtu#JboS1D=|Bhr(IK5bgf>M-LOc~AWzqA-TKwr*S4g6 zVf)TgJ7I#Wvd>N};cZ2(>sIbmy|iqL=&4Yr8`qw>ZwSZ=cP*N0p?Gzv?1_0Vbq=lH zwOab>XWNR<@81@(=J@E#UA_5NLeP+Lc~bqFm&Hmho607Ib4cSpBd_=7cXH z2}Kvr&YhNNR_k`s$N6?7j|C&Q$Il$Lq{e<#1GVP@Yv&}cdtxK&l*MpN@bS;T-(rse zQ-^AaYeY#(Vo9o1a#1RfVlXl=GSoFN(={{=F*LU_F|jf+*EX=QGB8-yU~Gw^AvZrI zGp!Q0hU<5`TY(z9KsFSYrCTK>7N_c#7G*M|W#*(>>Feuf!^?m*f_JdGQ80Mu`O(73RsNdHTf}rHK`pd3r!&?u+T22b#*@>FVdQ&MBb@0JP$t AX#fBK literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4ce7648198e53ba7b17a43778007ed9a291f72b6 GIT binary patch literal 2318 zcmeAS@N?(olHy`uVBq!ia0vp^ks!>$3?!4TR?G!bEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#N0|QfE zfKP}kP{Ak|4S_)t0@t=~c>{FH&5|I$U|dav*xqJ^I5TfbeS|PT}(A) z1yAmfi|*ci_t%fB8`AVGJnW|2dB3^LaOq{{>PI)5v?PB{{QiQMHUCqK@%3*di`WD=Eymvy@zk6<}zCFKb)xIkgP68@^ z@v~%U1CEFMJk#T5=%p4K+4srMeX?cc+G~|=d&5_7mg*$E+1VS?U)z@8;Qouj@DR|G zj7i?^E({&4vK~MVXMsm#F^~qaJs8|hX4?TXx{0TYV@Sl|w>O{1Uv`jS|FBv|dG@VU z8cj+ZTow{suCJUF7l>_F*s*yE39GE2=72yBv9RS!#zt?j8N#PQicv+^svo7$(VdSC`%Nuz<{> zj6K)(uk~AheS7wO#Vae9FZONoE4sMh+(W_GUAK-qr)*#G;l;aK&+bXMvmZHSc}33l zv4hD+&b?L9TE9Nr`lWVh*FVpb4c=b+|EO0n}P?beg@ zX=~>ReZZ7brf~4^C6R*+hd<_pZF3TD$Zc;nE)qG+U@2iy-oho3utepJv6m=Mp`FkM zO@CP)gQ!<)0=N&)*tqD!j*qKSXDF~`tF3BR%$?M6=kiXi{R&A%iHR;3Mf@d87HZ$I zp7H;pVDNI^@-LF=8$Lxne6{J^tzC7@C!Y$rSy;D5FZ1&i-ZL@FkXzm7xItZ^ zfop$+q3QA zUCZ07S8ob9#K`3yymRQd%9l%==NXghszh~VPIaudUbVd?BX(8!A-yPxsU2qBs&W22PK zjJIRgu7$oM??OFH#hdK?RVeK+FQ=CN&lv7_4G`w)c2gT zR Xdm{Dz_C5{$9fqBH!5%xG|JITC_B31N zUhjXmz0j3zV6^Z2w+TsqA=(Qm+w#cKQ#)}ei%{hrzzQg(&6{_^1Ek?9z9F@IeT_u%fE<+ zUnKLUUsOB&^I*U~9d-ThXIM+?L#6&Re9qqT?s4u{PGCWzTH+c}l9E`GYL#4+3Zxi} z42%qQ4a{^6O+yULtxQa;Oii^7EUXL+{%%$3L(!0%pOTqYiCaU@i&;iM4W1wyip$ci zk`jwkbxVsf8PYOyQmyp$^)vEwQ}q*5ax?SvGn4c4bkp+lO7u%|3&6bi^0I<5zopr06EF{0{{R3 literal 0 HcmV?d00001 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]; }