From 1b4c625dd9779d327a5b4ef02a526f4cd617dede Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Tue, 18 Aug 2020 14:48:29 +0800
Subject: [PATCH 01/22] opt

---
 .../res/layout/module_event_panel_fragment_surrounding.xml    | 4 ++--
 .../src/main/res/layout/view_history_empty.xml                | 2 +-
 modules/mogo-module-v2x/src/main/res/values/color.xml         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
index 2a28732b3a..58553bf763 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
@@ -84,7 +84,7 @@
                     android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top"
                     android:gravity="center_horizontal"
                     android:text="周边5公里，暂无交通事件"
-                    android:textColor="@color/white"
+                    android:textColor="@color/transparent_white_30"
                     android:textSize="@dimen/module_v2x_surrounding_top_textsize"
                     android:textStyle="bold" />
 
@@ -97,7 +97,7 @@
                     android:layout_marginTop="1px"
                     android:gravity="center_horizontal"
                     android:text="你可以试着分享一个事件给其他车主"
-                    android:textColor="@color/white"
+                    android:textColor="@color/transparent_white_30"
                     android:textSize="@dimen/module_v2x_surrounding_top_textsize"
                     android:textStyle="bold" />
 
diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml
index e1adf9b0e5..7bb1bf469b 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml
@@ -23,7 +23,7 @@
         android:gravity="center"
         android:text="周边5公里，暂无交通事件\n
 你可以试着分享一个交通事件给其他车主"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/transparent_white_30"
         android:textSize="@dimen/dp_36"
         app:layout_constraintBottom_toTopOf="@+id/btnShear"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/modules/mogo-module-v2x/src/main/res/values/color.xml b/modules/mogo-module-v2x/src/main/res/values/color.xml
index d2a4ae7e34..1b79fae064 100644
--- a/modules/mogo-module-v2x/src/main/res/values/color.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/color.xml
@@ -4,7 +4,7 @@
     <color name="live_video_background_color">#3F4057</color>
     <color name="surrounding_card_background">#10121E</color>
     <color name="white">#FFFFFF</color>
-    <color name="transparent_white_30">#4DFFFFFF</color>
+    <color name="transparent_white_30">#B3FFFFFF</color>
     <color name="surrounding_item_bottom_color">#1F2131</color>
     <color name="share_event_item_bg_color">#1F2131</color>
 

