From 0ab7d833a0677bc5a578f7be0391aa97ccb42207 Mon Sep 17 00:00:00 2001 From: kai Date: Tue, 15 Jun 2021 21:57:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E5=83=8F=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 --- .../images/revert.imageset/revert.png | Bin 1022 -> 994 bytes .../images/revert.imageset/revert@2x.png | Bin 1532 -> 1727 bytes .../images/revert.imageset/revert@3x.png | Bin 2318 -> 3338 bytes .../IfishP2PMonitorController.m | 43 +++++++++++++++--- 4 files changed, 37 insertions(+), 6 deletions(-) diff --git a/Ifish/Assets.xcassets/images/revert.imageset/revert.png b/Ifish/Assets.xcassets/images/revert.imageset/revert.png index 793d322276d98495d42d343285e2eb90f29001c6..7bf906cdcdba50088114504d276d33cb431d034d 100644 GIT binary patch delta 805 zcmV+=1KRxl2jT~i7zq#t00026x(MTuAxnP%24YJ`L;wH)0002_L%V+f000SaNLh0L z002k;002k;M#*bF0007kNkl=X!hInP+}H&x6JLp3SFopL2ij z{oZrWy>myYUp5gDk%I$aVd1+wu(h>ZKXNx=M+dyIF(pcr`2C6$DQav)dnN;>)A)XI zK?WIQTwX%p@G#ICyj9C&{2F7xyAHl+~=fVa1pxWC_V zrYz$c#@BV{%GTCwGNd!>_q!Er6&?&$ChX$_JUat-cEC^w{8Ms1H0T=M+e3d1C6itW zM~$XZaAGmkYBu}jE2We=IRT?l%>VM@+5G?QUo(_+eZ4MiqvDR{b*Qf;aCaAccmQ8t z!O>Cgl`Bya3gHZh_^c};Lcr7%TBoORn6%&52NIQ@z~@sQ8FVc!!qbnsf{d=NI=*6A zSor$ddP_MF%EH36wHRk>3)Fv)uI_G|4zsiFejpwn!Ho@YWJLdhmKNI91}-h3-`}ss z{rxgqqF;l@$LBGL?eBL<0WPQ|W%04B|UGE8MDq0d&mgyJq6W!cc{}H{tRVVcR9$a6?I89BC1s6A8!18jzoGdK7 zuwad=s{;oIb>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 diff --git a/Ifish/Assets.xcassets/images/revert.imageset/revert@2x.png b/Ifish/Assets.xcassets/images/revert.imageset/revert@2x.png index 7ab0dff81e4c0936bf59a0e112a07fd6613e0479..fbbaefbfd1b3a95b0c06dbdaf98434eaf8ea417c 100644 GIT binary patch delta 1538 zcmV+d2L1W`3%?DJ7zq#t00007Dfe`dAxjVd24YJ`L;wH)0002_L%V;I4g(i|1zt%+ zK~#9!?ORJ|6HyeMH?6-?wHC1=8nqUy75r3`f?^Pb)|H=4)s;{vevwiUK?GY|xbcH= zQMwj&A=HfsE}K@X^|y$v-=aVs5jkfQ)INr#_CNq;x=A~`U=5Qx7_uYHuC3D}M z7fl=IAR;0vE+$Em| zX{6)ks!6o45LRU+*z46uBaKQ+HK7SjEMAP`1qI-|JfoMvLGZV4;7|zs;srPm0Q>#m zjt(J&5aP!Vqo0EZO#>F1&_r=DjD7pS=g+&Xn@xc?Z35rC2_76Yomq~5qQ4*9(gLoj z0Y{_u{CxgwoG=*x1XNZAZf|#2SQj8kl017>wa$NquCE6V45-#6y@*C3d`XGR0_Ws_ zFJ4qFff`)9=Ca^TO{!B?4oQ;a`t@lRx~@)jo*4s4lH|jOFm&Bvp;xa4yIp0B7VO?_ zrlT+wT9PE0n~Qq%?p+*zEiboroBH~|en0ALzaM^jdvW~JCotF31qC>7#tfV{b0&_L zm4R2S06A>Fa+%Egx%VT^8x|nDW&@X6A_Ux zT?l27MHX3Pk;QmH{Ik)y{%sZpK}B-3s>kl6M`=(9)t>NXz*X5z+DE;JUi_&uwo6f^ZWj!m6mi z0%G%K*vxCz{B{4&ztDvF>yAW-MwKaOOBc?+p#cjmeqmz80TB`Dy78-j;|3gm|L$&+ z$mt%5(?YL*U5hxseg!{%Y~K+P5nZ|BuCVdw?X}&=cS~p@BHF&)C^X~$pAr*Cg@tN` zW}G;oTG*H_hG!G+!{PQdgEt7xnw7{;f+~f(Xm8)D%MdS&$(Ju-oI3}uuI3w(>Pu@}KV=G- zUn%;0;BeSlaFGbcFDfz{Pb3c{Cx`pOxWl|XAydJ9>*voAH*ZglL=Zn$JG>3r;{nf} z4Ni5J!I2}Vx6hn0JJWn$3K0>lTL+69^w~Bpzb&8pR zU=X~2YnN4_8J1@%W;%cM_~9{an(EZu1@9E|dLeXow_OjGdnp*;{d@d2o;syEb$7uN zY{Q0Bg-#i~w8xBp`c!rCl3rZBihMKRn~XpzD^*M47!3PMGPpa50Iy$9ElaNR4;?b@ z^!oWTz3PTS;HD<-g}9~Hh|4$9`-829~@@C4{ zuZI_!{};Jnf$Dh23?OKEIhg+l8wh~S|B^A*@dx=O#a#+1;a>m%03~!qSaf7zbY(h| zMFkQPGBG+eGCDOgD=;`ZFffjBLN$|V1s@VJF*-FeIyEyZFgQ9eF#jz2iIbWIJ11dj oWHNX#Zee+HH!pK&bzyjEZZ30nXAq7eZ~y=R07*qoM6N<$f^*T_+yDRo 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 diff --git a/Ifish/Assets.xcassets/images/revert.imageset/revert@3x.png b/Ifish/Assets.xcassets/images/revert.imageset/revert@3x.png index 4ce7648198e53ba7b17a43778007ed9a291f72b6..f48b8996ce6f370bb5e46af8244747436c617057 100644 GIT binary patch delta 3180 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 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 diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m index e469509..2c53c02 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m @@ -246,6 +246,18 @@ Strong UIImage *screenShotImage;//截图 }else{ [self.yProgressView stop]; } + NSString* key = [NSString stringWithFormat:@"camera_%@_flip",self.contact.cameraId]; + NSString* flip =[[DataCenter defaultDtacenter].cache stringForKey:key]; + if ([flip isEqualToString:@"1"]) + { + [UIView animateWithDuration:0.1f animations:^{ + self.player.viewController.view.transform = CGAffineTransformMakeRotation(M_PI); + + } completion:^(BOOL finished) { + + }]; + + } } #pragma mark --LoadBaseUI -(UIView *)canvasView{ @@ -707,12 +719,31 @@ Strong UIImage *screenShotImage;//截图 } else if (tag == 4){ //翻转 - [UIView animateWithDuration:2.0f animations:^{ - weakSelf.player.viewController.view.transform = CGAffineTransformMakeRotation(M_PI); - - } completion:^(BOOL finished) { - - }]; + NSString* key = [NSString stringWithFormat:@"camera_%@_flip",weakSelf.contact.cameraId]; + NSString* flip =[[DataCenter defaultDtacenter].cache stringForKey:key]; + if ([flip isEqualToString:@"0"]||!flip.length) + { + [UIView animateWithDuration:0.25f animations:^{ + weakSelf.player.viewController.view.transform = CGAffineTransformMakeRotation(M_PI); + + } completion:^(BOOL finished) { + + }]; + [[DataCenter defaultDtacenter].cache setSynString:@"1" forKey:key]; + + } + else + { + [UIView animateWithDuration:0.25 animations:^{ + weakSelf.player.viewController.view.transform = CGAffineTransformIdentity; + + } completion:^(BOOL finished) { + + }]; + [[DataCenter defaultDtacenter].cache setSynString:@"0" forKey:key]; + } + + } [weakSelf popAppear];//隐藏弹出框