From 38b1500372dfb6ae15e9577bd0a49764c6a64032 Mon Sep 17 00:00:00 2001
From: WinUser01 <WinUser01@163.com>
Date: Fri, 31 Dec 2021 17:06:02 +0800
Subject: [PATCH] =?UTF-8?q?hyzp=5Fybqx-Commit056=EF=BC=9A=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=8F=E8=B0=83=E6=95=B4=E6=AD=A5=E8=BF=9Bspeed=20=3D=202?=
 =?UTF-8?q?=EF=BC=8C=E5=B7=B2=E7=BB=8F=E5=88=9D=E6=AD=A5=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E7=90=83=E6=9C=BA=E6=94=BE=E5=A4=A7=E7=BC=A9=E5=B0=8F=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/images/wiper.png        | Bin 0 -> 1230 bytes
 assets/images/zoom_in.png      | Bin 0 -> 1496 bytes
 assets/images/zoom_out.png     | Bin 0 -> 1413 bytes
 lib/widget/my_superplayer.dart |  78 +++++++++++++++++++++++++++++++--
 4 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100644 assets/images/wiper.png
 create mode 100644 assets/images/zoom_in.png
 create mode 100644 assets/images/zoom_out.png

diff --git a/assets/images/wiper.png b/assets/images/wiper.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f6519a3abfa37cffd6fb808f1fc5c09b35e3a58
GIT binary patch
literal 1230
zcmV;<1Tp)GP)<h;3K|Lk000e1NJLTq001rk0018d1^@s6n4kYY000D)Nkl<ZSVzrR
zO>7%g5PtLC#&+!VCs9kF4Im0sLa0zsg$i<0r;%ELgan7S3MC;0i32Dn#EHKMm0M4g
zAE`nuazd%dp-4!r_-V4i4YU&Uf{-{s0kuh-Ht7#`65G4)4f9eQVtegfuam$YEP3C|
zH{Z_Ad~e<YTf!?g)Ez>=4glQ8kUdDDt}uj?Tv>+(+mHQOOK7OY+0A#m+4U;f9H1b9
zg|^7pR{_J=|8?}pm>Wj9^`$00MFE<ef&;_1hGKnh|1XKh%q~i9nG4v6xji2BO?=1c
z=k7*eA#T{^gZMy~k~cAcM0r>I$&B?q-~)Qj1=<FmrKS;vUjQdR1gN8?e4onU;R-c+
zbSM^o-fvu>&fg4(!Y_a$agMLi{iiEnjw4fhhhzN}-biIei%*>6UaC2*CgrZ5Y5k4i
zSo}mS$%5A5?oC2sfn50oRGdA+7`{hJ!izAdf$$}+_<4OFLEd02n>5=7(tcwR@y`2%
z<YB)6c|Rg^I|JTF{~JoM01trVpD(;G1*!nYsk+qaiBnG;%2pd6{!x|H)jAg1s|Lj(
zPMN-=6bFujVh79POWQWs<(Y7J^2aTQEw4PN#`m=V8qHoEitUIn2d3Vo`&&yh&CVh6
z9<ETi;gcNCN~tcJZJ$oM+3I!J_1z0ixr}|67h^{oj;~O&bvUeD1cjYc?p4;YOozfa
zeroF{e^uh7RV5^Z+Nf-(tCl<p^%Qm5>kfWthN=@#T&xx|Z!d+qx++pX@x_+IGfo)L
zi@iK?=E6P7f)&*Sp$+CC2JA!fDcHOy`y?)`hbcH$4W6^Dv?<P1YDHwCxc=vctZm=!
zUu)RPp|PCd2<$c@treuSsev5?3CC+E{V#$PkP8`dV%2D7YGBWRoU3vD^Z3c0;B+Ll
z(W{;-jvtUCX?DqV0u;Qnn4}kCQTfa$E|X`X$F9$hwL4CCt*05|Rxd%3<Jr;@f%Aay
zGK~+OCCy7LCmXJEm*$D<CZ*!M*Gtxk_(ue|c>(Asop8E|_%**|y!+|8&;C|$kZAv=
zqgnAli#rImkbb{O)88iAz<&W?y-f0&j$-aHZ(7hBO%ArlM+=DW{%p6HXpU^4tgrM6
zw48Rj#-}6oziNdkIl4Xh!;9fmYIXx44=yJuw^-ajE5nW7N1{hk^Quzp6iqzSXxM=}
z7kf^3BUf%+4`c}9Qlj<fmAp;a!}89N&Ra4ztQQiBM^wM@effbQwM>mCw)H1TyyuUX
z6;Jt^d@d)}{a2a4nQ4_wwDyk|Keg-U2|a{mvpFKayfv?DT1soI+_dOQTtDf~FFPZd
zkXW~TY9rIRKwvE2h)y-;iMV#uQhBw>SR;k8cB!(jv&^|MX;~L&E;sE;P2rh%9z^f3
zj9F_GuWR(O%X;ZZP1r(l&8kaJe*f6OtQViEiRVG}V3ux3uMB`}q+SnIKhH~@(F|Ae
zx)i}1X4}UZFN9s?&?|_Z=S}mEfRHL8g{<ew2-=3CuLi>4ip_nmp&5uqQEAf=&Z0M!
s<tj6q4cgPY9=$)?3%#z#IwvlF1BE2Y{z*mkbN~PV07*qoM6N<$g7a=!9smFU

literal 0
HcmV?d00001

diff --git a/assets/images/zoom_in.png b/assets/images/zoom_in.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c7b58c6795d49a772785bedbdadf2df637e581a
GIT binary patch
literal 1496
zcmV;}1t<E6P)<h;3K|Lk000e1NJLTq001cf001cn1^@s6s9*s0000G_Nkl<ZSVzs6
zYiv|S6vxl(R)dNPf+RpvMGYbX)(2{QwtQ%mKq(YaQG<%H(JvaJ1YZp*i4S}vei4ik
zYJ$Pa?iPxK_^7W)qb4mzG#FD1l16JqR167~cKprl?z(sG+}*oNH+7nu?Y(mz|2cEc
znR7<TaSYui<E39JMadXXjFvz6f4^EJ2aiK+fK?SEOmCG_Wl$ObGZ((=c_xJL_d)Y1
zfZODlB-9f5yBIw-Z6uI7ArmDgD^Ywe0!}Vcp#k_Byf3H*`MF45k326(y&7n<<N@fO
z;u&3vf*hX1XnR8H<rSrXT*L?ksgp7eIdAdQ79lSR=}uhWHeBHMD8!+bWP8tI)jJ`W
zRzT2S%zw{wC`~t(-}8A+E5P?1Kx+Zo69s6%lDb9Cl(_5y<ar?i4l%bu24u7BkxsRm
zP|6wb$N9Sinp^mM7moq%8U|=JK>G>-^?~#hRLF-gnaH)rF+Axd=GUkNa=4ISGp~1G
z(WBA?--Eoy9X#!6iw@+I=LeaR#}W9ngQ1TQYEbp^Srl+K4eoOtmQC{A__=>5c~mWw
zXCi?_&^ZYD7UEGBLmxJ{7V8<`D|zTG_;-xlDY%n=9AS56s5<#EOnBCkMDs?7mRW@T
zyjOFAbhreh70>j|4azravFvryC**1j@ey+;So0guu{<wGPLfFk!hVP<e1uw>NWiY`
z_sCe-Dt_#(dIW{fhAD*SN#>dY#)wNLyVdLB^DGJD!~8sN5%jR}=c>85e#j^ZWQ&}H
zDY_9k(Gt6Y#l4&lqzQ;?EP_=qJr@SBR7<A$9^-e7CHoWfRXahFcFfBD4ERY5^ViFP
zvVhzsQ%F7gEZIldxzk-cr`WQKAl_{;{J^TF=6-VqiQ**Ived_`I7+p&`o1}WiEOfu
zAev(7or&H(wqXp&MSM*7CQw4aEcAhN2T49d=gtL!3B7F)%<~C|NgcaqzWdh=u}M1{
zt?%nt(S2nFnUL49q@8wdNAIQ}$P|Pc1|K4M6-(Y<R**?qhx|qh(4By6c7a?1$hWPD
z%@E&OW{~e7f3anpn=sCnAjnp^iaO?VYoZg7ms%iiU@<;FWxJ}Nx!mIY5;}h%DoG*F
zlz!QPn|;m8EXyaa#3#Q9g4|9i)$cV<xy8l+DPkODlu1pYqm*QBgy|ujzwvJ@NBAH$
z!WdVDl{s-t*k5R&S;p$$EDOk_+>P8fEZMu!cd<)f2IN{MAF{U%rYnXUq}J?MN;;8i
zTqS4!sZ$&1fgB?P(v{GS1Kdol*AfP_l<g*oFGa4MW;AgzJ*;}lE!9j3Rc!(4#W$<)
z&0kzV0qF{+K#*j3)74fN?{>ewon4zBW{g~rre*jzK&Xkf6J?H?FGuoieW5vOgwX`X
z2UyW|A=5fkxsJn(OuK#96gZ2AC_Av|f+$Us)8a$TU7G`-aj7o(M`j~Cw9l~{u`{Td
zy8v40P}aluMx6WILRRy|L()5+*YivY<<lI?19DFo&|piOA~_FAJ1aaTL})wnFVa%I
zr)sdTW9aoPb-dh&4AUjnL|RlHpw1f%BCrMp+Yp}bYQ@~3?ZUdIpZPTnWCGu&@y!&_
zg)RtO*qd4Qa@(Te*DMK{?PWBP$&oBEd_)1D`7f-D!&i6}Qr$3MFqc&3{wLUb2Zj59
zM!WiJC5LIcJncTVA}pW--W3E#clw6J-v+w{WPwHkX=HfES*y%J*&V!^OH{kbw^f<T
zs2$KZlM%92mUq`wL12o^h_JY|<j<9nLHg2)0lZZ%z%tYM?`(jW05f^+AazYIdG9Nn
z|EDkzMF2I~V{%C#BUqpyNfAJ6M+~IrLQ%G!yXFxE83AY~y})H74l)ZgPFN~hng7OK
y-se#&cK<IxX0u1qD;1{_hzAJ4_f;by$oLm*wA0Cq@b|p{0000<MNUMnLSTZQ2EU2`

