From e8100235c3fc4350c47cf021432e108acef690cd Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Tue, 24 Mar 2020 12:09:26 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=A1=86=EF=BC=8C=E5=8E=BB=E6=8E=89=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E6=B2=B9=E4=BB=B7=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/launcher_dialog_share.xml        | 9 +++++----
 .../src/main/res/values-ldpi/dimens.xml                  | 4 ++--
 .../src/main/res/values-xhdpi/dimens.xml                 | 4 ++--
 modules/mogo-module-share/src/main/res/values/dimens.xml | 4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml
index 25151ea2a7..e38447d88a 100644
--- a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml
+++ b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml
@@ -29,7 +29,8 @@
             android:id="@+id/btn_block_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/share_module_first_margin_left">
+            android:layout_marginEnd="@dimen/share_module_margin_left"
+            android:layout_toLeftOf="@+id/traffic_check_layout">
 
             <ImageView
                 android:id="@+id/block_up_iv"
@@ -54,6 +55,7 @@
             android:id="@+id/oil_price_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:visibility="gone"
             android:layout_marginLeft="@dimen/share_module_margin_left"
             android:layout_toRightOf="@+id/btn_block_layout">
 
@@ -80,8 +82,7 @@
             android:id="@+id/traffic_check_layout"
             android:layout_width="@dimen/share_module_image_width_second"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/share_module_margin_left"
-            android:layout_toRightOf="@+id/oil_price_layout">
+            android:layout_centerHorizontal="true">
 
             <ImageView
                 android:id="@+id/traffic_check_iv"
@@ -136,7 +137,7 @@
             android:layout_below="@+id/btn_block_layout"
             android:layout_marginTop="@dimen/share_module_bottom_margin_top"
             android:gravity="center"
-            android:text="可以对小智说：上报拥堵、分享油价、上报交通检查、上报封路"
+            android:text="可以对小智说：上报拥堵、上报交通检查、上报封路"
             android:textColor="@color/white_40"
             android:textSize="@dimen/share_module_bottom_size"
             android:textStyle="bold" />
diff --git a/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml
index dda7550e62..d28bf549bd 100644
--- a/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml
@@ -5,8 +5,8 @@
     <dimen name="share_module_height">320px</dimen>
     <dimen name="share_module_margin_top">34px</dimen>
     <dimen name="share_module_title_margin_top">43px</dimen>
-    <dimen name="share_module_first_margin_left">80px</dimen>
-    <dimen name="share_module_margin_left">64px</dimen>
+    <dimen name="share_module_first_margin_left">100px</dimen>
+    <dimen name="share_module_margin_left">118px</dimen>
     <dimen name="share_module_tv_margin_top">15px</dimen>
     <dimen name="share_module_image_width">85px</dimen>
     <dimen name="share_module_image_width_second">110px</dimen>
diff --git a/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml
index 1e9163fec3..ba3a919930 100644
--- a/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml
@@ -4,8 +4,8 @@
     <dimen name="share_module_height">600px</dimen>
     <dimen name="share_module_margin_top">64px</dimen>
     <dimen name="share_module_title_margin_top">80px</dimen>
-    <dimen name="share_module_first_margin_left">150px</dimen>
-    <dimen name="share_module_margin_left">120px</dimen>
+    <dimen name="share_module_first_margin_left">200px</dimen>
+    <dimen name="share_module_margin_left">210px</dimen>
     <dimen name="share_module_tv_margin_top">30px</dimen>
     <dimen name="share_module_image_width">160px</dimen>
     <dimen name="share_module_image_width_second">198px</dimen>
diff --git a/modules/mogo-module-share/src/main/res/values/dimens.xml b/modules/mogo-module-share/src/main/res/values/dimens.xml
index 1e9163fec3..ba3a919930 100644
--- a/modules/mogo-module-share/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-share/src/main/res/values/dimens.xml
@@ -4,8 +4,8 @@
     <dimen name="share_module_height">600px</dimen>
     <dimen name="share_module_margin_top">64px</dimen>
     <dimen name="share_module_title_margin_top">80px</dimen>
-    <dimen name="share_module_first_margin_left">150px</dimen>
-    <dimen name="share_module_margin_left">120px</dimen>
+    <dimen name="share_module_first_margin_left">200px</dimen>
+    <dimen name="share_module_margin_left">210px</dimen>
     <dimen name="share_module_tv_margin_top">30px</dimen>
     <dimen name="share_module_image_width">160px</dimen>
     <dimen name="share_module_image_width_second">198px</dimen>