From d85c6c9d26f5b321b306c94773b9aceb15b95600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 18 Aug 2020 15:29:45 +0800
Subject: [PATCH 02/22] =?UTF-8?q?=E6=89=93=E5=BC=80=E4=BA=86=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
index 4067c6c0a4..466c32f04e 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
@@ -161,7 +161,7 @@ public class V2XAlarmServer {
     public static void getFatigueDrivingShow(MogoLocation location, OnFatigueDrivingListener onFatigueDrivingListener) {
         try {
             long drivingTime = FatigueDrivingUtils.getDrivingTime();
-            //Logger.i(V2XConst.MODULE_NAME, "车机已经开机: " + drivingTime + " 分钟");
+            Logger.i(V2XConst.MODULE_NAME, "车机已经开机: " + drivingTime + " 分钟");
 
             V2XStrategyPushRes.ResultBean strategyPushEntity =
                     GsonUtil.objectFromJson(SharedPrefsMgr.getInstance(V2XUtils.getApp())

From 14d3ee444e99affcad171fd0c98a1271ad225498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 18 Aug 2020 15:36:52 +0800
Subject: [PATCH 03/22] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scene/fatigue/V2XFatigueDrivingScenario.java       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java
index aee983ba03..9a3ad242f3 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java
@@ -65,7 +65,7 @@ public class V2XFatigueDrivingScenario extends AbsV2XScenario<V2XPushMessageEnti
             }
         } else {
             setV2XMessageEntity(v2XMessageEntity);
-            Logger.w(V2XConst.MODULE_NAME, "要处理的场景已经存在，丢弃这次初始化");
+            Logger.w(V2XConst.MODULE_NAME, "疲劳驾驶场景，要处理的场景已经存在，丢弃这次初始化");
         }
     }
 
@@ -114,23 +114,23 @@ public class V2XFatigueDrivingScenario extends AbsV2XScenario<V2XPushMessageEnti
 
     @Override
     public void onViewAdded(View view) {
-        Logger.d(MODULE_NAME, "展示 Window 动画结束");
+        Logger.d(MODULE_NAME, "疲劳驾驶场景 展示 Window 动画结束");
     }
 
     @Override
     public void onViewRemoved(View view) {
-        Logger.d(MODULE_NAME, "关闭 Window 动画结束");
+        Logger.d(MODULE_NAME, "疲劳驾驶场景 关闭 Window 动画结束");
     }
 
     @Override
     public void beforeViewAddAnim(View view) {
-        Logger.d(MODULE_NAME, "展示 Window 开始");
+        Logger.d(MODULE_NAME, "疲劳驾驶场景 展示 Window 开始");
 
     }
 
     @Override
     public void beforeViewRemoveAnim(View view) {
-        Logger.d(MODULE_NAME, "关闭 Window 开始");
+        Logger.d(MODULE_NAME, "疲劳驾驶场景 关闭 Window 开始");
         // 重置场景提示的消息
         setV2XMessageEntity(null);
         V2XServiceManager.getMoGoV2XStatusManager().setFatigueDrivingWindowShow(TAG, false);

From 1af7263dadde0ec9a05b7ea785ab3f359c3395ea Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Tue, 18 Aug 2020 16:43:30 +0800
Subject: [PATCH 04/22] =?UTF-8?q?[add]=20=E9=83=A8=E5=88=86UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/adapter/V2XShareEventAdapter.java       |   1 +
 .../drawable-ldpi/icon_enthusiasm_choose.png    | Bin 700 -> 746 bytes
 .../drawable-ldpi/icon_enthusiasm_second.png    | Bin 701 -> 703 bytes
 .../drawable-ldpi/icon_enthusiasm_unchoose.png  | Bin 561 -> 601 bytes
 .../res/drawable/bg_v2x_event_description.xml   |   1 +
 .../main/res/drawable/v2x_shadow_shape_view.xml |   8 ++++++++
 ...ule_v2x_event_panel_fragment_event_panel.xml |   6 ++++++
 .../module_v2x_event_share_description.xml      |   4 ++--
 .../res/layout/module_v2x_event_share_item.xml  |   4 +++-
 .../src/main/res/values/style.xml               |  10 +++++-----
 10 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
index 3a84438115..db1731d5f1 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
@@ -48,6 +48,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
         if (viewType == V2XShareEventItemEnum.ITEM_TYPE_NUM_DES) {
             View v = shareLayoutInflater.inflate(R.layout.module_v2x_event_share_description, parent,
                     false);
+            v.getBackground().setAlpha((int) 0.7);
             shareDescriptionViewHolder holder = new shareDescriptionViewHolder(v);
             return holder;
         } else if (viewType == V2XShareEventItemEnum.ITEM_TYPE_SHARE_LIST) {
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_choose.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_choose.png
index 132ee06da922be627e56aa8e4649972cc4ea7178..2e4cfcd7d790b4fbb74334d84c47c444d21d41e8 100644
GIT binary patch
delta 688
zcmV;h0#E(C1?mMMiBL{Q4GJ0x0000DNk~Le0000J0000G2nGNE0QAH}Vv!+8e-oes
z00aO40096101yBG003vtDs}(>0#r#vK~y*qeN;_r6hRQ}8h71QG#5W$59&n)U4wX3
zT;fMW<KhQ;2@)X(4_*WhISIlN4}##&5XJQa1wl57gGR-ZAR<E0lORSsDH5|YRle6f
zGuarEhVHJee)Z~A_3VnvMsnoPfAPfhqMFqWK6Ca&UHM91r}L2z8{Jo({*qo$bEBqi
z6L3=|Hc?qy9$(*%e-R^Gx<d!YQ?<(^0m!A8+;KgF?Yyf*ad#$tkecpPromO}ci1AI
zR`t1E>mI)RDb^g^)=l(XVpbx7f+8o)_td!`X0`^ZkVJtIpDf@(7|Hc5fAOoasH=Jy
zN=gjOrw5T3lPUudZ4%{#@Ov9)bxoMA1Y_$0ML-20i2%ll=X?f2CJR0!+-$8@R5H_V
zs2l7I$u6^CCNW<U)vyJ*nmKa%MdZ7*S{k{iJQ;$r08bEX68SPof~R7#xt``2JcijM
zu3WU@@x)Vr-h}27fFP<Uf0R&B2=o{%Me^V`iR7v$^NYB1$o!kxSxQhtJ15D?!(Fb7
zk3p}BU8_HT{k9-m-HG2L>=ZtMKcR2EPhT{-P~?;O3gkxr;L%GY;_x4BFrAw|Ffi10
zdSBHl%vvb)WzScN$eZ=r#<S9HLqizz$msgIztNmky@w)}gTt2<e@bG>oO}$qwWGFS
zq?d@X5trUkd-mcH-ug7+X7irGhR$q?-2NXCITk3RljHNi-eZZTcf3NJsR+Nvc7JK*
z8HwY>gZ^0-B_nRCvF8N-N!lPRo5|gJxjMWU5%Eis5%8h0`y{$FynR`9WGNzI{{q3*
W*cQVC@#z2n002ov22Mn-LSTYF&NxZ{

delta 641
zcmV-{0)GAK1-u0ziBL{Q4GJ0x0000DNk~Le0000I0000G2nGNE02>A`T#+G2e-fYr
z00aO40096101yBG007`=;WYpN0wzgBK~y*ql~T`ZQ$Y~kd8SxJ#fwNm5Aoossn-_b
z4_XlV2UOZpPhJ$Mc<-fn(5oOt^x$11UIX$X!6e#xR8UY5Q7;k{`~i*W+a14eH~aF`
zUb<v5yEET>GxPDp;OOk^fi3g<f10y8<BXKmxOY~Pwf$44?#b$^Bc?lZX5Om3s>Y04
z=RT=Ot28PrWA#>-dC|GKef=NbUOIIkFosnCdXM+xk!1JzUe>#1jh=I=#=<-f-l=rW
z$Y|wQqwyu_|NOdwlqVsGBn09Lpq|~dy$^_c5;pN9gNA5#$o4mH;Au+8e@wGe1m)cb
z4rF_n8{9pvh{vSUo(Pw6OccSPGaC$>gl6F#YJgI66!Pp!FwFbm6x?69Qf@J4mAWzR
zSH>-@X~le$TFoYS)>&9Ah<ExZE*k(gkbqOc$f~B!)snrgbW_E2;}o6*iM%t5y~T;(
zSx*!Bm6i0mCz3S%j>sb7e_OCn1Y{I{*nlg?iHPGd7fv)cK6@hm9ZZ`kcAZBe<C2(=
zK&-{Wu(sC-G5kD<6LYcBS%1KK9%vNK;q>VvP0RwiW+VyI(MRzq2TdWnUYclc+>N#L
zIT0UYjn+d%7O~cVEQp#5j%A#a%M+a!cZe^ZzlfMP@}ylu=OqYfSN(^G5&d+WMUv&p
zv-R6Wf_VRrh>3Eub6-W5DAQ2%WO=;(d@UC4$iF>3web4nWcI2$d1Xh1+kxLytH-yC
b{~P-QIz_U*#w<rE00000NkvXXu0mjfJc}&-

diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png
index 0eb58cb3e0179b1629bfad784bae3e864202af5c..2bad8382fdfad5388b0ac8d9ea90ab6001d96279 100644
GIT binary patch
delta 644
zcmV-~0(<?v1-}I$iBL{Q4GJ0x0000DNk~Le0000J0000G2nGNE0QAH}Vv!+8e-oes
z00aO40096101yBG003vtDs}(>0x3yEK~y*qos&Up6HySyXI^6hYC(^B=tWD^f+UEf
zkZeDJhaU7hh=LTUC<>AyMv15tL8RZIUV0FUP@2YCJSm<ucL`Mwf)?8D&h!6&o7HF&
z5C?YOyxIT!GBfW*1=i_w3f;}Ee;eZMoQM`h{HAza%;yWuO6BBNYW(!{p`Gn-*Tmcf
z^LE5kKbn^p2MY%py0o-KjRsKn`x`HEnt^^(l}}Db&Yx|}?$~bp+>0MG2t34zH^Cw%
z`r)w4pV8&zAC46b0uhR&qvn&B7VoYgbu2+3F_Rb|Lb*qk#V^VBZR%axe;VDv2L1ln
z{Ad6{lHfsm0Tf~o0FLp9<a#rrKh#nHnnWU7BZMm-gAe$)uh(4;f-YjCc!nBV^B7=A
zgerq%U{U$3^}0EAx;B*3`w-@XpJ#<xYY9m7L(Aq{l)8N*`TJO7ZiX3VhD7TF0fPGC
z0P|)(*I=%joIKURG29vke`1`8+2FHNjL~|i%E_H$t=4<$9A8t_a#Nkm(;sB4fGzP#
zq*aFd#UEKXzVd1=%Ly=UqH1}@sXop=^sl`W3zdW_2^arte0BYzs`4Cy{ep2<tCg<e
zKpv)_e!tlw+X4WW7S}@k)8gv-rG60Af4~@ss-;;KZPL#yoL~=>TBtlZ(b~BDH;CFj
zFb1QjbRBo+9(@|C;jr;PoS#_RxROTqz6Zi6o2r#>s<^xK!+lbDG|_%N!~K6-yZv_V
eT~vASFMyvweo4}&ve`TU0000<MNUMnLSTY$SStGf

delta 642
zcmV-|0)73z1-%6!iBL{Q4GJ0x0000DNk~Le0000I0000H2nGNE0MJ_e`H>+=e-fYr
z00aO40096101*HH007+y$b|p^0w+mCK~y*qos&&#Q$ZAl=gduGM1>-P(qgfQQd=bb
zh;7MjT?lUd2NtAiDB>R|h#*2Ntu4(ah)RosTR}H2i*)Boml_4XwN{B~Fe%NQ@qH(~
zlE$Ws9Ju$MIUf)2oI4{5_BB0se?))IJ&CQZ9FMFOqUF~8e~RrLk2<Dqr9{NSWO@13
zc_rp5+!Lbgd$cWiUi4Zr+4GAGA!P51rJPqRcoqR;ZS{d)I^6j!@1GrB?dr}btIn~Z
z)<o17Pe)G@rtPQPV+}|EK*bnU!8brP*DW939a7&vzS#~!AWGT-vvGrde<b>IrHf5e
zLjbk`MNo!_Q&<UFSlGx=e}=h8q>$f5C2VrAO{jwq>Y|M>j7ulqy0ou#-N12MbB*vJ
zsk+swDi$^}%;_z2x_sc^OE!gbaS*7e07f+&{*ET<nFE>jwy}*^%s9ZNk^sF94#>_N
z$=ls~rX1+#<mBt$@x)D|f5nDd4B!P&Lm*=fED$AQr~8lnU|#dplTKeR_77#zY#jix
za8CS-^@c-gM9YQI(fHFa=RjO^&&*sY4*GYX!V*FyJX7_G2vHUgzxQDX;rAbii}>{P
zL@ANHOJzI~oKvkHLNI}GD0#s8TH69*qHpeYYJI@JXK}~E>%utiSez1d(f9inxvsbW
zKrBei&t5JM3@zYDxCs%0!Cu047U}`vdRq{a!<o!@a4NY7*I2Qsk&*a)#+$b1+3aA`
c&CN9a1s4x37@rXx6aWAK07*qoM6N<$f|;`+bN~PV

diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_unchoose.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_unchoose.png
index c3aaede08ede5a5d57630959a884fb8d4c118ab6..429ab585d075a7cae49da1991a35b7e228d99231 100644
GIT binary patch
delta 541
zcmV+&0^<F#1la^3iBL{Q4GJ0x0000DNk~Le0000J0000G2nGNE0QAH}Vv!+8e-oes
z00aO40096101yBG003vtDs}(>0mDf|K~y*qom0&#L{St!=RUKTVQgf_O0pPcMp=w`
zbCnI*$X8kV6Z`{qtSL%S{sBr!lwx6G%%FsZZ0yKK5&1T6j&o-`&$~=M?&hA~$NAm!
zZucR)uViw!;w3|a2oNEHN~Vvvf1ZfNLQ{xnDO)13S7&9j13=Uah{V(Z*W*&w&nTV!
z0P*C05Hr>q5&0E%ErdAuN_xb@eJ=qG^Fbb$&Hw>Nr40Ay!`5~ZK+ve0Y|N%h9;4jG
z`p%OR2S$xl>afhRGGn?y!^IlbA%cK2!9g{;@-LjF8V;kge>H1Ogm^Bbe+(Y;H=k(Q
zpCJ;(h3eu99{O{)yWubv3(w}lOfxjefy-|Fw+NpN;ptOvF+Uk%*6S_p;Tbo78=-uN
z@M;LrYnruN3g^O9(a=zJ<MaAk_`ReQ{%P?fFF>N(G=p=t_ajUZD$wI8ZsAMZunphu
z_$-jRqzuh})?Hyrh(xMya|L)?dBXM2MyFOmqSG|%7aT5M<$fofR5+bZmt0-HF7p2>
z9UY&F4CshP!%Gh5R9_~ur9dEXSL(+$K5bQTeA$lzjrKx8Igj03Xy4vG^*uaYOoPCY
frf6uTkWcY%I+TJd%GJiJ00000NkvXXu0mjfFaq*2

delta 501
zcmV<R0Sf-v1hE7miBL{Q4GJ0x0000DNk~Le0000I0000G2nGNE02>A`T#+G2e-fYr
z00aO40096101yBG007`=;WYpN0h>ugK~y*qrBuI5!%z^udrd_LadUAh3Od+dTic`s
zQ^84a6_JACzu=%_{{nG!s1DAGhz{b?BsexLVyBMckM26yoOhwA5=%sT5OUvrci+2r
z?<EL*bDU=K!|PQMAWHyK9JUpxf2v`m?<B>t+LMIuyFj!KfYSujRsg5Eo;gIs9@lY&
z?V28W*F+E(92h5foUpHyI^#tyfM71*25*G(l965Wh3ZzLO+@npGUOn_8!s{u3J)O0
za8)@@V<t*OvZF+VM-NQpd5{n=it$1Tp4WJ16p?;yM;XS#BM+)MnwYxce~ti@g1vtW
zA>I~?sT*HN*Rz+X;Nb6K_%x<rMe6+H7l%&{Eyq0~kG2H=W_-t<wODK^pHDtWuHTV3
zOpsAX@32!79A%vQ!X1<Y5y>4036Psy)YIGC=ds{n#saVWn1+$L|ITylr|~wGWw|x}
zo;E{lm$zdU3aM5o{xzd8OCe%)+dbjoZS=V=#I<rMmmGRkw6H*cWt%KkvFrx&-(UqP
rzFf>L4iyP%BHt_)v+dSwWD=8~;#r1)5-eQe00000NkvXXu0mjfNPN^P

diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml
index e36175ddc9..10fe9e7433 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml
@@ -7,4 +7,5 @@
         android:endColor="#3F4057"
         android:type="linear"
         android:angle="180"/>
+
 </shape>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml
new file mode 100644
index 0000000000..7ac15899e1
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="270"
+        android:startColor="@android:color/transparent"
+        android:endColor="#10121E"/>
+
+</shape>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
index 17d32282fe..cd11ceacab 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
@@ -91,4 +91,10 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@+id/rgTabSelect" />
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="60px"
+        android:background="@drawable/v2x_shadow_shape_view"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
 </com.mogo.module.v2x.view.RoundConstraintLayout>
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
index cfe8dcfd4b..e9d00092d3 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
@@ -60,7 +60,7 @@
             android:layout_width="0.5px"
             android:layout_height="46px"
             android:layout_marginTop="20px"
-            android:alpha="0.5"
+            android:alpha="0.3"
             android:background="#FFFFFF" />
 
         <LinearLayout
@@ -94,7 +94,7 @@
             android:layout_width="0.5px"
             android:layout_height="46px"
             android:layout_marginTop="20px"
-            android:alpha="0.5"
+            android:alpha="0.3"
             android:background="#FFFFFF" />
 
         <LinearLayout
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
index 912877da4b..7bdd96bc8a 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:layout_marginLeft="20px"
     android:layout_marginRight="20px"
-    android:layout_marginBottom="16px">
+    android:layout_marginBottom="14px">
 
     <androidx.cardview.widget.CardView
         android:id="@+id/road_case_card_view"
@@ -90,6 +90,7 @@
                 android:ellipsize="end"
                 android:gravity="left"
                 android:lines="1"
+                android:paddingTop="2px"
                 android:text="东城区北三环附近维多欧美"
                 android:textColor="#FFFFFF"
                 android:textSize="18px" />
@@ -104,6 +105,7 @@
                 android:alpha="0.5"
                 android:gravity="left"
                 android:text="时间:"
+                android:paddingTop="2px"
                 android:textColor="#FFFFFF"
                 android:textSize="16px" />
         </RelativeLayout>
diff --git a/modules/mogo-module-v2x/src/main/res/values/style.xml b/modules/mogo-module-v2x/src/main/res/values/style.xml
index f39c59f7d6..ee599daa9b 100644
--- a/modules/mogo-module-v2x/src/main/res/values/style.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/style.xml
@@ -5,11 +5,11 @@
     </declare-styleable>
 
     <style name="customRatingBarStyle" parent="@style/Widget.AppCompat.RatingBar">
-        <item name="android:minHeight">18px</item>
-        <item name="android:maxHeight">20px</item>
-        <item name="android:maxWidth">16px</item>
-        <item name="android:minWidth">16px</item>
-        <item name="android:spacing">3.7px</item>
+        <item name="android:minHeight">16px</item>
+        <item name="android:maxHeight">26px</item>
+        <item name="android:maxWidth">18px</item>
+        <item name="android:minWidth">18px</item>
+        <item name="android:spacing">4dp</item>
         <item name="android:numStars">5</item>
         <item name="android:rating">1</item>
         <item name="android:stepSize">0.5</item>

From 07629acc3c8f1bda030bda719af1596ed1b630c1 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Tue, 18 Aug 2020 16:43:30 +0800
Subject: [PATCH 05/22] =?UTF-8?q?[add]=20=E9=83=A8=E5=88=86UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/adapter/V2XShareEventAdapter.java       |   1 +
 .../drawable-ldpi/icon_enthusiasm_choose.png    | Bin 700 -> 746 bytes
 .../drawable-ldpi/icon_enthusiasm_second.png    | Bin 701 -> 703 bytes
 .../drawable-ldpi/icon_enthusiasm_unchoose.png  | Bin 561 -> 601 bytes
 .../res/drawable/bg_v2x_event_description.xml   |   1 +
 .../main/res/drawable/v2x_shadow_shape_view.xml |   8 ++++++++
 ...ule_v2x_event_panel_fragment_event_panel.xml |   6 ++++++
 .../module_v2x_event_share_description.xml      |   4 ++--
 .../res/layout/module_v2x_event_share_item.xml  |   4 +++-
 .../src/main/res/values/style.xml               |  10 +++++-----
 10 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
index 3a84438115..db1731d5f1 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
@@ -48,6 +48,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
         if (viewType == V2XShareEventItemEnum.ITEM_TYPE_NUM_DES) {
             View v = shareLayoutInflater.inflate(R.layout.module_v2x_event_share_description, parent,
                     false);
+            v.getBackground().setAlpha((int) 0.7);
             shareDescriptionViewHolder holder = new shareDescriptionViewHolder(v);
             return holder;
         } else if (viewType == V2XShareEventItemEnum.ITEM_TYPE_SHARE_LIST) {
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_choose.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_choose.png
index 132ee06da922be627e56aa8e4649972cc4ea7178..2e4cfcd7d790b4fbb74334d84c47c444d21d41e8 100644
GIT binary patch
delta 688
zcmV;h0#E(C1?mMMiBL{Q4GJ0x0000DNk~Le0000J0000G2nGNE0QAH}Vv!+8e-oes
z00aO40096101yBG003vtDs}(>0#r#vK~y*qeN;_r6hRQ}8h71QG#5W$59&n)U4wX3
zT;fMW<KhQ;2@)X(4_*WhISIlN4}##&5XJQa1wl57gGR-ZAR<E0lORSsDH5|YRle6f
zGuarEhVHJee)Z~A_3VnvMsnoPfAPfhqMFqWK6Ca&UHM91r}L2z8{Jo({*qo$bEBqi
z6L3=|Hc?qy9$(*%e-R^Gx<d!YQ?<(^0m!A8+;KgF?Yyf*ad#$tkecpPromO}ci1AI
zR`t1E>mI)RDb^g^)=l(XVpbx7f+8o)_td!`X0`^ZkVJtIpDf@(7|Hc5fAOoasH=Jy
zN=gjOrw5T3lPUudZ4%{#@Ov9)bxoMA1Y_$0ML-20i2%ll=X?f2CJR0!+-$8@R5H_V
zs2l7I$u6^CCNW<U)vyJ*nmKa%MdZ7*S{k{iJQ;$r08bEX68SPof~R7#xt``2JcijM
zu3WU@@x)Vr-h}27fFP<Uf0R&B2=o{%Me^V`iR7v$^NYB1$o!kxSxQhtJ15D?!(Fb7
zk3p}BU8_HT{k9-m-HG2L>=ZtMKcR2EPhT{-P~?;O3gkxr;L%GY;_x4BFrAw|Ffi10
zdSBHl%vvb)WzScN$eZ=r#<S9HLqizz$msgIztNmky@w)}gTt2<e@bG>oO}$qwWGFS
zq?d@X5trUkd-mcH-ug7+X7irGhR$q?-2NXCITk3RljHNi-eZZTcf3NJsR+Nvc7JK*
z8HwY>gZ^0-B_nRCvF8N-N!lPRo5|gJxjMWU5%Eis5%8h0`y{$FynR`9WGNzI{{q3*
W*cQVC@#z2n002ov22Mn-LSTYF&NxZ{

delta 641
zcmV-{0)GAK1-u0ziBL{Q4GJ0x0000DNk~Le0000I0000G2nGNE02>A`T#+G2e-fYr
z00aO40096101yBG007`=;WYpN0wzgBK~y*ql~T`ZQ$Y~kd8SxJ#fwNm5Aoossn-_b
z4_XlV2UOZpPhJ$Mc<-fn(5oOt^x$11UIX$X!6e#xR8UY5Q7;k{`~i*W+a14eH~aF`
zUb<v5yEET>GxPDp;OOk^fi3g<f10y8<BXKmxOY~Pwf$44?#b$^Bc?lZX5Om3s>Y04
z=RT=Ot28PrWA#>-dC|GKef=NbUOIIkFosnCdXM+xk!1JzUe>#1jh=I=#=<-f-l=rW
z$Y|wQqwyu_|NOdwlqVsGBn09Lpq|~dy$^_c5;pN9gNA5#$o4mH;Au+8e@wGe1m)cb
z4rF_n8{9pvh{vSUo(Pw6OccSPGaC$>gl6F#YJgI66!Pp!FwFbm6x?69Qf@J4mAWzR
zSH>-@X~le$TFoYS)>&9Ah<ExZE*k(gkbqOc$f~B!)snrgbW_E2;}o6*iM%t5y~T;(
zSx*!Bm6i0mCz3S%j>sb7e_OCn1Y{I{*nlg?iHPGd7fv)cK6@hm9ZZ`kcAZBe<C2(=
zK&-{Wu(sC-G5kD<6LYcBS%1KK9%vNK;q>VvP0RwiW+VyI(MRzq2TdWnUYclc+>N#L
zIT0UYjn+d%7O~cVEQp#5j%A#a%M+a!cZe^ZzlfMP@}ylu=OqYfSN(^G5&d+WMUv&p
zv-R6Wf_VRrh>3Eub6-W5DAQ2%WO=;(d@UC4$iF>3web4nWcI2$d1Xh1+kxLytH-yC
b{~P-QIz_U*#w<rE00000NkvXXu0mjfJc}&-

diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png
index 0eb58cb3e0179b1629bfad784bae3e864202af5c..2bad8382fdfad5388b0ac8d9ea90ab6001d96279 100644
GIT binary patch
delta 644
zcmV-~0(<?v1-}I$iBL{Q4GJ0x0000DNk~Le0000J0000G2nGNE0QAH}Vv!+8e-oes
z00aO40096101yBG003vtDs}(>0x3yEK~y*qos&Up6HySyXI^6hYC(^B=tWD^f+UEf
zkZeDJhaU7hh=LTUC<>AyMv15tL8RZIUV0FUP@2YCJSm<ucL`Mwf)?8D&h!6&o7HF&
z5C?YOyxIT!GBfW*1=i_w3f;}Ee;eZMoQM`h{HAza%;yWuO6BBNYW(!{p`Gn-*Tmcf
z^LE5kKbn^p2MY%py0o-KjRsKn`x`HEnt^^(l}}Db&Yx|}?$~bp+>0MG2t34zH^Cw%
z`r)w4pV8&zAC46b0uhR&qvn&B7VoYgbu2+3F_Rb|Lb*qk#V^VBZR%axe;VDv2L1ln
z{Ad6{lHfsm0Tf~o0FLp9<a#rrKh#nHnnWU7BZMm-gAe$)uh(4;f-YjCc!nBV^B7=A
zgerq%U{U$3^}0EAx;B*3`w-@XpJ#<xYY9m7L(Aq{l)8N*`TJO7ZiX3VhD7TF0fPGC
z0P|)(*I=%joIKURG29vke`1`8+2FHNjL~|i%E_H$t=4<$9A8t_a#Nkm(;sB4fGzP#
zq*aFd#UEKXzVd1=%Ly=UqH1}@sXop=^sl`W3zdW_2^arte0BYzs`4Cy{ep2<tCg<e
zKpv)_e!tlw+X4WW7S}@k)8gv-rG60Af4~@ss-;;KZPL#yoL~=>TBtlZ(b~BDH;CFj
zFb1QjbRBo+9(@|C;jr;PoS#_RxROTqz6Zi6o2r#>s<^xK!+lbDG|_%N!~K6-yZv_V
eT~vASFMyvweo4}&ve`TU0000<MNUMnLSTY$SStGf

delta 642
zcmV-|0)73z1-%6!iBL{Q4GJ0x0000DNk~Le0000I0000H2nGNE0MJ_e`H>+=e-fYr
z00aO40096101*HH007+y$b|p^0w+mCK~y*qos&&#Q$ZAl=gduGM1>-P(qgfQQd=bb
zh;7MjT?lUd2NtAiDB>R|h#*2Ntu4(ah)RosTR}H2i*)Boml_4XwN{B~Fe%NQ@qH(~
zlE$Ws9Ju$MIUf)2oI4{5_BB0se?))IJ&CQZ9FMFOqUF~8e~RrLk2<Dqr9{NSWO@13
zc_rp5+!Lbgd$cWiUi4Zr+4GAGA!P51rJPqRcoqR;ZS{d)I^6j!@1GrB?dr}btIn~Z
z)<o17Pe)G@rtPQPV+}|EK*bnU!8brP*DW939a7&vzS#~!AWGT-vvGrde<b>IrHf5e
zLjbk`MNo!_Q&<UFSlGx=e}=h8q>$f5C2VrAO{jwq>Y|M>j7ulqy0ou#-N12MbB*vJ
zsk+swDi$^}%;_z2x_sc^OE!gbaS*7e07f+&{*ET<nFE>jwy}*^%s9ZNk^sF94#>_N
z$=ls~rX1+#<mBt$@x)D|f5nDd4B!P&Lm*=fED$AQr~8lnU|#dplTKeR_77#zY#jix
za8CS-^@c-gM9YQI(fHFa=RjO^&&*sY4*GYX!V*FyJX7_G2vHUgzxQDX;rAbii}>{P
zL@ANHOJzI~oKvkHLNI}GD0#s8TH69*qHpeYYJI@JXK}~E>%utiSez1d(f9inxvsbW
zKrBei&t5JM3@zYDxCs%0!Cu047U}`vdRq{a!<o!@a4NY7*I2Qsk&*a)#+$b1+3aA`
c&CN9a1s4x37@rXx6aWAK07*qoM6N<$f|;`+bN~PV

diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_unchoose.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_unchoose.png
index c3aaede08ede5a5d57630959a884fb8d4c118ab6..429ab585d075a7cae49da1991a35b7e228d99231 100644
GIT binary patch
delta 541
zcmV+&0^<F#1la^3iBL{Q4GJ0x0000DNk~Le0000J0000G2nGNE0QAH}Vv!+8e-oes
z00aO40096101yBG003vtDs}(>0mDf|K~y*qom0&#L{St!=RUKTVQgf_O0pPcMp=w`
zbCnI*$X8kV6Z`{qtSL%S{sBr!lwx6G%%FsZZ0yKK5&1T6j&o-`&$~=M?&hA~$NAm!
zZucR)uViw!;w3|a2oNEHN~Vvvf1ZfNLQ{xnDO)13S7&9j13=Uah{V(Z*W*&w&nTV!
z0P*C05Hr>q5&0E%ErdAuN_xb@eJ=qG^Fbb$&Hw>Nr40Ay!`5~ZK+ve0Y|N%h9;4jG
z`p%OR2S$xl>afhRGGn?y!^IlbA%cK2!9g{;@-LjF8V;kge>H1Ogm^Bbe+(Y;H=k(Q
zpCJ;(h3eu99{O{)yWubv3(w}lOfxjefy-|Fw+NpN;ptOvF+Uk%*6S_p;Tbo78=-uN
z@M;LrYnruN3g^O9(a=zJ<MaAk_`ReQ{%P?fFF>N(G=p=t_ajUZD$wI8ZsAMZunphu
z_$-jRqzuh})?Hyrh(xMya|L)?dBXM2MyFOmqSG|%7aT5M<$fofR5+bZmt0-HF7p2>
z9UY&F4CshP!%Gh5R9_~ur9dEXSL(+$K5bQTeA$lzjrKx8Igj03Xy4vG^*uaYOoPCY
frf6uTkWcY%I+TJd%GJiJ00000NkvXXu0mjfFaq*2

delta 501
zcmV<R0Sf-v1hE7miBL{Q4GJ0x0000DNk~Le0000I0000G2nGNE02>A`T#+G2e-fYr
z00aO40096101yBG007`=;WYpN0h>ugK~y*qrBuI5!%z^udrd_LadUAh3Od+dTic`s
zQ^84a6_JACzu=%_{{nG!s1DAGhz{b?BsexLVyBMckM26yoOhwA5=%sT5OUvrci+2r
z?<EL*bDU=K!|PQMAWHyK9JUpxf2v`m?<B>t+LMIuyFj!KfYSujRsg5Eo;gIs9@lY&
z?V28W*F+E(92h5foUpHyI^#tyfM71*25*G(l965Wh3ZzLO+@npGUOn_8!s{u3J)O0
za8)@@V<t*OvZF+VM-NQpd5{n=it$1Tp4WJ16p?;yM;XS#BM+)MnwYxce~ti@g1vtW
zA>I~?sT*HN*Rz+X;Nb6K_%x<rMe6+H7l%&{Eyq0~kG2H=W_-t<wODK^pHDtWuHTV3
zOpsAX@32!79A%vQ!X1<Y5y>4036Psy)YIGC=ds{n#saVWn1+$L|ITylr|~wGWw|x}
zo;E{lm$zdU3aM5o{xzd8OCe%)+dbjoZS=V=#I<rMmmGRkw6H*cWt%KkvFrx&-(UqP
rzFf>L4iyP%BHt_)v+dSwWD=8~;#r1)5-eQe00000NkvXXu0mjfNPN^P

diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml
index e36175ddc9..10fe9e7433 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml
@@ -7,4 +7,5 @@
         android:endColor="#3F4057"
         android:type="linear"
         android:angle="180"/>
+
 </shape>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml
new file mode 100644
index 0000000000..7ac15899e1
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="270"
+        android:startColor="@android:color/transparent"
+        android:endColor="#10121E"/>
+
+</shape>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
index 17d32282fe..cd11ceacab 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
@@ -91,4 +91,10 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@+id/rgTabSelect" />
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="60px"
+        android:background="@drawable/v2x_shadow_shape_view"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
 </com.mogo.module.v2x.view.RoundConstraintLayout>
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
index cfe8dcfd4b..e9d00092d3 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
@@ -60,7 +60,7 @@
             android:layout_width="0.5px"
             android:layout_height="46px"
             android:layout_marginTop="20px"
-            android:alpha="0.5"
+            android:alpha="0.3"
             android:background="#FFFFFF" />
 
         <LinearLayout
@@ -94,7 +94,7 @@
             android:layout_width="0.5px"
             android:layout_height="46px"
             android:layout_marginTop="20px"
-            android:alpha="0.5"
+            android:alpha="0.3"
             android:background="#FFFFFF" />
 
         <LinearLayout
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
index 912877da4b..7bdd96bc8a 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:layout_marginLeft="20px"
     android:layout_marginRight="20px"
-    android:layout_marginBottom="16px">
+    android:layout_marginBottom="14px">
 
     <androidx.cardview.widget.CardView
         android:id="@+id/road_case_card_view"
@@ -90,6 +90,7 @@
                 android:ellipsize="end"
                 android:gravity="left"
                 android:lines="1"
+                android:paddingTop="2px"
                 android:text="东城区北三环附近维多欧美"
                 android:textColor="#FFFFFF"
                 android:textSize="18px" />
@@ -104,6 +105,7 @@
                 android:alpha="0.5"
                 android:gravity="left"
                 android:text="时间:"
+                android:paddingTop="2px"
                 android:textColor="#FFFFFF"
                 android:textSize="16px" />
         </RelativeLayout>
diff --git a/modules/mogo-module-v2x/src/main/res/values/style.xml b/modules/mogo-module-v2x/src/main/res/values/style.xml
index f39c59f7d6..ee599daa9b 100644
--- a/modules/mogo-module-v2x/src/main/res/values/style.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/style.xml
@@ -5,11 +5,11 @@
     </declare-styleable>
 
     <style name="customRatingBarStyle" parent="@style/Widget.AppCompat.RatingBar">
-        <item name="android:minHeight">18px</item>
-        <item name="android:maxHeight">20px</item>
-        <item name="android:maxWidth">16px</item>
-        <item name="android:minWidth">16px</item>
-        <item name="android:spacing">3.7px</item>
+        <item name="android:minHeight">16px</item>
+        <item name="android:maxHeight">26px</item>
+        <item name="android:maxWidth">18px</item>
+        <item name="android:minWidth">18px</item>
+        <item name="android:spacing">4dp</item>
         <item name="android:numStars">5</item>
         <item name="android:rating">1</item>
         <item name="android:stepSize">0.5</item>

From 1853f50bbcdcc1116a151c4fa4aee11f3b608fbe Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Tue, 18 Aug 2020 17:04:04 +0800
Subject: [PATCH 06/22] opt ui

---
 .../com/mogo/module/v2x/fragment/V2XSurroundingFragment.java | 5 +++--
 .../mogo-module-v2x/src/main/res/drawable/bg_v2x_refresh.xml | 2 +-
 .../src/main/res/values-xhdpi-1920x1000/dimens.xml           | 5 +++--
 modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml | 5 +++--
 modules/mogo-module-v2x/src/main/res/values/dimens.xml       | 5 +++--
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
index a0b02cb8bf..c6a1805fde 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
@@ -2,6 +2,7 @@ package com.mogo.module.v2x.fragment;
 
 import android.graphics.Color;
 import android.graphics.Rect;
+import android.graphics.Typeface;
 import android.os.Bundle;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -179,10 +180,10 @@ public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, Su
             //总条数
             String originStr = String.format(getContext().getResources().getString(R.string.v2x_surrounding_top_brief), exploreWayList.size());
             SpannableString spannableString = new SpannableString(originStr);
-            spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#256BFF")), 7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#459DFF")), 7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
             //设置字体大小，true表示前面的字体大小20单位为dip
             spannableString.setSpan(new AbsoluteSizeSpan(36, true), 7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-            spannableString.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), 7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            spannableString.setSpan(new StyleSpan(Typeface.NORMAL), 7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
             mTotalTv.setText(spannableString);
         } else {
             mTopLayout.setVisibility(View.GONE);
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_refresh.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_refresh.xml
index 7656a1a428..d45ca08f1b 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_refresh.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_refresh.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="24px" />
+    <corners android:radius="@dimen/module_v2x_surrounding_refresh_bt_radius" />
 
     <gradient
         android:endColor="#256BFF"
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
index 6accb83b34..d9cbaf8e40 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -31,12 +31,12 @@
     <dimen name="module_v2x_surrounding_top_height">40px</dimen>
     <dimen name="module_v2x_surrounding_top_bt_width">90px</dimen>
     <dimen name="module_v2x_surrounding_top_bt_height">36px</dimen>
-    <dimen name="module_v2x_surrounding_empty_iv_margin_top">50px</dimen>
+    <dimen name="module_v2x_surrounding_empty_iv_margin_top">40px</dimen>
     <dimen name="module_v2x_surrounding_empty_tv_margin_top">15px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_width">150px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_height">48px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_margin_top">32px</dimen>
-    <dimen name="module_v2x_surrounding_empty_bt_maigin_left">123px</dimen>
+    <dimen name="module_v2x_surrounding_empty_bt_maigin_left">130px</dimen>
     <dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
     <dimen name="module_v2x_surrounding_margin_left">20px</dimen>
     <dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>
@@ -46,6 +46,7 @@
     <dimen name="module_v2x_surrounding_item_marigin_left">12px</dimen>
     <dimen name="module_v2x_surrounding_item_marigin_bottom_left">8px</dimen>
 
+    <dimen name="module_v2x_surrounding_refresh_bt_radius">24px</dimen>
     <dimen name="module_v2x_surrounding_top_textsize">18px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">20px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index 4ef9d0bc3e..45ca7333ff 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -32,12 +32,12 @@
     <dimen name="module_v2x_surrounding_top_height">40px</dimen>
     <dimen name="module_v2x_surrounding_top_bt_width">90px</dimen>
     <dimen name="module_v2x_surrounding_top_bt_height">36px</dimen>
-    <dimen name="module_v2x_surrounding_empty_iv_margin_top">50px</dimen>
+    <dimen name="module_v2x_surrounding_empty_iv_margin_top">40px</dimen>
     <dimen name="module_v2x_surrounding_empty_tv_margin_top">15px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_width">150px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_height">48px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_margin_top">32px</dimen>
-    <dimen name="module_v2x_surrounding_empty_bt_maigin_left">123px</dimen>
+    <dimen name="module_v2x_surrounding_empty_bt_maigin_left">130px</dimen>
     <dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
     <dimen name="module_v2x_surrounding_margin_left">20px</dimen>
     <dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>
@@ -47,6 +47,7 @@
     <dimen name="module_v2x_surrounding_item_marigin_left">12px</dimen>
     <dimen name="module_v2x_surrounding_item_marigin_bottom_left">8px</dimen>
 
+    <dimen name="module_v2x_surrounding_refresh_bt_radius">24px</dimen>
     <dimen name="module_v2x_surrounding_top_textsize">18px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">20px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
index fdc062957b..c6458087a1 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -34,12 +34,12 @@
     <dimen name="module_v2x_surrounding_top_height">40px</dimen>
     <dimen name="module_v2x_surrounding_top_bt_width">90px</dimen>
     <dimen name="module_v2x_surrounding_top_bt_height">36px</dimen>
-    <dimen name="module_v2x_surrounding_empty_iv_margin_top">50px</dimen>
+    <dimen name="module_v2x_surrounding_empty_iv_margin_top">40px</dimen>
     <dimen name="module_v2x_surrounding_empty_tv_margin_top">15px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_width">150px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_height">48px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_margin_top">32px</dimen>
-    <dimen name="module_v2x_surrounding_empty_bt_maigin_left">123px</dimen>
+    <dimen name="module_v2x_surrounding_empty_bt_maigin_left">130px</dimen>
     <dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
     <dimen name="module_v2x_surrounding_margin_left">20px</dimen>
     <dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>
@@ -49,6 +49,7 @@
     <dimen name="module_v2x_surrounding_item_marigin_left">12px</dimen>
     <dimen name="module_v2x_surrounding_item_marigin_bottom_left">8px</dimen>
 
+    <dimen name="module_v2x_surrounding_refresh_bt_radius">24px</dimen>
     <dimen name="module_v2x_surrounding_top_textsize">18px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">20px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>

From 2b3a58361c1ecdc047a3f26303862db4cc8c32a1 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Tue, 18 Aug 2020 17:25:26 +0800
Subject: [PATCH 07/22] opt ui

---
 .../com/mogo/module/v2x/fragment/V2XSurroundingFragment.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
index c6a1805fde..ade0f4c4bf 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
@@ -182,7 +182,7 @@ public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, Su
             SpannableString spannableString = new SpannableString(originStr);
             spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#459DFF")), 7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
             //设置字体大小，true表示前面的字体大小20单位为dip
-            spannableString.setSpan(new AbsoluteSizeSpan(36, true), 7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            spannableString.setSpan(new AbsoluteSizeSpan(38, true), 7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
             spannableString.setSpan(new StyleSpan(Typeface.NORMAL), 7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
             mTotalTv.setText(spannableString);
         } else {

From 1d7c90270320b6e085aed4e9d7ea6745987df698 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Tue, 18 Aug 2020 19:55:17 +0800
Subject: [PATCH 08/22] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=B7=E6=96=B0=E6=97=B6=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/fragment/V2XEventPanelFragment.kt     |  6 +++++-
 .../v2x/fragment/V2XShareEventsFragment.java  | 19 +++++++++++++++----
 .../v2x/presenter/ShareEventsPresenter.java   | 15 +++++++++++++--
 .../res/layout/v2x_network_loading_item.xml   |  2 +-
 4 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
index 297ac9d014..5a277dafae 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
@@ -11,6 +11,7 @@ import com.mogo.module.v2x.V2XConst.MODULE_NAME
 import com.mogo.module.v2x.V2XServiceManager
 import com.mogo.module.v2x.adapter.V2XEventPagerAdapter
 import com.mogo.module.v2x.presenter.EventPanelPresenter
+import com.mogo.module.v2x.presenter.ShareEventsPresenter
 import com.mogo.module.v2x.utils.TrackUtils
 import com.mogo.module.v2x.view.V2XEventPanelHistoryCountView
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener
@@ -38,6 +39,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     private var mV2XEventPanelHistoryCountView: V2XEventPanelHistoryCountView? = null
 
     private val mV2XScenarioHistoryFragment = V2XScenarioHistoryFragment()
+    private val mV2XShareEventsFragment = V2XShareEventsFragment()
 
     companion object {
         private val fragment = V2XEventPanelFragment()
@@ -93,7 +95,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
             fragments = arrayOf(
                     mV2XScenarioHistoryFragment,
                     V2XSurroundingFragment(),
-                    V2XShareEventsFragment()
+                    mV2XShareEventsFragment
             )
             //禁用预加载
             vpEventPanel.offscreenPageLimit = ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT
@@ -156,6 +158,8 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
         try {
             if (isFirstLoad) {
                 mV2XScenarioHistoryFragment.presenter.loadHistory()
+                mV2XShareEventsFragment.presenter.loadShareEventList()
+
             }
         } catch (e: Exception) {
             e.printStackTrace()
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index 2d8049e13c..2a08c5828a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -22,12 +22,12 @@ import com.mogo.module.v2x.listener.AdapterCallback;
 import com.mogo.module.v2x.network.V2XRefreshCallback;
 import com.mogo.module.v2x.network.V2XShareNetworkModel;
 import com.mogo.module.v2x.presenter.ShareEventsPresenter;
+import com.mogo.module.v2x.utils.ThreadUtils;
 import com.mogo.module.v2x.view.V2XNetworkLoadingView;
-import com.mogo.utils.CheckUtils;
 
 import java.util.ArrayList;
 
-public class V2XShareEventsFragment extends MvpFragment implements AdapterCallback {
+public class V2XShareEventsFragment extends MvpFragment<V2XShareEventsFragment, ShareEventsPresenter> implements AdapterCallback {
 
     private static final String TAG = "ShareEventsFragment";
     private RecyclerView recyclerView;
@@ -79,7 +79,12 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
      * */
     @Override
     public void getShareEventResponse() {
-        animatioonAcction(View.VISIBLE);
+        ThreadUtils.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                animatioonAcction(View.VISIBLE);
+            }
+        });
 
         v2XShareNetworkModel.getShareEventResponse(pageNum, 10, new V2XRefreshCallback() {
             @Override
@@ -156,7 +161,13 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
             item.setViewType(V2XShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY);
             dataArrayList.add(item);
         }
-        adapter.notifyDataSetChanged();
+
+        ThreadUtils.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                adapter.notifyDataSetChanged();
+            }
+        });
 
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ShareEventsPresenter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ShareEventsPresenter.java
index c1e6c48b71..f2ba64eb21 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ShareEventsPresenter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ShareEventsPresenter.java
@@ -2,10 +2,21 @@ package com.mogo.module.v2x.presenter;
 
 import com.mogo.commons.mvp.IView;
 import com.mogo.commons.mvp.Presenter;
+import com.mogo.module.common.entity.V2XHistoryScenarioData;
 import com.mogo.module.v2x.fragment.V2XShareEventsFragment;
+import com.mogo.module.v2x.utils.V2XSQLiteUtils;
+import com.mogo.utils.WorkThreadHandler;
+
+import java.util.List;
 
 public class ShareEventsPresenter extends Presenter <V2XShareEventsFragment>{
-    public ShareEventsPresenter(IView view) {
-        super((V2XShareEventsFragment) view);
+
+    public ShareEventsPresenter(IView view) { super((V2XShareEventsFragment) view); }
+
+    public void loadShareEventList() {
+        WorkThreadHandler.getInstance().post(() -> {
+            mView.getShareEventResponse();
+        });
     }
+
 }
diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
index c48b3bc1f5..9065e0893b 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
@@ -34,7 +34,7 @@
         android:layout_centerHorizontal="true"
         android:layout_gravity="top|center"
         android:layout_marginTop="34px"
-        android:background="@drawable/bg_v2x_event_live_show"
+        android:background="@drawable/v2xt_dw_common_corner_bkg_light"
         android:text="刷新"
         android:textColor="#FFFFFF"
         android:textSize="18px" />

From 898049190ed3db0623cdfdd44a4f4018be2f8157 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Tue, 18 Aug 2020 19:55:17 +0800
Subject: [PATCH 09/22] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=B7=E6=96=B0=E6=97=B6=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/fragment/V2XEventPanelFragment.kt     |  6 +++++-
 .../v2x/fragment/V2XShareEventsFragment.java  | 19 +++++++++++++++----
 .../v2x/presenter/ShareEventsPresenter.java   | 15 +++++++++++++--
 .../res/layout/v2x_network_loading_item.xml   |  2 +-
 4 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
index 297ac9d014..5a277dafae 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
@@ -11,6 +11,7 @@ import com.mogo.module.v2x.V2XConst.MODULE_NAME
 import com.mogo.module.v2x.V2XServiceManager
 import com.mogo.module.v2x.adapter.V2XEventPagerAdapter
 import com.mogo.module.v2x.presenter.EventPanelPresenter
+import com.mogo.module.v2x.presenter.ShareEventsPresenter
 import com.mogo.module.v2x.utils.TrackUtils
 import com.mogo.module.v2x.view.V2XEventPanelHistoryCountView
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener
@@ -38,6 +39,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     private var mV2XEventPanelHistoryCountView: V2XEventPanelHistoryCountView? = null
 
     private val mV2XScenarioHistoryFragment = V2XScenarioHistoryFragment()
+    private val mV2XShareEventsFragment = V2XShareEventsFragment()
 
     companion object {
         private val fragment = V2XEventPanelFragment()
@@ -93,7 +95,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
             fragments = arrayOf(
                     mV2XScenarioHistoryFragment,
                     V2XSurroundingFragment(),
-                    V2XShareEventsFragment()
+                    mV2XShareEventsFragment
             )
             //禁用预加载
             vpEventPanel.offscreenPageLimit = ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT
@@ -156,6 +158,8 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
         try {
             if (isFirstLoad) {
                 mV2XScenarioHistoryFragment.presenter.loadHistory()
+                mV2XShareEventsFragment.presenter.loadShareEventList()
+
             }
         } catch (e: Exception) {
             e.printStackTrace()
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index 2d8049e13c..2a08c5828a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -22,12 +22,12 @@ import com.mogo.module.v2x.listener.AdapterCallback;
 import com.mogo.module.v2x.network.V2XRefreshCallback;
 import com.mogo.module.v2x.network.V2XShareNetworkModel;
 import com.mogo.module.v2x.presenter.ShareEventsPresenter;
+import com.mogo.module.v2x.utils.ThreadUtils;
 import com.mogo.module.v2x.view.V2XNetworkLoadingView;
-import com.mogo.utils.CheckUtils;
 
 import java.util.ArrayList;
 
-public class V2XShareEventsFragment extends MvpFragment implements AdapterCallback {
+public class V2XShareEventsFragment extends MvpFragment<V2XShareEventsFragment, ShareEventsPresenter> implements AdapterCallback {
 
     private static final String TAG = "ShareEventsFragment";
     private RecyclerView recyclerView;
@@ -79,7 +79,12 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
      * */
     @Override
     public void getShareEventResponse() {
-        animatioonAcction(View.VISIBLE);
+        ThreadUtils.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                animatioonAcction(View.VISIBLE);
+            }
+        });
 
         v2XShareNetworkModel.getShareEventResponse(pageNum, 10, new V2XRefreshCallback() {
             @Override
@@ -156,7 +161,13 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
             item.setViewType(V2XShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY);
             dataArrayList.add(item);
         }
-        adapter.notifyDataSetChanged();
+
+        ThreadUtils.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                adapter.notifyDataSetChanged();
+            }
+        });
 
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ShareEventsPresenter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ShareEventsPresenter.java
index c1e6c48b71..f2ba64eb21 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ShareEventsPresenter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ShareEventsPresenter.java
@@ -2,10 +2,21 @@ package com.mogo.module.v2x.presenter;
 
 import com.mogo.commons.mvp.IView;
 import com.mogo.commons.mvp.Presenter;
+import com.mogo.module.common.entity.V2XHistoryScenarioData;
 import com.mogo.module.v2x.fragment.V2XShareEventsFragment;
+import com.mogo.module.v2x.utils.V2XSQLiteUtils;
+import com.mogo.utils.WorkThreadHandler;
+
+import java.util.List;
 
 public class ShareEventsPresenter extends Presenter <V2XShareEventsFragment>{
-    public ShareEventsPresenter(IView view) {
-        super((V2XShareEventsFragment) view);
+
+    public ShareEventsPresenter(IView view) { super((V2XShareEventsFragment) view); }
+
+    public void loadShareEventList() {
+        WorkThreadHandler.getInstance().post(() -> {
+            mView.getShareEventResponse();
+        });
     }
+
 }
diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
index c48b3bc1f5..9065e0893b 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
@@ -34,7 +34,7 @@
         android:layout_centerHorizontal="true"
         android:layout_gravity="top|center"
         android:layout_marginTop="34px"
-        android:background="@drawable/bg_v2x_event_live_show"
+        android:background="@drawable/v2xt_dw_common_corner_bkg_light"
         android:text="刷新"
         android:textColor="#FFFFFF"
         android:textSize="18px" />

From a45f82c70c902b992c14282e1c79762b31cf9cbe Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Tue, 18 Aug 2020 20:45:38 +0800
Subject: [PATCH 10/22] UI

---
 .../mogo/module/v2x/fragment/V2XShareEventsFragment.java  | 1 +
 modules/mogo-module-v2x/src/main/res/values/style.xml     | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index 2a08c5828a..07409ff4b3 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -79,6 +79,7 @@ public class V2XShareEventsFragment extends MvpFragment<V2XShareEventsFragment,
      * */
     @Override
     public void getShareEventResponse() {
+        pageNum = 1;
         ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
diff --git a/modules/mogo-module-v2x/src/main/res/values/style.xml b/modules/mogo-module-v2x/src/main/res/values/style.xml
index ee599daa9b..e7ecb3aa03 100644
--- a/modules/mogo-module-v2x/src/main/res/values/style.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/style.xml
@@ -6,10 +6,10 @@
 
     <style name="customRatingBarStyle" parent="@style/Widget.AppCompat.RatingBar">
         <item name="android:minHeight">16px</item>
-        <item name="android:maxHeight">26px</item>
-        <item name="android:maxWidth">18px</item>
-        <item name="android:minWidth">18px</item>
-        <item name="android:spacing">4dp</item>
+        <item name="android:maxHeight">16px</item>
+        <item name="android:maxWidth">19px</item>
+        <item name="android:minWidth">19px</item>
+        <item name="android:spacing">4px</item>
         <item name="android:numStars">5</item>
         <item name="android:rating">1</item>
         <item name="android:stepSize">0.5</item>

From fbbd976dc8eed3fd572990522dcb14dd0c2fe1a7 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Tue, 18 Aug 2020 20:45:38 +0800
Subject: [PATCH 11/22] UI

---
 .../mogo/module/v2x/fragment/V2XShareEventsFragment.java  | 1 +
 modules/mogo-module-v2x/src/main/res/values/style.xml     | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index 2a08c5828a..07409ff4b3 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -79,6 +79,7 @@ public class V2XShareEventsFragment extends MvpFragment<V2XShareEventsFragment,
      * */
     @Override
     public void getShareEventResponse() {
+        pageNum = 1;
         ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
diff --git a/modules/mogo-module-v2x/src/main/res/values/style.xml b/modules/mogo-module-v2x/src/main/res/values/style.xml
index ee599daa9b..e7ecb3aa03 100644
--- a/modules/mogo-module-v2x/src/main/res/values/style.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/style.xml
@@ -6,10 +6,10 @@
 
     <style name="customRatingBarStyle" parent="@style/Widget.AppCompat.RatingBar">
         <item name="android:minHeight">16px</item>
-        <item name="android:maxHeight">26px</item>
-        <item name="android:maxWidth">18px</item>
-        <item name="android:minWidth">18px</item>
-        <item name="android:spacing">4dp</item>
+        <item name="android:maxHeight">16px</item>
+        <item name="android:maxWidth">19px</item>
+        <item name="android:minWidth">19px</item>
+        <item name="android:spacing">4px</item>
         <item name="android:numStars">5</item>
         <item name="android:rating">1</item>
         <item name="android:stepSize">0.5</item>

From 7b796c65ba5c4151761fac7a3dd0d84ee95fe4f5 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Tue, 18 Aug 2020 21:28:09 +0800
Subject: [PATCH 12/22] UI

---
 .../res/layout/v2x_network_loading_item.xml   | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
index 9065e0893b..60ff28d81c 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/loading_liner_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -11,8 +13,12 @@
         android:layout_height="200px"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="100px"
-        android:background="@drawable/v_to_x_loading_car0000" />
+        android:background="@drawable/v_to_x_loading_car0000"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintVertical_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/loading_text"
@@ -22,9 +28,13 @@
         android:layout_centerHorizontal="true"
         android:layout_gravity="top|center"
         android:alpha="0.7"
+        android:paddingTop="14px"
         android:text="正在获取信息…"
         android:textColor="#FFFFFF"
-        android:textSize="18px" />
+        android:textSize="18px"
+        app:layout_constraintBottom_toBottomOf="@+id/loading_imageview"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <Button
         android:id="@+id/refresh_button"
@@ -37,6 +47,9 @@
         android:background="@drawable/v2xt_dw_common_corner_bkg_light"
         android:text="刷新"
         android:textColor="#FFFFFF"
-        android:textSize="18px" />
+        android:textSize="18px"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/loading_imageview" />
 
-</RelativeLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 6136e323ab7c3cd01815827cc88f930420b2ff4d Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Tue, 18 Aug 2020 21:28:09 +0800
Subject: [PATCH 13/22] UI

---
 .../res/layout/v2x_network_loading_item.xml   | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
index 9065e0893b..60ff28d81c 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/loading_liner_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -11,8 +13,12 @@
         android:layout_height="200px"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="100px"
-        android:background="@drawable/v_to_x_loading_car0000" />
+        android:background="@drawable/v_to_x_loading_car0000"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintVertical_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/loading_text"
@@ -22,9 +28,13 @@
         android:layout_centerHorizontal="true"
         android:layout_gravity="top|center"
         android:alpha="0.7"
+        android:paddingTop="14px"
         android:text="正在获取信息…"
         android:textColor="#FFFFFF"
-        android:textSize="18px" />
+        android:textSize="18px"
+        app:layout_constraintBottom_toBottomOf="@+id/loading_imageview"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <Button
         android:id="@+id/refresh_button"
@@ -37,6 +47,9 @@
         android:background="@drawable/v2xt_dw_common_corner_bkg_light"
         android:text="刷新"
         android:textColor="#FFFFFF"
-        android:textSize="18px" />
+        android:textSize="18px"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/loading_imageview" />
 
-</RelativeLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From aa67ca085f92d106e17ca32fceee98f5069d61ce Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 19 Aug 2020 10:25:08 +0800
Subject: [PATCH 14/22] ui

---
 .../src/main/res/layout/module_v2x_event_share_empty.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
index f0e63ae0ca..a0f5bd3e2c 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
@@ -28,7 +28,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="33px">
+        android:layout_marginTop="20px">
 
         <Button
             android:id="@+id/share_event_button"

From 3612f2123ff52a5e5beb129a979655846124ed44 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 19 Aug 2020 10:25:08 +0800
Subject: [PATCH 15/22] ui

---
 .../src/main/res/layout/module_v2x_event_share_empty.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
index f0e63ae0ca..a0f5bd3e2c 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
@@ -28,7 +28,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="33px">
+        android:layout_marginTop="20px">
 
         <Button
             android:id="@+id/share_event_button"

From 8544c1934292e12d0d51b83f607ef3a2cd85758d Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 19 Aug 2020 12:23:09 +0800
Subject: [PATCH 16/22] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=AD=97=E6=AE=B5=E5=A4=A7=E5=B0=8F=E5=86=99=E6=9C=89?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/v2x/adapter/V2XShareEventAdapter.java     |  2 +-
 .../module/v2x/entity/panel/V2XShareEventItem.java   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
index db1731d5f1..d13325056c 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
@@ -103,7 +103,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
                     String address = data.getUploadAddress();
                     String time = DateTimeUtils.getTimeText(data.getUploadTimestamp(),DateTimeUtils.MM_Yue_dd_Ri_HH_mm);
                     String likeNum = String.valueOf(data.getLikeNum());
-                    String notLikeNum = String.valueOf(data.getNotLikeNum());
+                    String notLikeNum = String.valueOf(data.getNotlikeNum());
 
                     if (poitype != null) {
                         ((shareItemViewHolder) holder).caseStyleTextView.setText(EventTypeUtils.getPoiTypeStr(poitype));
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventItem.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventItem.java
index 444ad06bb9..c6760db819 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventItem.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventItem.java
@@ -92,7 +92,7 @@ public class V2XShareEventItem extends BaseData implements Serializable {
                             ", userName='" + userName + '\'' +
                             ", userHead='" + userHead + '\'' +
                             ", likeNum=" + likeNum +
-                            ", notLikeNum=" + notLikeNum +
+                            ", notlikeNum=" + notlikeNum +
                             ", uploadType=" + uploadType +
                             ", uploadUser='" + uploadUser + '\'' +
                             ", imgUrl=" + imgUrl +
@@ -126,7 +126,7 @@ public class V2XShareEventItem extends BaseData implements Serializable {
                 private String userName;
                 private String userHead;
                 private Integer likeNum;
-                private int notLikeNum;
+                private int notlikeNum;
                 private Integer uploadType;
                 private String uploadUser;
                 private String imgUrl;
@@ -234,12 +234,12 @@ public class V2XShareEventItem extends BaseData implements Serializable {
                     this.likeNum = likeNum;
                 }
 
-                public int getNotLikeNum() {
-                    return notLikeNum;
+                public int getNotlikeNum() {
+                    return notlikeNum;
                 }
 
-                public void setNotLikeNum(int notLikeNum) {
-                    this.notLikeNum = notLikeNum;
+                public void setNotlikeNum(int notlikeNum) {
+                    this.notlikeNum = notlikeNum;
                 }
 
                 public Integer getUploadType() {

From 8d52789508b89a9b094d6b35ad82d35bd5ae4ea6 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 19 Aug 2020 12:23:09 +0800
Subject: [PATCH 17/22] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=AD=97=E6=AE=B5=E5=A4=A7=E5=B0=8F=E5=86=99=E6=9C=89?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/v2x/adapter/V2XShareEventAdapter.java     |  2 +-
 .../module/v2x/entity/panel/V2XShareEventItem.java   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
index db1731d5f1..d13325056c 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
@@ -103,7 +103,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
                     String address = data.getUploadAddress();
                     String time = DateTimeUtils.getTimeText(data.getUploadTimestamp(),DateTimeUtils.MM_Yue_dd_Ri_HH_mm);
                     String likeNum = String.valueOf(data.getLikeNum());
-                    String notLikeNum = String.valueOf(data.getNotLikeNum());
+                    String notLikeNum = String.valueOf(data.getNotlikeNum());
 
                     if (poitype != null) {
                         ((shareItemViewHolder) holder).caseStyleTextView.setText(EventTypeUtils.getPoiTypeStr(poitype));
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventItem.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventItem.java
index 444ad06bb9..c6760db819 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventItem.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventItem.java
@@ -92,7 +92,7 @@ public class V2XShareEventItem extends BaseData implements Serializable {
                             ", userName='" + userName + '\'' +
                             ", userHead='" + userHead + '\'' +
                             ", likeNum=" + likeNum +
-                            ", notLikeNum=" + notLikeNum +
+                            ", notlikeNum=" + notlikeNum +
                             ", uploadType=" + uploadType +
                             ", uploadUser='" + uploadUser + '\'' +
                             ", imgUrl=" + imgUrl +
@@ -126,7 +126,7 @@ public class V2XShareEventItem extends BaseData implements Serializable {
                 private String userName;
                 private String userHead;
                 private Integer likeNum;
-                private int notLikeNum;
+                private int notlikeNum;
                 private Integer uploadType;
                 private String uploadUser;
                 private String imgUrl;
@@ -234,12 +234,12 @@ public class V2XShareEventItem extends BaseData implements Serializable {
                     this.likeNum = likeNum;
                 }
 
-                public int getNotLikeNum() {
-                    return notLikeNum;
+                public int getNotlikeNum() {
+                    return notlikeNum;
                 }
 
-                public void setNotLikeNum(int notLikeNum) {
-                    this.notLikeNum = notLikeNum;
+                public void setNotlikeNum(int notlikeNum) {
+                    this.notlikeNum = notlikeNum;
                 }
 
                 public Integer getUploadType() {

From e89706a4d7b3ac9073b713a4201fd1d76af643e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Wed, 19 Aug 2020 14:15:12 +0800
Subject: [PATCH 18/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E7=AA=97=E4=BD=93=E5=90=8E=E4=BF=AE=E6=94=B9=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=9A=84=E6=97=B6=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/v2x/scenario/scene/road/V2XRoadEventScenario.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java
index a2d89e3cba..f2565bbf67 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java
@@ -211,7 +211,6 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
     @Override
     public void onViewRemoved(View view) {
         Logger.d(MODULE_NAME, "关闭 Window 动画结束");
-        V2XServiceManager.getMoGoV2XStatusManager().setRoadEventWindowShow(TAG, false);
     }
 
     @Override
@@ -222,6 +221,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
     @Override
     public void beforeViewRemoveAnim(View view) {
         Logger.d(MODULE_NAME, "关闭 Window 开始");
+        V2XServiceManager.getMoGoV2XStatusManager().setRoadEventWindowShow(TAG, false);
         // 重置场景提示的消息
         setV2XMessageEntity(null);
         clearPOI();

From 05285fa0b6e36284a65a47510fa95528fac33d03 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 19 Aug 2020 14:20:51 +0800
Subject: [PATCH 19/22] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=9B=BF=E6=8D=A2,?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawable-ldpi/icon_enthusiasm_choose.png    | Bin 746 -> 762 bytes
 .../drawable-ldpi/icon_enthusiasm_second.png    | Bin 703 -> 715 bytes
 .../drawable-ldpi/icon_enthusiasm_unchoose.png  | Bin 601 -> 542 bytes
 .../module_v2x_event_share_recylerview.xml      |   7 -------
 4 files changed, 7 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_choose.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_choose.png
index 2e4cfcd7d790b4fbb74334d84c47c444d21d41e8..48218a14a8cdd739b0730c8f9f3df419933656dc 100644
GIT binary patch
delta 704
zcmV;x0zdug1^NXciBL{Q4GJ0x0000DNk~Le0000K0000G2nGNE02UZu8<8PMe-xkt
z00aO40096101yBG002i_Ry_a!0%S=<K~y*qm6W?{R6!KR=iEd@d=SLWLNO#o&}~FS
z2tE=tM8PhwKAIKrAFvd{3N|*{Ss5XcN)d$Zg6M|b5F=`1Q2zieQW!)**m&<be&3lp
zn^jZj?%q2y=kc5GoEcU^`LU^~e{JjEzTCj_teOoK5<Z#P+>Wg~?@FWbgJEAM#|As=
z`Lt;`Q<(Otg!dZk-o6)$k4j7sP8{}q?X{_nDAxX%1%LyRKJ;aBzLV==3t>i8w-=b;
z7yX!7$nG3iXkRDGft`u*n=ns1Ac0CSmchi<3bO&#kU^1y2qah`*HgCie;*lo-g=vn
z3iCO_d{?Y|^k5`om8<Pm$Vf0&fDPc`S6ESIc`->+KVL8myE@DXi@^zuB*Hz}V|`6q
zigTapFj=k;uvLOm$tKv93JBupJ^&yS2jy^wpkcA!Y)iJ<1)7959bG6BQA$#P6LozF
z95>=-8ylj}?Jf|G+weg^e`<JCK`fIT<SJ>8rKT+yQv`cAvar<X0(Z?fKf-~NX0kWg
zOZ`nXOGk+;ImVUhL^?>Ti3rWHhnx(|H*W!UKdS60-&GR?0OUeV>|wP3)F9PLd-)9+
z{FK)Q7ZN+{dDgsUnLOAi9S{Jhj3XajUGH6x9P?_Wwe-|U<;yR2f3E>0$>*`-Gr1Nu
zrl%hAVB(1qEIIbC9&9Z?>CNT5t1vmJbnl7rtGGI|4umR)VZpLt&w;$S8EjJ^jZ&}c
z{*$M#pu~si9{PdsfHhpIv|l|=0{$HTQkVh=9XvHrLlJXcHie2^KD79<`_GbM|7)~*
mJzE()I=eD@?83h!7XAWEr`D%G2z74&0000<MNUMnLSTYM4l{26

delta 688
zcmV;h0#E(=1?mMMiBL{Q4GJ0x0000DNk~Le0000J0000G2nGNE0QAH}Vv!+8e-oes
z00aO40096101yBG003vtDs}(>0#r#vK~y*qeN;_r6hRQ}8h71QG#5W$59&n)U4wX3
zT;fMW<KhQ;2@)X(4_*WhISIlN4}##&5XJQa1wl57gGR-ZAR<E0lORSsDH5|YRle6f
zGuarEhVHJee)Z~A_3VnvMsnoPfAPfhqMFqWK6Ca&UHM91r}L2z8{Jo({*qo$bEBqi
z6L3=|Hc?qy9$(*%e-R^Gx<d!YQ?<(^0m!A8+;KgF?Yyf*ad#$tkecpPromO}ci1AI
zR`t1E>mI)RDb^g^)=l(XVpbx7f+8o)_td!`X0`^ZkVJtIpDf@(7|Hc5fAOoasH=Jy
zN=gjOrw5T3lPUudZ4%{#@Ov9)bxoMA1Y_$0ML-20i2%ll=X?f2CJR0!+-$8@R5H_V
zs2l7I$u6^CCNW<U)vyJ*nmKa%MdZ7*S{k{iJQ;$r08bEX68SPof~R7#xt``2JcijM
zu3WU@@x)Vr-h}27fFP<Uf0R&B2=o{%Me^V`iR7v$^NYB1$o!kxSxQhtJ15D?!(Fb7
zk3p}BU8_HT{k9-m-HG2L>=ZtMKcR2EPhT{-P~?;O3gkxr;L%GY;_x4BFrAw|Ffi10
zdSBHl%vvb)WzScN$eZ=r#<S9HLqizz$msgIztNmky@w)}gTt2<e@bG>oO}$qwWGFS
zq?d@X5trUkd-mcH-ug7+X7irGhR$q?-2NXCITk3RljHNi-eZZTcf3NJsR+Nvc7JK*
z8HwY>gZ^0-B_nRCvF8N-N!lPRo5|gJxjMWU5%Eis5%8h0`y{$FynR`9WGNzI{{q3*
W*cQVC@#z2n002ov22Mn-LSTaCZa9bl

diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png
index 2bad8382fdfad5388b0ac8d9ea90ab6001d96279..1f42366be22ca5a48b9ff52d1cd33942ae4afde8 100644
GIT binary patch
delta 656
zcmV;B0&o4l1<M5?iBL{Q4GJ0x0000DNk~Le0000K0000G2nGNE02UZu8<8PMe-xkt
z00aO40096101yBG002i_Ry_a!0yRlQK~y*qrISHxQ$Y~NXSOu~wV+2m^r9tdK@vn#
zNYYQ>p$GjAq98>oih`twQ6efu5b-<cr3ax1rD?3ilj2Epmr(T}Xrb+UGtPhBdm3#X
z2oAj6+1Z)j&g|@CN~PE975f{Tf7eLm3=x-zbc2+i6$-_6wR-$3+;nE<!1mU+D<t8Z
zs2mdJkD~Nqe{o-n7Z*3-!x$Xa|NcgaPGUVM%=9Vn$l24axoz2ro-66Nn1h;gtU@-C
z5Pvur3a5B!=|?~?G8+cNo&_EjjbBQ%vuxqxu^D0!iVOxY)|PGQOT2XxfBp_k%EWTG
zSj^r?bj)Gq65D5`I?Qe6U<cS$5shL<?<`Ss#sp#oTQJH52s1u0-42-0W-~a@ocd-T
zvoBXrrrL#iuz6*m3~t@{%+02F$sBk!my~Y!eOVgFG%GVU8gwsTv;$WM?infEH9dkM
zPwWmYSO#DQvOFUPs)&xZe-P`ysi_k^({AL!U`KG)jI6tnU4v&A=+====RN!!2xYof
zX>*_j=)(k=pgcU6BwK%fIOyro<yZ4r%r77ejap?kFh9&T2j{eto{?vZ14y4ttgM}9
zX7tA84<Ib{dik<7>3*{PdqlY?(IED)?a8n{F0HIx7=*!l7ZAoqX01HO#BJ!AcxO{s
z%=GA3XZ_;eF!&AyVx!S0U$wV&2RZ~<p#k>aE=;bjUrMaI$6O#>r|XsLOyM?ke{W0=
qCcCd^vHmaVcHhpwYgF(33*;w&Z%NXr5aJL30000<MNUMnLSTYF3nNwl

delta 644
zcmV-~0(<?-1-}I$iBL{Q4GJ0x0000DNk~Le0000J0000G2nGNE0QAH}Vv!+8e-oes
z00aO40096101yBG003vtDs}(>0x3yEK~y*qos&Up6HySyXI^6hYC(^B=tWD^f+UEf
zkZeDJhaU7hh=LTUC<>AyMv15tL8RZIUV0FUP@2YCJSm<ucL`Mwf)?8D&h!6&o7HF&
z5C?YOyxIT!GBfW*1=i_w3f;}Ee;eZMoQM`h{HAza%;yWuO6BBNYW(!{p`Gn-*Tmcf
z^LE5kKbn^p2MY%py0o-KjRsKn`x`HEnt^^(l}}Db&Yx|}?$~bp+>0MG2t34zH^Cw%
z`r)w4pV8&zAC46b0uhR&qvn&B7VoYgbu2+3F_Rb|Lb*qk#V^VBZR%axe;VDv2L1ln
z{Ad6{lHfsm0Tf~o0FLp9<a#rrKh#nHnnWU7BZMm-gAe$)uh(4;f-YjCc!nBV^B7=A
zgerq%U{U$3^}0EAx;B*3`w-@XpJ#<xYY9m7L(Aq{l)8N*`TJO7ZiX3VhD7TF0fPGC
z0P|)(*I=%joIKURG29vke`1`8+2FHNjL~|i%E_H$t=4<$9A8t_a#Nkm(;sB4fGzP#
zq*aFd#UEKXzVd1=%Ly=UqH1}@sXop=^sl`W3zdW_2^arte0BYzs`4Cy{ep2<tCg<e
zKpv)_e!tlw+X4WW7S}@k)8gv-rG60Af4~@ss-;;KZPL#yoL~=>TBtlZ(b~BDH;CFj
zFb1QjbRBo+9(@|C;jr;PoS#_RxROTqz6Zi6o2r#>s<^xK!+lbDG|_%N!~K6-yZv_V
eT~vASFMyvweo4}&ve`TU0000<MNUMnLSTZEkShrQ

diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_unchoose.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_unchoose.png
index 429ab585d075a7cae49da1991a35b7e228d99231..932cb60d4453f2879ca850624871ea1d69dcc26a 100644
GIT binary patch
delta 482
zcmV<80UiF?1fB#TiBL{Q4GJ0x0000DNk~Le0000K0000G2nGNE02UZu8<8PMe-xkt
z00aO40096101yBG002i_Ry_a!0f<RNK~y*qm6E?o13?hRXEvBXuoFVC52A&+G$xR{
zJb{(?9{xdzsEwc)f?|9R?JVss7O^qfh+HorU?)N}-nuh)3zuYbIT!YJXTINj?9MGh
zI6TkG^!i^1ApLa!Tmq1Nka(L;e`lKI^702^ozCmR;OD!J;BP1<r<gZDahK0!8-+q)
zKn&7{&3d1Y5@40$=s<*bfvHW(`SSNhN?45Qv{xoC`TYDEnF>nK$xLRXk%2P0r)e@{
zMjeE2rvf$%u1S)4D5ES*vl?c(Roaky7K<kksqdkol(LtgA{Nmed}S2qf5y@YMD4+b
zbE$Mg)eIBVO+$vENAOcBl@(9zj;7JG@&e(IJrv0AP#3rlPc7-gmX4FGDB#+umbNt;
zJex3L0YyuTvsQt46*VJ%#E=p-ySSqod`bJ*fpB5l*6uhnVMu^ewe}FOIS%WXw3=Po
z*Ku?;8WP|*R$X=YJPPw(IOSNI5Q4<WPcbpB`+O?F=NEt=&K#$BY~ucvYqz^6G?Ntl
Y0XNZk<q*FMJ^%m!07*qoM6N<$g4VgrzW@LL

delta 541
zcmV+&0^<Fi1la^3iBL{Q4GJ0x0000DNk~Le0000J0000G2nGNE0QAH}Vv!+8e-oes
z00aO40096101yBG003vtDs}(>0mDf|K~y*qom0&#L{St!=RUKTVQgf_O0pPcMp=w`
zbCnI*$X8kV6Z`{qtSL%S{sBr!lwx6G%%FsZZ0yKK5&1T6j&o-`&$~=M?&hA~$NAm!
zZucR)uViw!;w3|a2oNEHN~Vvvf1ZfNLQ{xnDO)13S7&9j13=Uah{V(Z*W*&w&nTV!
z0P*C05Hr>q5&0E%ErdAuN_xb@eJ=qG^Fbb$&Hw>Nr40Ay!`5~ZK+ve0Y|N%h9;4jG
z`p%OR2S$xl>afhRGGn?y!^IlbA%cK2!9g{;@-LjF8V;kge>H1Ogm^Bbe+(Y;H=k(Q
zpCJ;(h3eu99{O{)yWubv3(w}lOfxjefy-|Fw+NpN;ptOvF+Uk%*6S_p;Tbo78=-uN
z@M;LrYnruN3g^O9(a=zJ<MaAk_`ReQ{%P?fFF>N(G=p=t_ajUZD$wI8ZsAMZunphu
z_$-jRqzuh})?Hyrh(xMya|L)?dBXM2MyFOmqSG|%7aT5M<$fofR5+bZmt0-HF7p2>
z9UY&F4CshP!%Gh5R9_~ur9dEXSL(+$K5bQTeA$lzjrKx8Igj03Xy4vG^*uaYOoPCY
frf6uTkWcY%I+TJd%GJiJ00000NkvXXu0mjf2ix)=

diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml
index 4bb91aa58e..237458f7a2 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml
@@ -13,13 +13,6 @@
         android:overScrollMode="never"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"></androidx.recyclerview.widget.RecyclerView>
 
-<!--    <RelativeLayout-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="match_parent"-->
-<!--        android:layout_centerInParent="true">-->
-
-<!--        -->
-<!--    </RelativeLayout>-->
     <com.mogo.module.v2x.view.V2XNetworkLoadingView
         android:id="@+id/network_loading_imageview"
         android:layout_width="wrap_content"

From a32181b580253eaab8cc45a956aefb52c5d8ba99 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 19 Aug 2020 14:20:51 +0800
Subject: [PATCH 20/22] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=9B=BF=E6=8D=A2,?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawable-ldpi/icon_enthusiasm_choose.png    | Bin 746 -> 762 bytes
 .../drawable-ldpi/icon_enthusiasm_second.png    | Bin 703 -> 715 bytes
 .../drawable-ldpi/icon_enthusiasm_unchoose.png  | Bin 601 -> 542 bytes
 .../module_v2x_event_share_recylerview.xml      |   7 -------
 4 files changed, 7 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_choose.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_choose.png
index 2e4cfcd7d790b4fbb74334d84c47c444d21d41e8..48218a14a8cdd739b0730c8f9f3df419933656dc 100644
GIT binary patch
delta 704
zcmV;x0zdug1^NXciBL{Q4GJ0x0000DNk~Le0000K0000G2nGNE02UZu8<8PMe-xkt
z00aO40096101yBG002i_Ry_a!0%S=<K~y*qm6W?{R6!KR=iEd@d=SLWLNO#o&}~FS
z2tE=tM8PhwKAIKrAFvd{3N|*{Ss5XcN)d$Zg6M|b5F=`1Q2zieQW!)**m&<be&3lp
zn^jZj?%q2y=kc5GoEcU^`LU^~e{JjEzTCj_teOoK5<Z#P+>Wg~?@FWbgJEAM#|As=
z`Lt;`Q<(Otg!dZk-o6)$k4j7sP8{}q?X{_nDAxX%1%LyRKJ;aBzLV==3t>i8w-=b;
z7yX!7$nG3iXkRDGft`u*n=ns1Ac0CSmchi<3bO&#kU^1y2qah`*HgCie;*lo-g=vn
z3iCO_d{?Y|^k5`om8<Pm$Vf0&fDPc`S6ESIc`->+KVL8myE@DXi@^zuB*Hz}V|`6q
zigTapFj=k;uvLOm$tKv93JBupJ^&yS2jy^wpkcA!Y)iJ<1)7959bG6BQA$#P6LozF
z95>=-8ylj}?Jf|G+weg^e`<JCK`fIT<SJ>8rKT+yQv`cAvar<X0(Z?fKf-~NX0kWg
zOZ`nXOGk+;ImVUhL^?>Ti3rWHhnx(|H*W!UKdS60-&GR?0OUeV>|wP3)F9PLd-)9+
z{FK)Q7ZN+{dDgsUnLOAi9S{Jhj3XajUGH6x9P?_Wwe-|U<;yR2f3E>0$>*`-Gr1Nu
zrl%hAVB(1qEIIbC9&9Z?>CNT5t1vmJbnl7rtGGI|4umR)VZpLt&w;$S8EjJ^jZ&}c
z{*$M#pu~si9{PdsfHhpIv|l|=0{$HTQkVh=9XvHrLlJXcHie2^KD79<`_GbM|7)~*
mJzE()I=eD@?83h!7XAWEr`D%G2z74&0000<MNUMnLSTYM4l{26

delta 688
zcmV;h0#E(=1?mMMiBL{Q4GJ0x0000DNk~Le0000J0000G2nGNE0QAH}Vv!+8e-oes
z00aO40096101yBG003vtDs}(>0#r#vK~y*qeN;_r6hRQ}8h71QG#5W$59&n)U4wX3
zT;fMW<KhQ;2@)X(4_*WhISIlN4}##&5XJQa1wl57gGR-ZAR<E0lORSsDH5|YRle6f
zGuarEhVHJee)Z~A_3VnvMsnoPfAPfhqMFqWK6Ca&UHM91r}L2z8{Jo({*qo$bEBqi
z6L3=|Hc?qy9$(*%e-R^Gx<d!YQ?<(^0m!A8+;KgF?Yyf*ad#$tkecpPromO}ci1AI
zR`t1E>mI)RDb^g^)=l(XVpbx7f+8o)_td!`X0`^ZkVJtIpDf@(7|Hc5fAOoasH=Jy
zN=gjOrw5T3lPUudZ4%{#@Ov9)bxoMA1Y_$0ML-20i2%ll=X?f2CJR0!+-$8@R5H_V
zs2l7I$u6^CCNW<U)vyJ*nmKa%MdZ7*S{k{iJQ;$r08bEX68SPof~R7#xt``2JcijM
zu3WU@@x)Vr-h}27fFP<Uf0R&B2=o{%Me^V`iR7v$^NYB1$o!kxSxQhtJ15D?!(Fb7
zk3p}BU8_HT{k9-m-HG2L>=ZtMKcR2EPhT{-P~?;O3gkxr;L%GY;_x4BFrAw|Ffi10
zdSBHl%vvb)WzScN$eZ=r#<S9HLqizz$msgIztNmky@w)}gTt2<e@bG>oO}$qwWGFS
zq?d@X5trUkd-mcH-ug7+X7irGhR$q?-2NXCITk3RljHNi-eZZTcf3NJsR+Nvc7JK*
z8HwY>gZ^0-B_nRCvF8N-N!lPRo5|gJxjMWU5%Eis5%8h0`y{$FynR`9WGNzI{{q3*
W*cQVC@#z2n002ov22Mn-LSTaCZa9bl

diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png
index 2bad8382fdfad5388b0ac8d9ea90ab6001d96279..1f42366be22ca5a48b9ff52d1cd33942ae4afde8 100644
GIT binary patch
delta 656
zcmV;B0&o4l1<M5?iBL{Q4GJ0x0000DNk~Le0000K0000G2nGNE02UZu8<8PMe-xkt
z00aO40096101yBG002i_Ry_a!0yRlQK~y*qrISHxQ$Y~NXSOu~wV+2m^r9tdK@vn#
zNYYQ>p$GjAq98>oih`twQ6efu5b-<cr3ax1rD?3ilj2Epmr(T}Xrb+UGtPhBdm3#X
z2oAj6+1Z)j&g|@CN~PE975f{Tf7eLm3=x-zbc2+i6$-_6wR-$3+;nE<!1mU+D<t8Z
zs2mdJkD~Nqe{o-n7Z*3-!x$Xa|NcgaPGUVM%=9Vn$l24axoz2ro-66Nn1h;gtU@-C
z5Pvur3a5B!=|?~?G8+cNo&_EjjbBQ%vuxqxu^D0!iVOxY)|PGQOT2XxfBp_k%EWTG
zSj^r?bj)Gq65D5`I?Qe6U<cS$5shL<?<`Ss#sp#oTQJH52s1u0-42-0W-~a@ocd-T
zvoBXrrrL#iuz6*m3~t@{%+02F$sBk!my~Y!eOVgFG%GVU8gwsTv;$WM?infEH9dkM
zPwWmYSO#DQvOFUPs)&xZe-P`ysi_k^({AL!U`KG)jI6tnU4v&A=+====RN!!2xYof
zX>*_j=)(k=pgcU6BwK%fIOyro<yZ4r%r77ejap?kFh9&T2j{eto{?vZ14y4ttgM}9
zX7tA84<Ib{dik<7>3*{PdqlY?(IED)?a8n{F0HIx7=*!l7ZAoqX01HO#BJ!AcxO{s
z%=GA3XZ_;eF!&AyVx!S0U$wV&2RZ~<p#k>aE=;bjUrMaI$6O#>r|XsLOyM?ke{W0=
qCcCd^vHmaVcHhpwYgF(33*;w&Z%NXr5aJL30000<MNUMnLSTYF3nNwl

delta 644
zcmV-~0(<?-1-}I$iBL{Q4GJ0x0000DNk~Le0000J0000G2nGNE0QAH}Vv!+8e-oes
z00aO40096101yBG003vtDs}(>0x3yEK~y*qos&Up6HySyXI^6hYC(^B=tWD^f+UEf
zkZeDJhaU7hh=LTUC<>AyMv15tL8RZIUV0FUP@2YCJSm<ucL`Mwf)?8D&h!6&o7HF&
z5C?YOyxIT!GBfW*1=i_w3f;}Ee;eZMoQM`h{HAza%;yWuO6BBNYW(!{p`Gn-*Tmcf
z^LE5kKbn^p2MY%py0o-KjRsKn`x`HEnt^^(l}}Db&Yx|}?$~bp+>0MG2t34zH^Cw%
z`r)w4pV8&zAC46b0uhR&qvn&B7VoYgbu2+3F_Rb|Lb*qk#V^VBZR%axe;VDv2L1ln
z{Ad6{lHfsm0Tf~o0FLp9<a#rrKh#nHnnWU7BZMm-gAe$)uh(4;f-YjCc!nBV^B7=A
zgerq%U{U$3^}0EAx;B*3`w-@XpJ#<xYY9m7L(Aq{l)8N*`TJO7ZiX3VhD7TF0fPGC
z0P|)(*I=%joIKURG29vke`1`8+2FHNjL~|i%E_H$t=4<$9A8t_a#Nkm(;sB4fGzP#
zq*aFd#UEKXzVd1=%Ly=UqH1}@sXop=^sl`W3zdW_2^arte0BYzs`4Cy{ep2<tCg<e
zKpv)_e!tlw+X4WW7S}@k)8gv-rG60Af4~@ss-;;KZPL#yoL~=>TBtlZ(b~BDH;CFj
zFb1QjbRBo+9(@|C;jr;PoS#_RxROTqz6Zi6o2r#>s<^xK!+lbDG|_%N!~K6-yZv_V
eT~vASFMyvweo4}&ve`TU0000<MNUMnLSTZEkShrQ

diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_unchoose.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_unchoose.png
index 429ab585d075a7cae49da1991a35b7e228d99231..932cb60d4453f2879ca850624871ea1d69dcc26a 100644
GIT binary patch
delta 482
zcmV<80UiF?1fB#TiBL{Q4GJ0x0000DNk~Le0000K0000G2nGNE02UZu8<8PMe-xkt
z00aO40096101yBG002i_Ry_a!0f<RNK~y*qm6E?o13?hRXEvBXuoFVC52A&+G$xR{
zJb{(?9{xdzsEwc)f?|9R?JVss7O^qfh+HorU?)N}-nuh)3zuYbIT!YJXTINj?9MGh
zI6TkG^!i^1ApLa!Tmq1Nka(L;e`lKI^702^ozCmR;OD!J;BP1<r<gZDahK0!8-+q)
zKn&7{&3d1Y5@40$=s<*bfvHW(`SSNhN?45Qv{xoC`TYDEnF>nK$xLRXk%2P0r)e@{
zMjeE2rvf$%u1S)4D5ES*vl?c(Roaky7K<kksqdkol(LtgA{Nmed}S2qf5y@YMD4+b
zbE$Mg)eIBVO+$vENAOcBl@(9zj;7JG@&e(IJrv0AP#3rlPc7-gmX4FGDB#+umbNt;
zJex3L0YyuTvsQt46*VJ%#E=p-ySSqod`bJ*fpB5l*6uhnVMu^ewe}FOIS%WXw3=Po
z*Ku?;8WP|*R$X=YJPPw(IOSNI5Q4<WPcbpB`+O?F=NEt=&K#$BY~ucvYqz^6G?Ntl
Y0XNZk<q*FMJ^%m!07*qoM6N<$g4VgrzW@LL

delta 541
zcmV+&0^<Fi1la^3iBL{Q4GJ0x0000DNk~Le0000J0000G2nGNE0QAH}Vv!+8e-oes
z00aO40096101yBG003vtDs}(>0mDf|K~y*qom0&#L{St!=RUKTVQgf_O0pPcMp=w`
zbCnI*$X8kV6Z`{qtSL%S{sBr!lwx6G%%FsZZ0yKK5&1T6j&o-`&$~=M?&hA~$NAm!
zZucR)uViw!;w3|a2oNEHN~Vvvf1ZfNLQ{xnDO)13S7&9j13=Uah{V(Z*W*&w&nTV!
z0P*C05Hr>q5&0E%ErdAuN_xb@eJ=qG^Fbb$&Hw>Nr40Ay!`5~ZK+ve0Y|N%h9;4jG
z`p%OR2S$xl>afhRGGn?y!^IlbA%cK2!9g{;@-LjF8V;kge>H1Ogm^Bbe+(Y;H=k(Q
zpCJ;(h3eu99{O{)yWubv3(w}lOfxjefy-|Fw+NpN;ptOvF+Uk%*6S_p;Tbo78=-uN
z@M;LrYnruN3g^O9(a=zJ<MaAk_`ReQ{%P?fFF>N(G=p=t_ajUZD$wI8ZsAMZunphu
z_$-jRqzuh})?Hyrh(xMya|L)?dBXM2MyFOmqSG|%7aT5M<$fofR5+bZmt0-HF7p2>
z9UY&F4CshP!%Gh5R9_~ur9dEXSL(+$K5bQTeA$lzjrKx8Igj03Xy4vG^*uaYOoPCY
frf6uTkWcY%I+TJd%GJiJ00000NkvXXu0mjf2ix)=

diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml
index 4bb91aa58e..237458f7a2 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml
@@ -13,13 +13,6 @@
         android:overScrollMode="never"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"></androidx.recyclerview.widget.RecyclerView>
 
-<!--    <RelativeLayout-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="match_parent"-->
-<!--        android:layout_centerInParent="true">-->
-
-<!--        -->
-<!--    </RelativeLayout>-->
     <com.mogo.module.v2x.view.V2XNetworkLoadingView
         android:id="@+id/network_loading_imageview"
         android:layout_width="wrap_content"

From efa2ec578f4958f5dd86d4adaf73c34ca0be5375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Wed, 19 Aug 2020 14:53:12 +0800
Subject: [PATCH 21/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E7=AA=97=E4=BD=93=E5=90=8E=E4=BF=AE=E6=94=B9=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=9A=84=E6=97=B6=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java   | 5 +++--
 .../module/v2x/scenario/scene/push/V2XPushEventScenario.java | 2 +-
 .../module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java
index 6c06102a66..aa70d637ee 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java
@@ -127,8 +127,7 @@ public class V2XRoadLiveCarScenario extends AbsV2XScenario<List<V2XEventShowEnti
     @Override
     public void onViewRemoved(View view) {
         Logger.d(MODULE_NAME, "关闭 Window 动画结束");
-        // 警报状态，true-警报中，false-警报结束
-        V2XServiceManager.getMoGoV2XStatusManager().setRoadLiveCarWindowShow(TAG, false);
+
     }
 
     @Override
@@ -139,6 +138,8 @@ public class V2XRoadLiveCarScenario extends AbsV2XScenario<List<V2XEventShowEnti
     @Override
     public void beforeViewRemoveAnim(View view) {
         Logger.d(MODULE_NAME, "关闭 Window 开始");
+        // 警报状态，true-警报中，false-警报结束
+        V2XServiceManager.getMoGoV2XStatusManager().setRoadLiveCarWindowShow(TAG, false);
         // 打开直播后，窗口倒计时暂停关闭，直播被关闭后继续倒计时
         V2XRoadEventWindow window = (V2XRoadEventWindow) V2XRoadEventScenario.getInstance().getV2XWindow();
         window.startCountDown();
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java
index 5fc836c2aa..da696e8977 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java
@@ -131,7 +131,6 @@ public class V2XPushEventScenario extends AbsV2XScenario<V2XPushMessageEntity> i
     @Override
     public void onViewRemoved(View view) {
         Logger.d(MODULE_NAME, "关闭 Window 动画结束");
-        V2XServiceManager.getMoGoV2XStatusManager().setPushWindowShow(TAG, false);
     }
 
     @Override
@@ -142,6 +141,7 @@ public class V2XPushEventScenario extends AbsV2XScenario<V2XPushMessageEntity> i
     @Override
     public void beforeViewRemoveAnim(View view) {
         Logger.d(MODULE_NAME, "关闭 Window 开始");
+        V2XServiceManager.getMoGoV2XStatusManager().setPushWindowShow(TAG, false);
         // 重置场景提示的消息
         setV2XMessageEntity(null);
         clearPOI();
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
index 79bcc6420b..10da5513fe 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
@@ -160,7 +160,6 @@ public class V2XSeekHelpScenario extends AbsV2XScenario<List<V2XMarkerEntity>> i
     @Override
     public void onViewRemoved(View view) {
         Logger.d(MODULE_NAME, "关闭 Window 动画结束");
-        V2XServiceManager.getMoGoV2XStatusManager().setOtherSeekHelpWindowShow(TAG, false);
     }
 
     @Override
@@ -171,6 +170,7 @@ public class V2XSeekHelpScenario extends AbsV2XScenario<List<V2XMarkerEntity>> i
     @Override
     public void beforeViewRemoveAnim(View view) {
         Logger.d(MODULE_NAME, "关闭 Window 开始");
+        V2XServiceManager.getMoGoV2XStatusManager().setOtherSeekHelpWindowShow(TAG, false);
         // 重置场景提示的消息
         setV2XMessageEntity(null);
         clearPOI();

From b83bead690f6891a655bfceb4afccb599864ae2e Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Wed, 19 Aug 2020 15:06:43 +0800
Subject: [PATCH 22/22] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=8A=93=E5=8F=96=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/module/monitor/MogoMonitorConst.java |   6 +-
 .../module/monitor/MogoMonitorProvider.java   | 100 +++++++++++++++---
 .../monitor/bean/RemoteLogPushContent.java    |   9 ++
 3 files changed, 97 insertions(+), 18 deletions(-)

diff --git a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorConst.java b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorConst.java
index 138952c65e..b72b0fde8f 100644
--- a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorConst.java
+++ b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorConst.java
@@ -17,9 +17,5 @@ class MogoMonitorConst {
      */
     public static final int LOCAL_CONFIG_CLOSE_LOG = 4;
 
-
-    public static final String BROADCAST_START_CATCH_LOG = "com.mogo.controller.action" +
-            ".START_CATCH_LOG";
-    public static final String BROADCAST_STOP_CATCH_LOG = "com.mogo.controller.action" +
-            ".STOP_CATCH_LOG";
+    public static final String BROADCAST_LOG_CTRL = "com.mogo.control.action.LOG_CTRL";
 }
diff --git a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java
index 83e03c85bb..b61b845b08 100644
--- a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java
+++ b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java
@@ -1,8 +1,11 @@
 package com.zhidao.mogo.module.monitor;
 
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.util.ArrayMap;
+import android.os.Handler;
+import android.os.Message;
+import android.widget.Toast;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -14,11 +17,13 @@ import com.mogo.service.monitor.IMogoMonitorProvider;
 import com.mogo.utils.logger.LogLevel;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.NetConfig;
+import com.mogo.utils.network.utils.GsonUtil;
 import com.zhidao.mogo.module.monitor.bean.RemoteLogPushContent;
 import com.zhidao.mogo.module.monitor.dialog.ILogDialogListener;
 import com.zhidao.mogo.module.monitor.dialog.LogDebugDialog;
 
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 应用监控模块provider
@@ -27,10 +32,15 @@ import java.util.Map;
  */
 @Route(path = MogoMonitorConst.MODULE_PATH)
 public class MogoMonitorProvider implements IMogoMonitorProvider,
-        IMogoOnMessageListener<RemoteLogPushContent>, ILogDialogListener {
+        IMogoOnMessageListener<RemoteLogPushContent>, ILogDialogListener, Handler.Callback {
     private static final String TAG = MogoMonitorConst.MODULE_NAME;
+    private static final int MSG_TRY_CLOSE_LOG = 1001;
+    private static final String MANUAL_CATCH_PKG_NAME = "manual-catch-log";
     private Context context;
     private LogDebugDialog logDebugDialog;
+    private RemoteLogPushContent manualContent = new RemoteLogPushContent(60,
+            MANUAL_CATCH_PKG_NAME);
+    private Handler handler = new Handler(this);
     @Override
     public void showLogDebugDialog() {
         logDebugDialog.show();
@@ -43,11 +53,22 @@ public class MogoMonitorProvider implements IMogoMonitorProvider,
         apis.getSocketManagerApi(context).registerOnMessageListener(MogoMonitorConst.LOG_PUSH_TYPE, this);
     }
 
+    private void startRemoteCtrl(){
+        Intent intent = new Intent("com.mogo.remotecontrol.action");
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        ComponentName comp = new ComponentName("com.mogo.remotecontrol",
+                "com.mogo.remotecontrol.RemoteCtrlService");
+        intent.setComponent(comp);
+        context.startService(intent);
+        Logger.d(TAG, "startRemoteCtrl");
+    }
+
     @Override
     public void resetActivityContext(Context context) {
         this.context = context;
         logDebugDialog = new LogDebugDialog(context);
         logDebugDialog.setDialogListener(this);
+        startRemoteCtrl();
     }
 
     @Override
@@ -60,10 +81,12 @@ public class MogoMonitorProvider implements IMogoMonitorProvider,
         Logger.d(TAG, "收到push消息: " + obj);
         switch (obj.getType()) {
             case MogoMonitorConst.START_CATCH_LOG:
-                onLogStart();
+                if(!catchingList.contains(obj.getPkgName())){
+                    startCatchLog(obj);
+                }
                 break;
             case MogoMonitorConst.STOP_CATCH_LOG:
-                onLogStop();
+                stopCatchLog(obj);
                 break;
             case MogoMonitorConst.LOCAL_CONFIG_OPEN_LOG:
                 openLoggerLevel();
@@ -76,20 +99,37 @@ public class MogoMonitorProvider implements IMogoMonitorProvider,
         }
     }
 
+    private List<String> catchingList = new ArrayList<>();
+
     @Override
     public void onLogStart() {
         // 这个是通过对话框点击开始的回调
-        Logger.d(TAG,"开始抓取日志====");
-        context.sendBroadcast(new Intent(MogoMonitorConst.BROADCAST_START_CATCH_LOG));
-        openLoggerLevel();
+        if(catchingList.contains(MANUAL_CATCH_PKG_NAME)){
+            Toast.makeText(context, "已经在抓日志了", Toast.LENGTH_LONG).show();
+        }else {
+            Logger.d(TAG, "开始抓取日志====");
+            manualContent.setType(MogoMonitorConst.START_CATCH_LOG);
+            startCatchLog(manualContent);
+        }
     }
-
     @Override
     public void onLogStop() {
         // 这个是通过对话框点击结束的回调
         Logger.d(TAG,"结束抓取日志====");
-        context.sendBroadcast(new Intent(MogoMonitorConst.BROADCAST_STOP_CATCH_LOG));
-        closeLoggerLevel();
+        manualContent.setType(MogoMonitorConst.STOP_CATCH_LOG);
+        stopCatchLog(manualContent);
+    }
+
+    public void sendCtrlBroadcast(RemoteLogPushContent content) {
+        startRemoteCtrl();
+
+        Intent intent = new Intent(MogoMonitorConst.BROADCAST_LOG_CTRL);
+        intent.putExtra("content", GsonUtil.jsonFromObject(content));
+        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+        intent.addFlags(Intent.FLAG_EXCLUDE_STOPPED_PACKAGES);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        Logger.d(TAG, "sendCtrlBroadcast: " + content);
+        context.sendBroadcast(intent);
     }
 
     /**
@@ -103,7 +143,41 @@ public class MogoMonitorProvider implements IMogoMonitorProvider,
      * 根据状态收紧Logger的限制
      */
     private void closeLoggerLevel() {
-        Logger.init(DebugConfig.isDebug() ? LogLevel.DEBUG : LogLevel.OFF);
-        NetConfig.instance().setLoggable(DebugConfig.isDebug());
+        if(!catchingList.isEmpty()) {
+            Logger.init(DebugConfig.isDebug() ? LogLevel.DEBUG : LogLevel.OFF);
+            NetConfig.instance().setLoggable(DebugConfig.isDebug());
+        }
+    }
+
+    private void startCatchLog(RemoteLogPushContent content){
+        catchingList.add(content.getPkgName());
+
+        long delay = content.getDuration() * 60 * 1000;
+        handler.removeMessages(MSG_TRY_CLOSE_LOG);
+        if (delay <= 0) {
+            // 如果push 下来的delay小于等于0，那就给个默认最大值一小时
+            delay = 60 * 60 * 1000;
+        }
+        handler.sendEmptyMessageDelayed(MSG_TRY_CLOSE_LOG, delay);
+        openLoggerLevel();
+        sendCtrlBroadcast(content);
+    }
+
+    private void stopCatchLog(RemoteLogPushContent content) {
+        catchingList.remove(content.getPkgName());
+        if (catchingList.isEmpty()) {
+            handler.removeMessages(MSG_TRY_CLOSE_LOG);
+        }
+        sendCtrlBroadcast(content);
+        closeLoggerLevel();
+    }
+
+    @Override
+    public boolean handleMessage(Message msg) {
+        if (msg.what == MSG_TRY_CLOSE_LOG) {
+            closeLoggerLevel();
+            return true;
+        }
+        return false;
     }
 }
diff --git a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/bean/RemoteLogPushContent.java b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/bean/RemoteLogPushContent.java
index 29bcbacc1a..0a6da6e2b3 100644
--- a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/bean/RemoteLogPushContent.java
+++ b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/bean/RemoteLogPushContent.java
@@ -9,6 +9,15 @@ public class RemoteLogPushContent {
     private String cmd;
     private String pkgName;
 
+    public RemoteLogPushContent(){
+
+    }
+
+    public RemoteLogPushContent(int duration, String pkgName) {
+        this.duration = duration;
+        this.pkgName = pkgName;
+    }
+
     public int getType() {
         return type;
     }