literal 0
HcmV?d00001

diff --git a/assets/images/zoom_out.png b/assets/images/zoom_out.png
new file mode 100644
index 0000000000000000000000000000000000000000..0abbc428c364b7761a8ddeba4c86055b10898586
GIT binary patch
literal 1413
zcmV;01$z34P)<h;3K|Lk000e1NJLTq001Ze001cn1^@s6N1|)U000F{Nkl<ZSVzs6
zdx%t37{I?Xlbe}knOPQ*Zc%2GwY}&isKt_0+o(v9MX^0>EupjmqmqJ1EeH(lxg=qk
zIy07Ju37z|y&trdJ!FHDDA=Lw-KM+Ve&5Wv&OP_sJ9i$n9XQO~bH4MP-~GPteD|DV
zq>AFbD91~moW;;%#FOFtHi(hGs5@l0d`aKiW`=C9LUmw>iL1n0BPU8iT9KbYJ+kaL
zPr8tQ9=Udtl5fh&hX|AfELv+J<1eL_m3Pe3OWO)b%6!uz-&YD6I-$3K_a86wapB#0
z7uH^WL&aP(Ri3Owl@rj*%0Vbu30!j}%3{hcmtMJn7~L61J^<*gl3_AP-T>~@Pz9d+
zfwMQ${}FP!82-fGLs=lBX+M+av#I+=0BiuVB@Uzy5V!`}M_xtogb?N109wo{U5WDF
z!vN4T96i_2KaV;pL~ezo<SJv(7*YIy8F>`h*&%_xfVW;8=dJgQ2XrXjcmRZ(Ll)TW
z#N<P<07)awxM_n!_*dFeD0)3k%(!H{j9gCpa;m-9b`loj&2(~SNXc7}H%;P_&-gpm
zlGE6lWG<6;tA*>gW*UbYS<Q3Or_0DD^5lilfLXZ$H$3MMYQ=KxwZip7X63$O+VZPR
z$OMd_i!M+K7EH^Vyxlog??&M2nr6JmiO56cW9AuWS@8v|s9_KU1g;UdE_(ba$H?gn
z`mkQsE3x7<thmO~+avqS2-8gZvWg*qXVJFIYJUgoX)ddKDaO0z&Lb=<PQf6rxB#D}
zai%4FC&G*BPFGZj*Oub1o2)tSXU=<EfFIC!ny(`v=MuDUmA3Ku(*#~k>1N_9EnPEl
zvl^zftj24)Q}T1;;_qnjZ=ZT)Bndg^Q<{m+_@U%RwgY&yPgh#bz=H2tW3~Wzz6<bY
z8i)Bha?)UKlwJQCU`CEZ_g5CorvRSp0{oFi-4*XGy>fv4t;N!j-^_|ExK>W$3-XCI
zrW3$ZT!3HG*ywk>jInpYbp_1izZ@GanAZTjzy+v+{!fkJ+nbWLR@?*zhgz+)!$=Pk
zZ?VGVHl820#y^GJ^)5ga)B$^oC(Fz<X^RC=g%I9Y&#;TEIcGEHQWxOGG_JEcaxz$s
zGE?O5D&~(ILJl0o3jP+ML6+b+EcitbaGeZcz5YPQfmR&0;b!{_Q!_7s3jw^tQsi79
zDpS}jWaJ5cZ2#xjppIoV|5P(oQ33O4dg-JNw%j`h_bzeGQvfU+#6Rb6!V-G9cy{Qk
z71AqsO1D%^maZMlF$P2Y5(-$fq8<mY3kZ2wcdE=PcXo(+f&5t~$qvTIB@X@bu%5l5
z`^EaVSeXA1TDMXUb4<31w``3%D1`w6cR0Is-3(83%6M`sfRBWY_aB<FGMVp12g3es
zd116B^to)@Uy5VR;<oB)#ym(J8DU`$%g$jz>VYj#g6HBa+aNEPk4i>%(*HC{J4g%L
zN;P^qRhrM35lvm!@_THQ>r47VA>B6%X}JaEYIb|k*z@UihHgH4s6(iusr$u*vc;T`
z;de6`X+gs?RJ{iIuSx(i^0tbks{6Pl&ec~LvTogUgPNiqTxO^bGS+n(pc8?-3&oSD
zvBnf3cID5)3AvZ6w=VQF@w_P(q(~bv{#YfG>G8CY$)>YNCNqg9+z}3I=pEqux`>cV
zGf8);Oa+jAj6bg;z(7>%B~g+XP2jfOT>th-cbr^V0c3kkfR%-zUpf|~k@W)xsJLYz
zJy|rMfMp<a#9-5a1Lh$!asofPo7Rg{W!g+kw{b1E^?w1lCpx_jZfKOS<c{Vazy^%R
TpvfVC00000NkvXXu0mjft68<p

literal 0
HcmV?d00001

diff --git a/lib/widget/my_superplayer.dart b/lib/widget/my_superplayer.dart
index 9be2dd8..04e2db3 100644
--- a/lib/widget/my_superplayer.dart
+++ b/lib/widget/my_superplayer.dart
@@ -146,6 +146,8 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
     int btnCount = 4; //每行按钮个数
     int btnCount3 = listData.length; //每行按钮个数
     var mediaSize = MediaQuery.of(context).size;
+    double btn_left = 70; //第一按钮行高度
+    double btn_gap = 70; //第一按钮行高度
     //远程控制球机方向按钮外半径和内半径
     double _outerRadius = 270;
     double _innerRadius = _outerRadius / 2;
@@ -245,7 +247,7 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
                   ? SizedBox.shrink()
                   : Row(
                       children: [
-                        SizedBox(width: ScreenUtil().setWidth(347)),
+                        SizedBox(width: ScreenUtil().setWidth(btn_left)),
                         getRoundButton(
                           //(bPlaying) ? '暂停' : '播放',
                           text: playerRegionProvide.playerText,
@@ -253,7 +255,7 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
                           diameter: 130,
                           onPress: playOrPause,
                         ),
-                        SizedBox(width: ScreenUtil().setWidth(104)),
+                        SizedBox(width: ScreenUtil().setWidth(btn_gap)),
                         getRoundButton(
                           text: '刷新',
                           icon: Icons.autorenew,
@@ -262,6 +264,35 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
                             restartPlay(urlnew);
                           },
                         ),
+                        SizedBox(width: ScreenUtil().setWidth(btn_gap)),
+                        getRoundButton_image(
+                          text: '雨刷',
+                          image_path: 'assets/images/wiper.png',
+                          diameter: 130,
+                          onPress: () {},
+                        ),
+                        SizedBox(width: ScreenUtil().setWidth(btn_gap)),
+                        getRoundButton_image(
+                          text: '放大',
+                          image_path: 'assets/images/zoom_in.png',
+                          imageSize: 72,
+                          diameter: 130,
+                          onPress: () {
+                            // 云台控制代码：1：停止动作、3：启动雨刷、11：焦距变大、12：焦距变小
+                            setSphericalCameraDio(id: widget.id, dwip: widget.dwip, cmdCode: 11);
+                          },
+                        ),
+                        SizedBox(width: ScreenUtil().setWidth(btn_gap)),
+                        getRoundButton_image(
+                          text: '缩小',
+                          image_path: 'assets/images/zoom_out.png',
+                          imageSize: 72,
+                          diameter: 130,
+                          onPress: () {
+                            // 云台控制代码：1：停止动作、3：启动雨刷、11：焦距变大、12：焦距变小
+                            setSphericalCameraDio(id: widget.id, dwip: widget.dwip, cmdCode: 12);
+                          },
+                        ),
                       ],
                     ),
               bFullScreen ? SizedBox.shrink() : SizedBox(height: ScreenUtil().setHeight(79)),
@@ -438,7 +469,7 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
     _addLog('onStartFloatWindowPlay', {});
   }
 
-  //生成圆形按钮部件
+  //生成圆形按钮部件，基于图标
   Widget getRoundButton(
       {double diameter = 144,
       double marginVer = 10,
@@ -474,6 +505,47 @@ class _SuperPlayerPageState extends State<SuperPlayerPage> with SuperPlayerListe
     );
   }
 
+  //生成圆形按钮部件，基于图片
+  Widget getRoundButton_image(
+      {double diameter = 144,
+      double marginVer = 10,
+      String text,
+      String image_path,
+      double fontSize = 16,
+      double imageSize = 90,
+      Color color = const Color.fromRGBO(52, 157, 237, 1),
+      var onPress}) {
+    return InkWell(
+      onTap: onPress,
+      child: Column(
+        children: [
+          Container(
+            width: ScreenUtil().setWidth(diameter),
+            height: ScreenUtil().setHeight(diameter),
+            alignment: Alignment.center,
+            child: Image.asset(image_path,
+                fit: BoxFit.fitWidth,
+                width: ScreenUtil().setWidth(imageSize),
+                //height: ScreenUtil().setWidth(iconSize),
+                color: Color.fromRGBO(52, 157, 237, 1)),
+            // child: Icon(
+            //   icon,
+            //   size: ScreenUtil().setWidth(iconSize),
+            //   color: Color.fromRGBO(52, 157, 237, 1),
+            // ),
+            decoration: BoxDecoration(
+              color: Colors.white,
+              borderRadius: BorderRadius.all(Radius.circular(200)),
+              border: Border.all(width: 0, style: BorderStyle.none),
+            ),
+          ),
+          SizedBox(height: ScreenUtil().setHeight(marginVer)),
+          Text(text, style: TextStyle(fontSize: fontSize, color: Color.fromRGBO(139, 139, 139, 1))),
+        ],
+      ),
+    );
+  }
+
   bool bPlaying = true;
 
   void playOrPause() {