From d50521332550fa3e9b8e072da69c5d6802a8e906 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, 24 Mar 2020 14:09:39 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=B0=8F?=
 =?UTF-8?q?=E8=BD=A6=E7=9A=84=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../icon_map_marker_car_gray.png              | Bin 1858 -> 2353 bytes
 .../icon_map_marker_car_gray.png              | Bin 4008 -> 5439 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_car_gray.png

diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_car_gray.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_car_gray.png
old mode 100755
new mode 100644
index 4813a5df5d5b4b4111af392389edb70ea72023b1..ed4058f51ae12b68d383145f8b63b063cdbac6c4
GIT binary patch
literal 2353
zcmV-13C{M3P)<h;3K|Lk000e1NJLTq001EX001`#1^@s7^=uP=00004XF*Lt006O%
z3;baP000Q+Nkl<ZSPAV|drXws6+gfXI1J1Hx;zC%1Qu7&Mqa`K>b9m@%qFYJrj};A
zO}2?e(`;)@_MawAV`|%No3*jA{?Vj95+9pb%UYEh-QbF_3#=fBxbhxmcnHiefIMWr
zp5I;Xx8FB2jBQQYY{E^x@1A?_x#ygF?z!ijdx-)So6V-^#ydJXl+@HzrL(hB3<P5|
zI5?QPySwSb>dOLIbWTi6(A~RtDaI6`?@Vlcht{r26`lXV@4|%(?_a-uy-J<Z+uN%g
zIdViNpOT!O`c+3`W24gE-Yz-}m<O5Mu5p#b3jpWNo%8hf_bc+dbm`Jpj3wQ^zCLt{
zFLzs!(%jOlA_;+j2%#Q5dPG*Ml}siR{pQ#Qay|t~sJ6CN%zXOvDTRcDP*6}16%`e!
z;}Vams;U%&(Wq2>ze2fr^QOv0Mfe{AY&{G7&9fX|+5qzwwgDO1+S(K@!TcH4u3hUc
zD=YgQ`c(vr#X^S<AEq5UcA%d!GBT_JkiWvhLZR7jlolwPwr<8&9F=3D{?)NR2n24h
zVXRhFuOg*v$WrWfyTV(bu&t^Hs@4qdS#mfW6c!dnm#%!IPE>`=%gdwL*;yJNAE$`0
za4Ib=O$L^Vuy5Z!fsonzQ(FJZE3~k%@VZI{Ky`JsGbblUiC!L~T)lc#l|hH}HE;Nu
zDKF^k*|SP<ak0<RrlzK-p`oF&qN3tY+QATQ18{wPy^@ucCC-9&3}?e=G*WnY_;=>!
z=8}15|1QUUB*78gzI{7Ac<?~t(AM2M_~ZrAq-%nH@Wx(>i;FAUy?b|!L{K+ZcJQXs
zTR(hTHbvcdqn7MF{WLM|qKMcS(h>lIYGZO1%;=NWCK?_dCfGh~?#YuU#1aaW^H<bW
z$SMAbwAM8Wqa7O?6MBHZ0KqHQt0}~z&Q$@wk{B5g63xua5Fb&2Y%mz8ueXoBwe2-^
zvIKl|g30^$?-xV>OJb9gle8vf6)7GM@%HbR1W@}(a{vDQj`i!;XO@(d2)vEOdE{Yb
z8%<%faa|6rT)A?dw_A5;e70C}IDh_pC_7jklU=)ZP0R76`fH^D-p-homKK|gzz-ij
zw6Rb5k-tUw*u<$*r+&}Y_b&W|w!nAP)YK?@_wLnMw61};8WR)aGZ}<%RyJ?m9CY&J
zNu6QotZvz|WjiAx)R?FhK)^U?>FMbv?SM{#=;-LtsHiC6`dD1rvu6(#6cmU9H##~h
z=HbX|i%tUOp6GVFae!2ujE(EaZJeiffB7DDG_=y~k89L106GGk^L2VJ;ft1bij0X8
z2~T2LGVwCzwG?y&=I7_Tt8ag-9cQ1Q(3EpRBuwSs-btM8v}zG_I$)=3>FV#J$jC@7
z4vh{yrfK&SC9FzDwAGF22=G=}hDJt2mg;mmi6tTrd!?qj&*-03SLk-*XFdeHmtdKn
zo*_gmcxw(e!r`)Q5R_Zb1dy<4i;e(Kutb^6)YID|vN~8J_8v97wlcR6m;j4x$x2J7
z3650o)Q|w#IEV;%!Q(?frvoUFvk&2&p)3$V(7}?R55$XrO1yXPUKvCMSF9EG56*D+
zXs=7pBv!62bJOX7Gp9Uo3Jnbv6L11S1Rr*zU{f9q4h|+Rs>FeT0XGn#b%^@1;}<OU
z6ypa`Thgy7FE<y-rp^+z#1Mu4#y1P30SF|DIU+*YR9dKPcr{<-l^9D&N$Ju}@@{bI
zmXGx9z<~n_OQM)95lVVyhJt$mr+62<@qIj!MBoHIT*9c!%gbk2Cw}6#7HbJ!(!l>+
z1B=@9^CaVR-xwPk`x4u^nQ=!sDmnjKoBy|kICJLA_c%r#<NVSJf9bDCXN2&;F9~+`
zY(L?9$%p=MwSCVOqO!8`GT#+<CMG7*>eZ`7Acx13MKYFcZOsXfcy76P@#6b@d#&QP
z0ezr;hU{};(h|9K>sCf)X68|32}wywBHU=lwJ?P7E_khgx6RGXEn<N@&CSie*At%P
zU$4)oF_Aog2p;hNviMuQRyz_8HQSAdS_ndmm4HI925w*_Ab|Sx>C<%L#0mA@C5e{4
zzMVqDLTP$(iku^3H0l_plEPv-c<>;_$H&XStxq`QWUhU6s2SvEl0jZ!99D@tE#j}g
z615_R*5z-|41ug7?B|^~-=b|>wqhYicuU{YAgQ1(_^Z9o0N#c*&_HKj4{-wQJ*>8!
zkH^UNsD~ywRde(8*6nl&ILd6HY)&RP8h^f+03Z@j2u>U<5Td^2bIQ)&q%!pf*gAWe
zv74qQCi!#oh22f1#U=Df<EJ8b@Ha>H1+)oXfd$!%ZO~3LoXH$IbVy`0IIj3${m8#z
zGcK2lrl+TA`0)r0*av8u)2ETi35w#K@y`Avb6E!z0?8c`8y7pDw)S>9bM((5$pKS*
zGSQPY`q&?c2SqTb_*o^DZ~f+r3Bg+-gfMU#J7Tlb(D0B*49#Y<5CF{aNr6yf3<liU
z+sy(EP)N|1xuIOOzdE2M*zJnD%&PcAGR%3%VRw+#VihZuu3HKK-ysD;UfK4bokI9f
zTEZh<%qI9~3d7uxokMtWK&lKw#gUbnuVju|!VtpEZ@fXAi>D^1yx4ZYCcrQuAwf7D
zs8VZWuosNWA_YMmYB16YYc$2j#tFeCj=y?wU&`4068l#^-z&fj&p9{|I1ON|{iIfa
z2Th^4*jMoLHRWVyQ&(44^w7|di{r<qV$kdNJeyF!04w8{aKS*UiSXG@GVnEECUhl*
z%{j=!Y^O{w3%vNaILgn>6PnY`@!~I<0i9J-Q<H;NCIo>7_%0%12S-;L;j5)*;VDH<
zHc`^ZU&!jd!_UNHRP~R`^udW^WaL<qmX;<2s;jH>@9&>U6i^d<gZlBEJ9l2<2Y`=Q
z)mDxrbnV(T;si%sP+W2XnatthW=&Kpv<8FBT9ZMgua@A%{PFnl<2SZ!+0vj+@&W<|
zFfA_MchXraKWAI`E^kkWG)Q<!oSNm!mkT?=)^Tw#^WXC2>nOJujh<TiOYo8gv>Nyq
XI#Fy;D%<L~00000NkvXXu0mjf8Nr84

literal 1858
zcmV-I2fg@-P)<h;3K|Lk000e1NJLTq000;O001Zm1^@s6<PADi00001b5ch_0Itp)
z=>Px*{7FPXR7eelmsw1dR}{z3EG)vXjKeSjBUC}8rdC;8Vk6R4`(V>oAFPRD8e@~%
z$GW94ZPK`;&o(w`d?_Mn(%=&sOf(HOO0W&FXhDq&R8SF+one`t-(~Lj0kz)b%(>tF
z?*0GIcJKYhC9iKTeTBGVLf_e<`hd(hwDY~`&tGIG0Ge?1>eaHs!ouo6Ah6cs@q|=T
zCMG7PW@cuFr>CcpC*9rM^))p$zaBq+{H3m$R)O??n<o?sr8YG+oxXkNb~F-+M5m^v
z;xaNa5*;2Mj!RcpSG47imiBY!&b_Os2`Y1p_ROQg^5lkwhVKGdfdjcYxssTeIA@Al
zJ?A+&Iax+WMgzfMaQprH_kUKI&<TXiGyrXb*?Z*3k>b3(ywB6p(qz%1MWW%DBX+V=
z`~7}NO-(I0bm-6*I*vtg+;}H8n6zQThHZ&SiAlax-yC2|6pbznaY{;x=o;|{{96<!
zRfWiyP+0;r%wM;)wSAe8kRUF%O8`Rvw_4{cXl}P#yk4(FXQJexPQ|BUu)VR_Jfx_6
zq*W63xYYnPbbh><>vGM>Aw#A?q6A>Puac`WqB3m>ShYyS3xL}*>)3yV<8=fW1xc(y
zWWwYmV8Cq%TxyLYG}o?Ola7uKxp(iL^!4>gK|z76Sg}G@uU;*yR;@CaF>vc%yj(3o
zjQEw(P|5l8=cTr`)>M;jHp$G)lp8m0$fZk{L^qv~tFp2(*}Z$WR8>{ITI}dq0!o7d
zZ`O*)QXM>X>XbZq@IW?g+GJd}p&1(+GlV1+5<EM0?3nD^w@<ci-O3(lRq0bP<>n;d
z<(ZO_lHkzL(DsUo3Q0;zih~mZJr>Ny1KcSPty!~1bkmX8BPzox=GY)B#LcyH=gyQ{
zw{CsAZr!?VJv}{AR8(ZZS#0I`^XEd%vjN$`XoQW%#?;LgXl`ykuxr<@WW}UuHfIUE
zhYue<sBx~+(sWHuPRi4#PfeLps&<q0_VyZJz#&58Woc=t+`W4jK=0C}OFub!^yo?Y
zVB5O#R99D@&d<;P`1<whm-T=%6{8jj$sQjcmw|x+)3=rbjP(!^p7!>3<~-lCXV2cc
zy1KKLz~*4GrKRPm4tn%(8;5}8RaREYl`B`w=7In~!bSBs^~#kirLnP*(w^1|>ri>D
zSW_xd2srsBRfbghG<gxMrh@kG-!B&~To9knCmT0zlqE}+7>jwY$F@oO;NYO>@ohX*
z0<fr{0hNe~Ay92dV4T!)j1rR3(NTHv;)R?zal%+jNNlpni{23?Wb`jyyl4pNYXcZD
zRb)fN3)4s_A;LoXgoRvCrU)cxcKVYiPmIO`=2INnO#NHEfPjV81Ari5A$>NRCFt+(
zH-><S<#-$;U?|=e5CG^TV6i2DglC%ri-J)Q#6o0;jb1>&WP~uWTUkWBtp^xDVwq!)
z4>SbKo8J}?06-XMlq1h91Oy@8)(A_$d^`3=0wykAyx7d6av-qQ5-MjH7^m@JfQQVV
z-<%$pGYLQlunx-z6^jA0N#va+1(4m%c@*==-U)`w9u*7{m&%6^9~Lp0MSwtvK*TeG
z7gp291B}w-bFY7@!i8h7EdiPn@L*?WXF0LgPZt9O096ACeJ8jjgdjURTlAPuSB!5|
za#akr4G|CAqlqj6thl(?XrAXcJ7zWBVvv2-`DrR(&$;xCTT~1L+y`jlIzQ$B*)hmT
zZa5sqQyc&I$CvehdFCa@FUjOm2gqR+b4&x=k~5H?`z0LCvq@&i5*arbpv~yQq4M(b
z8BM4=l<A9u&$rlGk2Xio_@LzE<mgG8O65f~PouLhX5(bQ^=Cp|J-mGR^6#~ZN;?|P
zN>4OH{GmKkrWnQdk_OD!=izM9MdRaR@^@pMY^nZA^iw~gU*@0bA=t04%m=Uy5f3Bk
zcK4k-cbazW*s=E6RG;hQFPCL(YGIOf?wq!_A|T;V7C9JD<GPf9yCr_<GZ~Z#4b6+1
znwkc+YB0O-9VyBSNP2qu8>J*1l&qZabbWpOPx@K&OtA=&@nH7Q(Wh98>K;(<-7gE5
zEql9Q^seu%P=*Bk84}1$6F-ucD&aty6lSN(`hqn1upmi7%Sr|wk0$*7!<ipzZ{EE5
zK(Qb&w@*CVIzZp6*P~zW*y7EbH?Md1J}Um8DCNBs;b4ANRxsU{!EvCghX!S!zc2Fe
zpJ!cvc8|5)9`XJ5sI#-ZwYBvx{Tk^}ocNy*CxMQe-A4_l>(&qIcPKkELxpet`1aR6
zA?0iyQyJ77Z%}WvUhQ)ikE@vYt2S1nZG+Hwq8cKO4}?AiVGV+S7<2amh|uTGWSsY=
w*#-95YD>fsLf@P#vA&%Hh$V7r``+k(0Yl`d&Rf}!{Qv*}07*qoM6N<$g3yDKwg3PC

diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png
index eed1fca00cc32232397d122618ea90811496833b..d4266a6bc56c75c6d63fdb5d34b8fbcc0dfc67d3 100644
GIT binary patch
literal 5439
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

literal 4008
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
O0000<MNUMnLSTaUn7v;B


From cf250c34fc9a6769fb37179485e735a4270b9c96 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, 24 Mar 2020 14:26:55 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=B0=8F?=
 =?UTF-8?q?=E8=BD=A6=E7=9A=84=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/view_map_marker.xml                   | 4 ++--
 .../src/main/res/layout/view_map_marker_info.xml              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml
index dd210ad9b9..b37be6dc5d 100644
--- a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml
+++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml
@@ -55,8 +55,8 @@
 
     <ImageView
         android:id="@+id/ivCar"
-        android:layout_width="@dimen/dp_34"
-        android:layout_height="@dimen/dp_64"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:src="@drawable/icon_map_marker_car_gray"
         app:layout_constraintEnd_toEndOf="@+id/ivBg"
         app:layout_constraintStart_toStartOf="@+id/ivBg"
diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml
index b4dc7c985d..2b962ef22e 100644
--- a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml
+++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml
@@ -79,8 +79,8 @@
 
         <ImageView
             android:id="@+id/ivCar"
-            android:layout_width="@dimen/dp_34"
-            android:layout_height="@dimen/dp_64"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:src="@drawable/icon_map_marker_car_gray"
             android:translationY="-10dp" />
     </LinearLayout >

From d9b6001c1c585f8e94612d4b2bcb6cb25a3f6d23 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, 24 Mar 2020 16:49:04 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9CarLiveInfo=E4=B8=BA?=
 =?UTF-8?q?=E5=85=AC=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/module/common/entity/MarkerCarInfo.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java
index 47041c1f5e..6153c947d8 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java
@@ -52,7 +52,7 @@ public class MarkerCarInfo implements Serializable {
         this.carLiveInfo = carLiveInfo;
     }
 
-    class CarLiveInfo implements Serializable {
+    public class CarLiveInfo implements Serializable {
         //rtmp视频直播地址rtmp://
         private String videoUrl;
         //直播频道【直播心跳接口参数】C_1

From 7313b1242c9ac142ba0f4c3d05f44df09aebf4e1 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, 24 Mar 2020 16:54:32 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9CarLiveInfo=E4=B8=BA?=
 =?UTF-8?q?=E5=85=AC=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/module/common/entity/MarkerCarInfo.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java
index 6153c947d8..da1934a703 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java
@@ -52,7 +52,7 @@ public class MarkerCarInfo implements Serializable {
         this.carLiveInfo = carLiveInfo;
     }
 
-    public class CarLiveInfo implements Serializable {
+    public static class CarLiveInfo implements Serializable {
         //rtmp视频直播地址rtmp://
         private String videoUrl;
         //直播频道【直播心跳接口参数】C_1

From b6c919c3cf3ba5a011065cb5db3c44339a22c78a 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, 24 Mar 2020 21:46:42 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BA=86V2X=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 06af0eb8b8..e93a3715c4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -56,7 +56,7 @@ CARCHATTINGPROVIDER_VERSION=1.0.2.2-SNAPSHOT
 # 在线车辆F
 MOGO_MODULE_ONLINECAR_VERSION=1.0.1-SNAPSHOT
 # v2x
-MOGO_MODULE_V2X_VERSION=1.0.2-SNAPSHOT
+MOGO_MODULE_V2X_VERSION=1.0.3-SNAPSHOT
 # 媒体卡片
 MOGO_MODULE_MEDIA_VERSION=1.0.1-SNAPSHOT
 # 推送