From f975e362757972bc39fc658b15df1f9d73740637 Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Mon, 8 Jun 2020 11:31:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E7=BB=BC=E5=90=88=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BB=A5=E5=8F=8A=E7=88=B1=E8=B6=A3=E5=90=AC?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9B=E8=83=BD=E5=8A=9B=EF=BC=8C=E6=9C=80=E7=BB=88?=
 =?UTF-8?q?=E5=92=8C=E4=BA=A7=E5=93=81=E7=A1=AE=E8=AE=A4=EF=BC=8C=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E7=8A=B6=E6=80=81=E9=9F=B3=E9=A2=91=E6=A1=86=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E7=94=A8=E6=88=B7=E4=B8=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=92=AD=E6=94=BE=E4=B8=80=E6=AC=A1=E5=90=8E=EF=BC=8C=E9=9F=B3?=
 =?UTF-8?q?=E9=A2=91=E6=B5=AE=E6=A1=86=E6=98=BE=E7=A4=BA=EF=BC=8C=E7=9B=B4?=
 =?UTF-8?q?=E5=88=B0acc-off=E6=89=8D=E6=B6=88=E5=A4=B1=EF=BC=8C=E4=B8=8B?=
 =?UTF-8?q?=E6=AC=A1acc-on=E5=90=8E=E4=B8=8D=E6=98=BE=E7=A4=BA=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/module/apps/model/AppEnum.java   |   2 +-
 .../drawable/module_apps_ic_we_car_flow.png   | Bin 0 -> 4161 bytes
 .../com/mogo/module/media/MediaWindow2.java   |  34 +++++++++---------
 .../module/media/model/MediaInfoData.java     |   2 ++
 .../media/presenter/WeCarFlowPresenter.java   |   1 -
 5 files changed, 21 insertions(+), 18 deletions(-)
 create mode 100644 modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_we_car_flow.png

diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java
index 8c545cc2dc..7eadd38ab6 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java
@@ -15,7 +15,7 @@ import com.mogo.module.apps.R;
  */
 public enum AppEnum {
     // 爱趣听
-    WeCarFlow("爱趣听","com.tencent.wecarflow", R.drawable.module_apps_ic_qq_music ),
+    WeCarFlow("爱趣听","com.tencent.wecarflow", R.drawable.module_apps_ic_we_car_flow ),
     //"QQ音乐",
     QQMusic( "QQ音乐", "com.pvetec.musics", R.drawable.module_apps_ic_qq_music ),
 
diff --git a/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_we_car_flow.png b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_we_car_flow.png
new file mode 100644
index 0000000000000000000000000000000000000000..95734bb594db3a56842405619901a85955004b84
GIT binary patch
literal 4161
zcmV-H5Weq;P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00001b5ch_0Itp)
z=>Px^`$<GWRCodHU2AL{)fGPb@~&T-*p7|ugv23<;{;kBMGb08QAJS&q2ejpsvtpC
zr1Ar)Ra^K`sXr<zwIHfe5UNTmnikQD@RTSj4Xr@5G)+Y)h(J<1#BpNhVXzZ>z4m%{
zXZn42cI?Hq_uiS^P3-j^I6HUl&YXMicOLiLJF|{Rm8u9-5vU?iMWBj66@e-ORRpRC
zR1sKi2n5dNfNk5ZNBf;~cs0&j!FAvmxHiWNmGQMq=6I?=If?Iv!GqwTd=3Nx6F5IB
zRCWab<Ti}#GVrItYrzEA1wD@PVxTc}!c__tGyvWM-VNoP#IbBt76kxwg8WVJt>BGi
z>;0J#+=phK0RI}wpmG*30r<_}XTce8r4h&U9C&jnHBb@{K&Ke5e*pd-xTcgHT!gZw
z(WeK&_rW7LuM|Z^D*)hcKo4F7_Y~EWrFZiIba^|JaIl!J2aCBG;C~kP?*=b7@Ch43
z(e4}uJoiPuJpc_~juv-;qrO_MoSRY@%2n`$*ZmC1mjZHO=U-^B#ZRLZc+W=|(>6ch
z$g=_fJ{M1Kf=ikWRDe=ACtM08B)p8p&m8c>D){q4OoJpgp2(92!1}j9`rF`$r&gBF
z#c2%nB6z`jrbG7X0S`cM75s(KB{sy!n2bFD*53uG%z3>k&A2laa-ofJoCh!HHyMu?
zFuAwm<$9C$EAbi{^_`{z^Wp&m5PGhu;AMW@5qJQ1ezjzz0E8a`PX$yoW%pW={%u+U
zv4BMHFM3OB9h9KOENqA<_wy@~vWIO+J(rR6(;2b;kri9A65CcZ_{55sl}rJAm{K`}
zrBdRBj7;v#$n>AHA}LEk7+qKb_%A4-Yj{>P5woXsQcOLdODAZld_N9rKYrJgSSJX2
z06BF)!m*%8z!r;Hd<Mnyab7%inTRk|K!=I2rEty2qiIQ;$Vx*jBthV8BWcX?!w!g*
zv6WInJta|q5oV?e;4|Ecpww|2K_(zsrXR$e2UWIF3k7sSF&j&w03*yy6=0;z#jc_B
zpe>WV7GQ?8=P5w-8|PF;bQ9)*(rmD|o8X~UHB!(f2;wUti;_<6%E<1oCgt64Pigx%
zx!;m0Ot=z;2jFUY0TsbAY7ze70b8_?XxqtM5CeA2x{FObV9{Cs$Xi)C@=QjCUP#O6
zyIDC6=q}pM*M|yI@;ysZ069`aTc-=;5vr(&aOo64;lyr)g@wpO0Y<TGp$1A-Ki+Ri
zKL8(iJ|n}gW)zTg%i6l2)F(r->Wli+abjQAv3wf23jREx5J2=t2E@=5**Zrt#SMT8
z*jGq|i2}}=2c#3WeDGpM`ktPa!M|i=eB8n-7XfLAf&qLG*fDiv_TIQvuYkn+x%f};
zK{irPr3jRn0fiyArbjPF-E8)uHC_`1XoZ;d#r&#6uVm!FvuQc>Qd&k1X92HBBjR?v
z8H*&sZDGBd1JRm7NU4PaHW!ZFS-gCh=wqaJVn5=ugFUSubyQ7sLr}tNO6~!w&4oTp
z6mUj7AaTN$-M>sp@AGLH`cH=IA!!8I4NU+Y*wWe^&;cAl%Ng%9D&reMQg?1)1tgLE
zObl5Pfg-5}C-o#OjwZPVi*y&3!K*!z7CRFKw0UgQ*X1wWo0R8wB=PcSSmG<OIt5TO
zpy$ALK~s>?P*F(X(69-ay#~AS_p>sE8^SdKrCb$g@{FAduem@Y#QVs!*qJCmpI&(H
z*#F%zh-{_}0j91sII}wCq^RN#uBOE+Qo!>B1>ltisPV0O;Kq;vP2<|E8{%DgkYvLp
z=oK-8c|`TW{6mY~qENv2NlQLDf(aJZiSQ0$m{A6<K2((gK3B&wuR+|H#IbRsiz@5q
zr?LIq>C9Vz<;k<)MpR*}M+u%^fWO+3D4^_%uoD1hWEhsbf?EUtHqSaaZq(od;N<Yh
zOxTjd<jaY(qctoYpEFRv0ZZM^T%Y1yrLrvx^GJPrP-?sNa@Zdaq{VJgc)&5NP!os)
z@kmJJ>9esO=n!{Iy6I_KPM@|Bzinx*4NA}U8tJ|vBAaiFNVKW2<xULPGIj{|4>PA9
zFz;6fB8ehHQ!_T;f_&qtw6rulU=S0eyEQ;y6cHn06$(fS>wz?^e*I-(*?L_>wp<^P
zRUY#7G00COEUB+|G9aSQOp0x>Ic7ky((HgbeV_eY8Xhooz{&Ng1X?74Con8ejw8><
z=Gg5|HA>GlCJxIRKTfBx0OJ-!EtJXqAIeuPFr7t-?be@P^6<k(v>u>OAIiKDmrCNd
zK?mLZoDT$@g_1g=Jf5_q^OCS{@QK0*Jb-B?!JjKXgB38UrEU>>fYyyTNWXOAU{;0)
zkO3h)&<|*luJscb{`#&Nd44f8iaCa|+%0G&ixqGM3k^gYg3@4+%KGSo7CV!XY2C<2
z$7XIh3hNx50zh~U&J2i|4Rdl@DvVQ2x~qy<p-$uHcO$)72_oEZ0(Q5bT~C;X61W8s
z>!e0XPFn0tf~r=F#dP~9;y+iYHbSu4Y5)$(1Mp#CQNRb~twp4VqeyYb@DwZtD4dxF
z@|E>Fy=L3><q1D*K#QG;0*b*`d+z`M;szV7ewKhfK*}OLiPi<A4SPL)Y2uhAV@PqM
z(U8*yEZ$vVb26qUG?Y&P+HRXDfMK{%E6L9V0N_YpmJg`ZBpJjpggO!rlSn-~Vg1cr
zCXrIzrao+-I`CRXMzQ<Z_e@%%Tw$xNXEcyYKb;nwIVWD4w;*OaFk8|-rZZ6hg_K1B
zCy!b(bSNt|4YM9Ve4H30GJ%-X1n?tTN1h$=?nhFx2Rwq%Mz5-aE5%nK{?pWRf*l>B
z4y);K1mAmDQ_QwxRHE?~BvS<x6yo>GqyNpyN7#aBX#*H}z^fPyq0HUeHW`K=p!)k;
zCgh(_PsvK`?8H}KZy&ePchb-Vy^Hu0e0L5=V-KilJ+3V>%Yw*-s3abs)#5^}>+1Uv
z{}X_u8R#ej%>#+|a)sJ%m;wFq_N4p`;CD5J)SkbM3EW9OAtVPp=M^eIeIO)J!S#3r
zCFH@wc)JJEVs}<OpdVp^dpkB1;Ov4r)=8V^1kA^e=NRmC?t3vUFaK^*I^!X+F(Uk=
zU9jkdFlWMbJ&MzSA}Ru9W<V=S`w%|Yz|3KBd%z(mAc~-`UI)R^wN94O)7T!s)3A1f
z5cJB=r&Op3Fx5o3ad9T_u1rG0b58QCqXIZbtlVN4;wZp7X%%3SUTB4Q?-#-g;_s0U
zvg&y*ftXo<0VL+@$s|J4x}dbKE!@QsOyr05X7H+EP%;q2P{zfU+In#1;@oKi-{;Dl
zl$riEm1hO)LZS^pg-7Rz(F$=}^K#txW<~}9UQL4o3W0N84#$2FKuTa4+;$$~vnEKM
zM5=ju6q!BN3p0B?kVPdBbjqcNx!<{UQ<K=7YlZ@fSmZ&pj<m+B8J?1_6{72f`+YCo
z%X#6+Dd~MDE64f~ez5-@bf1C&Fop$(Z0ylv0ybEHakcDNJ&zEA|7T(lWl~`7!x4`F
zhx#cfxOII94`O&j*+^@=CJN9BG3ow~?n%gwUrfm<yc!q>N-G<K(hLh^C?GJ3UGQ)u
zsH->Y<8uqbR1{CrQZSQ1?tzK}^sHR=Pt_@`oo|z<X)?^Pc)w55VrQa&qW@ylH*Oh|
z9XltbyE!DA+OfNXI1q%nPXlE_>}Dy-0|-91Ah0}MZ7>0!125^oUjF_!($Ws4T8up|
z(5_&f=d_{@XrFIWth=)8zqr+6XEFyI^QnDx+x_<?<?)?K*}5hyb&Ytms6vJllii(3
zH!kx?PNt9^VsW;{@HO!(zZJ#%p?F*gg*vg`2}d7``&2C0#)wBoY&oYbB<J5!b_Hm$
zGf}{hUj-aSoPXe_6VkZ?c8>qkFu#w3PDKzbat=IzG>Hso)wy`zv(uz|B3IlNmCLV+
zO7Ad!=Y{(%t}7_dm6<EE4+%V1K8<g$eY94hFo-f!Nfe+Jvd|!QK9!OW@hq0F6uN2Q
z3@8{o%L*v00cOgm8-u1gut)EOzWYprT(T`H`;Vt(?39&LtScXx5E?pm9IwA%4!ZS$
zdilgnCHWzqu8UgZHJJl^D`4;28H8hm9az4ClLnWI#q7BX(KzRNb+#N(8IWoCaS^D6
zHUH#|xa|0TQeOK_N{-?;U|i5K*Js<cIBvW!EI0hPRxa3H_R!;YON*U}0<>CmTbq0Q
za1<b5thDkOnxlmL-A`bIRMdG!yUrj3nvt0+@U@fMAFPuve<vpI>`KdVthBSpLmFEG
zvSC|TF8I<J1K#ag@e05@IimoDYXQ$&RxvD&oIITtPIR4qxycE$9#(PRMrA-Kb0Ur5
zZRfQcO>D!FH}|t;O;EmYM|5uWnLbYeyMjN?V24Zt?QuW7@8&8Kd-}{g)I`e(7hum!
zkPzyY-N|_zuc5SH^4(D0JsLm5@p_Ne`YF&<0lvb}jn}~n@mtUYl5Q91{Otx8bWXsW
zr11b)1`}Di^z#v^FMo!@7RyN`Re+JOxuf~awuoH+wWy2^VmAih&L|<z3tS~IMLhYT
zEp_3b+;tEC4C#_5Bg{-a;ILmf9($-!)^$f@s1HB7U~6DU5$+lQ3s)%T#IPkt#<TLX
zUp306@;xH-I}AVf^_$#eI@9ej5jNj7t6GBc_g9<brmviqJ+C7cVUZL^T@24+`G90%
z3@_$RV66}h%Hxl%kgwn2d9I(Y*~L)zZ<9_S80ZOE&^lbzufMYJ6%Rj}ls`N>Ee8(Z
z4`twuhZ=apnvRfMad|}UzPnC(mj1+>55Rh4L0Zg=6hNs^!ciPnvs^6o58!P$?BUlS
zEnnY-U&SC@tuPt__(oWnh9Khe1o+-k0M)fNBwcGuA!*UdAXY|XY<lp34UpIiHonKG
z2bFgb*OuMzfIgF<nPx%!mC8W~++`wknP0QZ6nx_3$(rE>pTs?T!N}UHG!Ft?Q+^5x
z;2*a&B4ZDrGzfkNhlh<MFVBk}@d7>}^5g-$0bUTt;VtlaJg?FW0w17sF%-am5XhK3
zc>ty68rY8FDdScu|3YGMtyk~~i)RJ!CN#7khnvA^o-cDE1~&tf_x<4DO95;M4gM8}
ztHI0J6FBy(b6BA0ojlJ0bDO}N(1W@^ftTByz?jdl<ID109DRF$D*zo}IJy}85SVFL
zr4z@<v2wyK3jC4-#dQMsWv~UVG~$>zwhK!MT+tzDzRsYN+_tzAd>i<T|HZBO`cy<6
zp9XSo=P_8k(e{Fuw#uS_{0=}FT{yoC%)h0~ZS4*)mC_E5f)@kvO+`NUCfIzE)eq)=
zKL0UKmdi$ES3sejLpl7rnyx~4bjz(M^GD8PKB1X=%&)`O__2%gqk10m%aeKMEDwWS
zkO?%ITgTeB7jRvbst8mOs3K5Bpo%~hfhq!31gZ#B5vU?i5(NGST2?@*%dRph00000
LNkvXXu0mjfiw&y&

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow2.java
index 359302f586..2c89aead5d 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow2.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow2.java
@@ -33,7 +33,7 @@ public class MediaWindow2 implements IMusicView {
     private Context mContext;
     private WeCarFlowPresenter mPresenter;
 
-    private MediaInfoData mMediaInfoData = null;
+    private MediaInfoData mMediaInfoData = new MediaInfoData();
 
     private View mWindowView;
     private AnimCircleImageView mCircleImg;
@@ -97,11 +97,11 @@ public class MediaWindow2 implements IMusicView {
                     if (mMediaInfoData != null) {
                         if (mMediaInfoData.getPlayState() == MusicConstant.PLAY_STATE_PAUSE_OR_STOP) {
                             mPresenter.play(mMediaInfoData);
-                        }else{
+                        } else {
                             // 没有做详细判断，不是暂停就是播放
                             mPresenter.pause(mMediaInfoData);
                         }
-                    }else{
+                    } else {
                         openAqtApp();
                     }
                 }
@@ -127,7 +127,9 @@ public class MediaWindow2 implements IMusicView {
             return;
         }
         if (mMediaInfoData != null) {
-            if (mMediaInfoData.getType() == 1 || mMediaInfoData.getType() == 2 || mMediaInfoData.getType() == 3) {
+            if (mMediaInfoData.getType() == MusicConstant.PLAY_STATE_ERROR||isFirstPlay) {
+                mWindowView.setVisibility(View.GONE);
+            } else {
                 mWindowView.setVisibility(View.VISIBLE);
             }
         } else {
@@ -164,7 +166,9 @@ public class MediaWindow2 implements IMusicView {
 
     @Override
     public void onMusicPlaying() {
-        Logger.d(TAG, "onMusicPlaying");
+        Logger.d(TAG, "onMusicPlaying===" + mMediaInfoData);
+        isFirstPlay = false;
+        updateWindowUI(false);
         if (mWindowPlayPause != null) {
             mWindowPlayPause.setImageResource(R.drawable.module_media_window_pop_play);
         }
@@ -176,7 +180,7 @@ public class MediaWindow2 implements IMusicView {
 
     @Override
     public void onMusicPause() {
-        Logger.d(TAG, "onMusicPause: ");
+        Logger.d(TAG, "onMusicPause: ===" + mMediaInfoData);
         if (mWindowPlayPause != null) {
             mWindowPlayPause.setImageResource(R.drawable.module_media_window_pop_pause);
         }
@@ -188,7 +192,7 @@ public class MediaWindow2 implements IMusicView {
 
     @Override
     public void onMusicStopped() {
-        Logger.d(TAG, "onMusicStopped");
+        Logger.d(TAG, "onMusicStopped===" + mMediaInfoData);
         if (mWindowPlayPause != null) {
             mWindowPlayPause.setImageResource(R.drawable.module_media_window_pop_pause);
         }
@@ -200,18 +204,16 @@ public class MediaWindow2 implements IMusicView {
 
     @Override
     public void onMediaInfoChanged(MediaInfoData mediaInfoData) {
-        if(!isFirstPlay) {
-            mMediaInfoData = mediaInfoData;
-            addWindowView();
-            updateWindowUI();
-        }
-        isFirstPlay = false;
+        Logger.d(TAG, "onMediaInfoChanged: " + mediaInfoData);
+        mMediaInfoData = mediaInfoData;
+        addWindowView();
+        updateWindowUI();
     }
 
     @Override
     public void onMusicProgress(long current, long total) {
 //        Logger.d(TAG, "onMusicProgress==current: " + current + "  total: " + total);
-        if(mMediaInfoData!=null) {
+        if (mMediaInfoData != null) {
             mMediaInfoData.setCurTime((int) current);
             mMediaInfoData.setMaxTime((int) total);
         }
@@ -230,9 +232,9 @@ public class MediaWindow2 implements IMusicView {
         }
     }
 
-    private void openAqtApp(){
+    private void openAqtApp() {
         try {
-            LaunchUtils.launchByPkg(mContext,"com.tencent.wecarflow");
+            LaunchUtils.launchByPkg(mContext, "com.tencent.wecarflow");
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/MediaInfoData.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/MediaInfoData.java
index 826e47ae51..a0ddf0f210 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/MediaInfoData.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/MediaInfoData.java
@@ -1,5 +1,7 @@
 package com.mogo.module.media.model;
 
+import com.mogo.module.media.constants.MusicConstant;
+
 import java.io.Serializable;
 
 public class MediaInfoData implements Serializable {
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/WeCarFlowPresenter.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/WeCarFlowPresenter.java
index 3ebbc6e96f..66ab3efecc 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/WeCarFlowPresenter.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/WeCarFlowPresenter.java
@@ -76,7 +76,6 @@ public class WeCarFlowPresenter extends BaseMediaPresenter<IMusicView> {
     public void init(Context context) {
         this.context = context;
         currentMedia = new MediaInfoData();
-        currentMedia.setPlayState(MusicConstant.PLAY_STATE_PAUSE_OR_STOP);
 
         serviceApis =
                 (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context);