From 39d9878d30dd1db66844b13316a8bed1d9589d28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 10 May 2021 12:05:39 +0800
Subject: [PATCH 01/24] =?UTF-8?q?=E6=94=B9=E7=89=88=E5=B0=8F=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=20=E5=AE=9E=E7=8E=B0=20=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo-module-main-launcher/build.gradle           |  2 ++
 .../module/main/launcher/MainLauncherActivity.java   | 12 ++++++++++++
 .../main/res/layout/module_main_activity_main.xml    |  6 ++++++
 .../mogo/module/small/map/SmallVisionProvider.java   | 10 ++++++++++
 ...ection_view.xml => module_small_map_fragment.xml} |  0
 .../com/mogo/service/map/IMogoSmallMapProvider.java  | 10 ++++++++++
 6 files changed, 40 insertions(+)
 rename modules/mogo-module-smp/src/main/res/layout/{module_small_map_direction_view.xml => module_small_map_fragment.xml} (100%)

diff --git a/main-extensions/mogo-module-main-launcher/build.gradle b/main-extensions/mogo-module-main-launcher/build.gradle
index efd300157a..bda491d407 100644
--- a/main-extensions/mogo-module-main-launcher/build.gradle
+++ b/main-extensions/mogo-module-main-launcher/build.gradle
@@ -44,10 +44,12 @@ dependencies {
         api rootProject.ext.dependencies.modulemain
         implementation rootProject.ext.dependencies.mogooch
         implementation rootProject.ext.dependencies.moduleservice
+        implementation rootProject.ext.dependencies.moduleSmallMap
     } else {
         api project(":modules:mogo-module-main")
         implementation project(":OCH:mogo-och")
         implementation project(':modules:mogo-module-service')
+        implementation project(':modules:mogo-module-smp')
     }
 }
 
diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
index c426c99a24..b8d5d84ae5 100644
--- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
+++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
@@ -18,6 +18,7 @@ import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.main.MainActivity;
 import com.mogo.module.main.cards.MogoModulesManager;
 import com.mogo.module.service.receiver.MogoReceiver;
+import com.mogo.module.small.map.SmallVisionProvider;
 import com.mogo.och.IMogoOCH;
 import com.mogo.service.intent.IMogoIntentListener;
 import com.mogo.service.statusmanager.StatusDescriptor;
@@ -116,6 +117,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
     protected void loadOthersModules() {
         super.loadOthersModules();
         loadOCHModule();
+        loadSmpModule();
     }
 
     /**
@@ -128,6 +130,16 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
         }
     }
 
+    /**
+     * 加载小地图模块
+     */
+    private void loadSmpModule() {
+        SmallVisionProvider smp = ARouter.getInstance().navigation(SmallVisionProvider.class);
+        if (smp != null) {
+            smp.init(this, R.id.module_main_id_smp_fragment);
+        }
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
index 148d071f3a..5456d236a3 100644
--- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
+++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
@@ -141,6 +141,12 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <!--小地图视图-->
+    <FrameLayout
+        android:id="@+id/module_main_id_smp_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <!--冷启动过渡Logo-->
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/module_main_id_cover_up"
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallVisionProvider.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallVisionProvider.java
index 9dc29557a2..50d3ab9dc4 100644
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallVisionProvider.java
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallVisionProvider.java
@@ -10,6 +10,7 @@ import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.amap.api.col.n3.lg;
@@ -35,6 +36,8 @@ public class SmallVisionProvider implements IMogoSmallMapProvider, IMogoStatusCh
     private final String TAG = "SmallVisionProvider";
 
     private Context mContext;
+    private int mContainerId;
+    private FragmentActivity mActivity;
 
     private WindowManagerView mWindowManagerView;
     private SmallMapDirectionView mSmallMapDirectionView;
@@ -60,6 +63,12 @@ public class SmallVisionProvider implements IMogoSmallMapProvider, IMogoStatusCh
         return ModuleType.TYPE_SERVICE;
     }
 
+    @Override
+    public void init(FragmentActivity activity, int containerId) {
+        mContainerId = containerId;
+        mActivity = activity;
+    }
+
     @Override
     public void init(Context context) {
         Log.d(TAG, "小地图模块初始化……");
@@ -91,6 +100,7 @@ public class SmallVisionProvider implements IMogoSmallMapProvider, IMogoStatusCh
         mWindowManagerView = null;
     }
 
+
     @Override
     public void showPanel() {
         Log.d(TAG, "小地图模块触发展示……");
diff --git a/modules/mogo-module-smp/src/main/res/layout/module_small_map_direction_view.xml b/modules/mogo-module-smp/src/main/res/layout/module_small_map_fragment.xml
similarity index 100%
rename from modules/mogo-module-smp/src/main/res/layout/module_small_map_direction_view.xml
rename to modules/mogo-module-smp/src/main/res/layout/module_small_map_fragment.xml
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoSmallMapProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoSmallMapProvider.java
index 4ec381d393..36a4110c30 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoSmallMapProvider.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoSmallMapProvider.java
@@ -1,5 +1,8 @@
 package com.mogo.service.map;
 
+import androidx.annotation.IdRes;
+import androidx.fragment.app.FragmentActivity;
+
 import com.mogo.service.module.IMogoModuleProvider;
 
 /**
@@ -8,6 +11,13 @@ import com.mogo.service.module.IMogoModuleProvider;
  */
 public interface IMogoSmallMapProvider extends IMogoModuleProvider {
 
+    /**
+     * 初始化网约车容器
+     *
+     * @param activity
+     * @param containerId 容器ID
+     */
+    void init(FragmentActivity activity, @IdRes int containerId );
 
     /**
      * 显示面板

From 5ea48d4f353713e41c1ef665d1ddbcfe4cefff1f Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Mon, 17 May 2021 14:54:06 +0800
Subject: [PATCH 02/24] adjust view of live

---
 .../v2x/receiver/TestPanelBroadcastReceiver.java |   2 +-
 .../module_v2x_vr_close.png                      | Bin 0 -> 2962 bytes
 .../res/layout/window_see_carlive_video_vr.xml   |   4 ++--
 .../main/res/values-xhdpi-2560x1600/dimens.xml   |   7 +++++++
 .../src/main/res/values-xhdpi/dimens.xml         |   2 ++
 5 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/module_v2x_vr_close.png

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java
index 4da724fa37..18e243ccdd 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java
@@ -103,7 +103,7 @@ public class TestPanelBroadcastReceiver extends BroadcastReceiver {
             LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent);
         } else if (sceneType == 6) {//查看前车直播
             V2XVoiceCallLiveBiz.getInstance().getFrontCarLive();
-        } else if (sceneType == 7) {//查看前车直播
+        } else if (sceneType == 7) {//查看前方路口直播
             V2XVoiceCallLiveBiz.getInstance().getOpenRoadCameraLive();
         } else if (sceneType == 8) {//触发疲劳驾驶
             V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity =
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/module_v2x_vr_close.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/module_v2x_vr_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..95a08f52f4b5f8a91653404d9ed62e438d7084c1
GIT binary patch
literal 2962
zcmV;D3vKj?P)<h;3K|Lk000e1NJLTq003(M003(U1^@s6aKC&E00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91YoG%F1ONa40RR91YXATM0BdP_MF0Q_{7FPXRCodHU0rMyMHFsJp;QoB
zQh^FeDJ4P$5ik^AKtRe1O3{c9CV(WQ#ur0Kj1MLzD3J#rc*5X=1)}_@G1d6<R!k*?
zph9dyH3CJH(%KS5j1*b~zwdJAvRroe?(UtLow@8uzRup6*>ldEuQNM4vwLrGkzH~R
z+?@<eN`uE0KzSC1<MS0@z=6v+?g!2R-D&h7y#`nz#fE!19{$Y%9sy<nRe(&n4rRXr
z9ci3EN>Ys!)5xMf4+D#VxxfTKr;xmp!1usG;19qUF@-D+YfI8#Z!$&L(@5GO;NQ5N
zikqy*5P;`^`nUs;!~PJ;zX3i0&I7SX9AuTCrH=z^fZAAE9o;C0N%pdjfV0unL_1SA
zSqtIjI)Jk{+vNxv&;n@dX}ZXoh(<L79QF!HIPL!!;P5!8x?!rx;{DFE0Eavt7pnB4
zVLJiNB9)0svZlc6*MLG8@`4h;nd1(CH{{Yq6<N#S=}W)}=^mS}kSiqHfU~k)9VS`f
zNa%Y7cpi|gTe7Rl)Qy4WCxMH=X_;1J29!%dZv$K&y4!_uZ2-mr$AB9^-Xe>v2jB^b
zs?OV^!ctI&=F|X30N$hJB{ImG0T12+D)aKBa8Kq0i|d^vj4L6LC10}U!SWjbw=NR#
zjsVv?d5?J*xawWaza$^B*rP~PnZJpoG#vr%yK$?h9pKG$Xo*S|uTdQOk{%T<<eYF!
z2Mz(DuVGQh60^SK8WoNxQJYI|_X8XfLrGY&MnZcs>kAcP*UD3n%UB+FE%nF@OBQc<
zllv%-V1~?|iTYhYchK{=w-i*kg!Dwv%1OOI5!i%UoGAv9pk%Szz7$AfQYlOXMxpYn
zKxvSZf((Php=c|ROelgxG<+RS*htooxlRqzv$!91H*Is|ikXV?XP}g$m#^d^i_^?C
zz8aE384(~4FXvK}i>ziS;4qko`Uup+#4<lKeq`|pB(7&AqAvn3!qjLlb6#XIf34R^
zNxrfOjD_YVFYR7ru~#LN3a_ZC&0h)iu4}GdWF?adwS@R-=e-vRyF=XWvv{3aeMe2j
z8T01N8?}1%>Z;1h%3-HZpN_oeBh$^s#>TNLR;(Cz?b@~Ly}iA8Z5)R5Ybxr01>Clk
z;&$iEXV10Du3fuku3NXR7DkI{_~_B2eN9bG$9sBubOtEX=IZL|;jOK$a~CXFFg~4m
zWB2aeUF+Ac|0z>R?ExRUX#_rZn#mppC!vs2NNv*G+&mFPO@qM{Q8dgTwYRq~WYDxZ
zk~Tz}wCx~@CB^iSzH0PmdA6-=vX*35Q2lw;s#UJ<VAa*tjnz$<Ad0r#+U@15TU`lx
zHPFG~Fe6T~_@Awvtf8Ty8yRo14s;ThizvG0=WCYhvOX?#DsqxF3k70~cGgjPyl>yW
z^L_?&5Eg_e`nY%RUSD7R+7YpAG0w|O0-a<nil{KJ)AsM*f1#zN<&>Wim4pQ)ias7V
zaNvTUp9;#j(=l7<b&@q#Wa>^gY}oMgo;`bfA2n7%SWu$q8-3Irm$bb{g<U}whd<W~
zy{M=<#cb;*orHxUioU6CzmI-CzLpX}mJ!cY=pxJ_qDT^NYq+XWB*@CJ$ILiIHDQ(!
zMJmV<Cx02TQXiOMf~X?QLZSp68M3&-%jW=$64``VOcZ%ZZTYi{8M_rCi!jTHB3UVp
zNEX)vjg@=}D*&R%&3!<b@nq4{sDu>=Q49g)exrxMn?BzB8<wyFBZ@(o#Kqff0N>2B
zLa?tibM4x-y!Y^wuCA_2EUc}q<-U-o@Ftx91fCVlD%i<I!lwYPL0KW#6ubZuhRvBX
zhwnPM3U-^z2-m`Nre#FY>rRrzr$O)KCtD;4VSa6~kSI3iB*|I>@LeIRBr0K+5=Cy#
zkgOK~w`Va}!DtCfn8ieqhu=BD_zd8z&`RN~ud}oBiHeE}-)q#xix;of*Vlg&*F!iG
zg4<4#u1HW6iwZG4&qWlSV;$YkbVv@$6_Pa|S*aFvf+%iE1~sT+12d>?3H1i7Br6J0
zB3Kp^W*=Gk5M?=GDY7n$Mwp%kC5p2?!mm9R_OJm?+57z(WlC8XqMS=eeoIq=utkd&
z9kF1R*vD(uIa3Jn@*^ryVHbbB>>HBbO|rTTamLk+s6+{61wt5K&`9+xW68>wr~)Fa
z2W`2|o|QTf4KpQ`MU-fd<vlEQsUlf?Ve71DlnJS9qC}f4CM@-MImx2@cr%IruPUNM
z%Pb|VgZ>M$QXfQv;!0H$CE8^fVO$Qpt!JG;M(A&r6pfdW>LN<`Y7t@N=0Ex^dKOnP
zPBJ47(M^<Sqa}o8Mm<3m{r_GxLT6f5R#trQ;K2s2CivM^wQ(4fF#1Se{d`nZ_MOnn
zonj$ec6wTT(3Ni4vZV%JsqmnmJyk>rn?ZJ*tE#F-mXwqXwzakKXDf6GN4t-OF=x->
zk5P7t0$piCL&G>fTdIi?wuAIAyut75tI#DeZFA~!lEwVn3Y`^I9ryM1dG1u}B1*I^
z7h(PV{hq!G9THPcD!z5<%O>j(3b_uYO}1~}eim=Rr)E1&qq>O_w!H|WkMvd4(~$lE
z8-F|PIImgECs7lCY5br=y1ToFIyyT3oIij57(SSZ|K5SETeo&@-n`j&KT4%<yoL=9
z4i3zoJ$p=fd3ounQ>QL%+_>>Lu2+{-+Rf7a9zJs^Fe7fW8-79jyFhlY%bcX@ptQ8K
z2;Y;WN_`}~G5N%s;7!>MyAi_gdf;%VT}&g20f@<`kKBUqMi%S2R(4a6<VlafZ_s$e
zO{*7KypXz{;HD(WlNteb6xXjv@*<1YTL7~zAoQxRg<p))?$yNX*`TxDKls4%%-7L4
z3zK8%5#U1lo4{XQn*Dkf&-n!C^*TApml}aDpzVyG#$06aC&+jDDM-qsM1Z~N!(5vD
zhCy*Ir}EXnRFRRS(j)K=H2#`PYp$Lp&fkFp<DV}S&RUkX!r!Aod=5$$7cjR092OIi
z7lB`(YIjg|L54x0i;Iff%V`i9Nt#y#{>9m^1DtgSk}zaZAs1J<r&GrdiA0V7r|EA4
zTmuX&VacN6V?Yfs8Av2r1h(U}!(mU2LKc@oxD@p;Fg~ooq<+!+h{4xU;t+)_+F>^)
zVf-nK3LueS5%?6<_64hYXRWAYQ4=>R*_9swbU&K_lhz4|+Le#j`H)4s{DGHtU^*}n
zNW?t?9Qq>nD4{Z6vZ#kE^W3cD4)YWsky{bq<${xmNY|)aYHl9MAd8yl6o<r-0Dsv!
zk)k5rM{#-{de-L^JXvH3{l{_81<VIVh|Ie%<;nzacthPs<%&~rt_l&$Ii-IUcqroe
zHlNlC=edN$%Y#&r-Lr&q90J;aQeXz4>YoCtjS+5haP^$~QoJlk7ac+5q~m3vUb^>Y
zC?qjo0v`aERl1~uEaCq$9J~mO6&VGP@|lSpfbR~ktaj=oi$0GAnt+wSD8N?v4UY3E
zB;I3k`Av)HCQCHx9vqOcRlpdLX+g@_9ZBL+n>La}T;d{2*ynv&Bd{E(0ZbIWG{Khy
zcwIUcr-N~m<!t*@d{_!B1}dEeF&*<oHqL0j1#WwrBPM^0oKo|4g3l^G3UHBl8c+hL
zmH`+z0dxT00p|dt#H60(6&OxLW~DI&>15zOARpn5K@UJecpV}^Oz(J440*<g4P?0m
zs|=Z3IGzMl0ObHDEli2w0DFo6ANb)tP#@5pPL<raLbo#cA1&>dD&Qjd^Z)<=07*qo
IM6N<$g1paObN~PV

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml
index 02c4174e76..e32b21290f 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml
@@ -16,8 +16,8 @@
         android:id="@+id/liveVideoClose"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_20"
+        android:layout_marginStart="@dimen/module_v2x_event_window_close_distance"
+        android:layout_marginTop="@dimen/module_v2x_event_window_close_distance"
         android:clickable="true"
         android:focusable="true"
         android:visibility="gone"
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml
index e5e04824ef..1978407261 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml
@@ -18,6 +18,13 @@
 
     <dimen name="module_v2x_history_event_icon_size">80px</dimen>
 
+    <dimen name="module_ext_top_view_no_link_width_in_vr_mode">778px</dimen>
+    <dimen name="module_v2x_event_see_live_window_height_vr">687px</dimen>
+    <dimen name="module_v2x_event_window_top_margin_vr">200px</dimen>
+    <dimen name="module_v2x_event_window_close_distance">10px</dimen>
+    <dimen name="module_v2x_event_window_height_vr_for_item">487px</dimen>
+    <dimen name="module_v2x_event_window_width_vr">778px</dimen>
+
     <dimen name="module_v2x_surrounding_item_bottom_size">15px</dimen>
     <dimen name="module_v2x_map_left">550px</dimen>
     <dimen name="module_v2x_map_top">200px</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 b67af50738..8e83da6e51 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
@@ -17,6 +17,8 @@
 
     <dimen name="module_v2x_event_see_live_window_height">670px</dimen>
     <dimen name="module_v2x_event_see_live_window_height_vr">526px</dimen>
+    <dimen name="module_v2x_event_window_close_distance">20px</dimen>
+
     <dimen name="module_v2x_event_icon_size">147px</dimen>
     <dimen name="module_v2x_event_distance_text">60px</dimen>
     <dimen name="module_v2x_event_distance_title">40px</dimen>

From 6f3059ab9970fd480a369b2754e8ac2ea34c6a0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 17 May 2021 15:27:20 +0800
Subject: [PATCH 03/24] =?UTF-8?q?=E6=8C=89=E7=85=A7=E8=81=94=E6=83=B3?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E6=96=B9=E6=A1=88=E4=B8=BA=20values-xhdpi-25?=
 =?UTF-8?q?60x1440=20drawable-xhdpi-2560x1440?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dimens.xml                                   |   0
 .../dimens.xml                                   |   0
 ...odule_mogo_och_base_icon_not_in_autopilot.png | Bin
 .../module_mogo_och_icon_arrived_station.png     | Bin
 .../module_mogo_och_icon_arriving_station.png    | Bin
 .../module_och_base_slide_block.png              | Bin
 .../module_och_dot_line.png                      | Bin
 .../dimens.xml                                   |   0
 .../java/com/mogo/commons/mvp/MvpActivity.java   |  15 +++++++++++++++
 9 files changed, 15 insertions(+)
 rename OCH/mogo-och-bus/src/main/res/{values-xhdpi-2560x1600 => values-xhdpi-2560x1440}/dimens.xml (100%)
 rename OCH/mogo-och-taxi/src/main/res/{values-xhdpi-2560x1600 => values-xhdpi-2560x1440}/dimens.xml (100%)
 rename OCH/mogo-och/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/module_mogo_och_base_icon_not_in_autopilot.png (100%)
 rename OCH/mogo-och/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/module_mogo_och_icon_arrived_station.png (100%)
 rename OCH/mogo-och/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/module_mogo_och_icon_arriving_station.png (100%)
 rename OCH/mogo-och/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/module_och_base_slide_block.png (100%)
 rename OCH/mogo-och/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/module_och_dot_line.png (100%)
 rename OCH/mogo-och/src/main/res/{values-xhdpi-2560x1600 => values-xhdpi-2560x1440}/dimens.xml (100%)

diff --git a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml
similarity index 100%
rename from OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml
rename to OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml
diff --git a/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml
similarity index 100%
rename from OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1600/dimens.xml
rename to OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_base_icon_not_in_autopilot.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_base_icon_not_in_autopilot.png
similarity index 100%
rename from OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_base_icon_not_in_autopilot.png
rename to OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_base_icon_not_in_autopilot.png
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arrived_station.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_icon_arrived_station.png
similarity index 100%
rename from OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arrived_station.png
rename to OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_icon_arrived_station.png
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arriving_station.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_icon_arriving_station.png
similarity index 100%
rename from OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arriving_station.png
rename to OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_icon_arriving_station.png
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_base_slide_block.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_och_base_slide_block.png
similarity index 100%
rename from OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_base_slide_block.png
rename to OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_och_base_slide_block.png
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_dot_line.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_och_dot_line.png
similarity index 100%
rename from OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_dot_line.png
rename to OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_och_dot_line.png
diff --git a/OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml
similarity index 100%
rename from OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml
rename to OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
index 8f165549a0..7e7bae038c 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
@@ -1,8 +1,10 @@
 package com.mogo.commons.mvp;
 
 import android.content.Context;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.MotionEvent;
+import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 
@@ -28,6 +30,7 @@ public abstract class MvpActivity< V extends IView, P extends Presenter< V > >
 
     @Override
     protected void onCreate( @Nullable Bundle savedInstanceState ) {
+        hideBottomUIMenu();
         super.onCreate( savedInstanceState );
         beforeSetContentView(savedInstanceState);
         if ( DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_BYD ) {
@@ -40,6 +43,18 @@ public abstract class MvpActivity< V extends IView, P extends Presenter< V > >
         getLifecycle().addObserver( mPresenter );
     }
 
+    //隐藏导航栏
+    protected void hideBottomUIMenu() {
+        //隐藏虚拟按键
+        if (Build.VERSION.SDK_INT >= 19) {
+            //for new api versions.
+            View decorView = getWindow().getDecorView();
+            int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY ;
+            decorView.setSystemUiVisibility(uiOptions);
+        }
+    }
+
     protected void beforeSetContentView(Bundle savedInstanceState){
 
     }

From 728b4bd2de0c0d5aff6535d222299166938fa9d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 17 May 2021 16:27:17 +0800
Subject: [PATCH 04/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=80=E4=BC=98?=
 =?UTF-8?q?=E8=BD=A6=E9=81=93=E6=8E=A8=E8=8D=90ui=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module_v2x_vr_close.png                   | Bin
 .../v2x_optimal_route_warning.png             | Bin
 .../v2x_road_front_car_warning.png            | Bin
 .../v2x_road_front_dead_zone.png              | Bin
 .../v2x_road_front_m_warning.png              | Bin
 .../v2x_road_front_p_warning.png              | Bin
 .../main/res/layout/vr_window_top_tips.xml    |   2 +-
 .../src/main/res/values-ldpi/dimens.xml       |   4 +-
 .../src/main/res/values-mdpi/dimens.xml       |   4 +-
 .../res/values-xhdpi-2560x1440/dimens.xml     |   5 +
 .../res/values-xhdpi-2560x1600/dimens.xml     | 105 ------------------
 .../src/main/res/values-xhdpi/dimens.xml      |   4 +-
 12 files changed, 12 insertions(+), 112 deletions(-)
 rename modules/mogo-module-v2x/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/module_v2x_vr_close.png (100%)
 rename modules/mogo-module-v2x/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/v2x_optimal_route_warning.png (100%)
 rename modules/mogo-module-v2x/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/v2x_road_front_car_warning.png (100%)
 rename modules/mogo-module-v2x/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/v2x_road_front_dead_zone.png (100%)
 rename modules/mogo-module-v2x/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/v2x_road_front_m_warning.png (100%)
 rename modules/mogo-module-v2x/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/v2x_road_front_p_warning.png (100%)
 delete mode 100644 modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml

diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/module_v2x_vr_close.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/module_v2x_vr_close.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/module_v2x_vr_close.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/module_v2x_vr_close.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_optimal_route_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_optimal_route_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_optimal_route_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_optimal_route_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_car_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_car_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_car_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_car_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_dead_zone.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_dead_zone.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_dead_zone.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_dead_zone.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_m_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_m_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_m_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_m_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_p_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_p_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_p_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_p_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml b/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml
index c99774a6e4..446e5c311e 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml
@@ -28,7 +28,7 @@
         android:layout_marginRight="@dimen/dp_20"
         android:text="为您推荐最优路线"
         android:textColor="#FFFFFF"
-        android:textSize="@dimen/dp_32"
+        android:textSize="@dimen/module_v2x_event_warning_type_text_size"
         app:layout_constraintBottom_toBottomOf="@+id/warning_type_image"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/warning_type_image"
diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
index 2815a726e6..a7c7e3c3dd 100644
--- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
@@ -101,8 +101,8 @@
     <dimen name="module_v2x_event_parking_text_size">19px</dimen>
 
     <!--最优路线-->
-    <dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
-    <dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
+    <dimen name="module_v2x_event_warning_type_image_size">100px</dimen>
+    <dimen name="module_v2x_event_warning_type_text_size">32px</dimen>
 
     <!--适配 V2X 弹窗 UI-->
 
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index 2344ee5dea..af1575dcd3 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -101,8 +101,8 @@
     <dimen name="module_v2x_event_parking_text_size">19px</dimen>
 
     <!--最优路线-->
-    <dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
-    <dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
+    <dimen name="module_v2x_event_warning_type_image_size">100px</dimen>
+    <dimen name="module_v2x_event_warning_type_text_size">32px</dimen>
 
     <!--适配 V2X 弹窗 UI-->
 
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
index e09973a74e..3213f45db8 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -31,4 +31,9 @@
     <dimen name="module_v2x_car_for_help_event_maxwidth">480px</dimen>
     <dimen name="module_v2x_car_for_help_event_text_size">42px</dimen>
     <dimen name="module_v2x_car_for_help_cancel_text_size">40px</dimen>
+
+    <!--最优路线-->
+    <dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
+    <dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml
deleted file mode 100644
index 1978407261..0000000000
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-    <!--联想PAD适配-->
-    <dimen name="module_main_v2x_animation_width">800px</dimen>
-
-    <dimen name="module_v2x_search_marginLeft">32px</dimen>
-    <dimen name="module_v2x_operation_panel_share_goneMarginRight">32px</dimen>
-
-    <dimen name="module_v2x_push_img_height">390px</dimen>
-    <dimen name="module_v2x_push_img_container_height">410px</dimen>
-
-
-    <dimen name="module_v2x_event_icon_size">160px</dimen>
-
-
-    <dimen name="module_v2x_event_distance_text">60px</dimen>
-    <dimen name="module_v2x_event_distance_title">40px</dimen>
-
-    <dimen name="module_v2x_history_event_icon_size">80px</dimen>
-
-    <dimen name="module_ext_top_view_no_link_width_in_vr_mode">778px</dimen>
-    <dimen name="module_v2x_event_see_live_window_height_vr">687px</dimen>
-    <dimen name="module_v2x_event_window_top_margin_vr">200px</dimen>
-    <dimen name="module_v2x_event_window_close_distance">10px</dimen>
-    <dimen name="module_v2x_event_window_height_vr_for_item">487px</dimen>
-    <dimen name="module_v2x_event_window_width_vr">778px</dimen>
-
-    <dimen name="module_v2x_surrounding_item_bottom_size">15px</dimen>
-    <dimen name="module_v2x_map_left">550px</dimen>
-    <dimen name="module_v2x_map_top">200px</dimen>
-    <dimen name="module_v2x_map_right">200px</dimen>
-    <dimen name="module_v2x_map_bottom">100px</dimen>
-    <dimen name="module_v2x_surrounding_top_height">90px</dimen>
-    <dimen name="module_v2x_surrounding_top_bt_width">162px</dimen>
-    <dimen name="module_v2x_surrounding_top_bt_height">64px</dimen>
-    <dimen name="module_v2x_surrounding_empty_iv_margin_top">80px</dimen>
-    <dimen name="module_v2x_surrounding_empty_tv_margin_top">26px</dimen>
-    <dimen name="module_v2x_surrounding_empty_bt_width">270px</dimen>
-    <dimen name="module_v2x_surrounding_empty_bt_height">86px</dimen>
-    <dimen name="module_v2x_surrounding_empty_bt_margin_top">58px</dimen>
-    <dimen name="module_v2x_surrounding_root_margin_left">48px</dimen>
-    <dimen name="module_v2x_surrounding_margin_left">48px</dimen>
-    <dimen name="module_v2x_surrounding_empty_image_height">349px</dimen>
-    <dimen name="module_v2x_surrounding_item_width">465px</dimen>
-    <dimen name="module_v2x_surrounding_item_height">306px</dimen>
-    <dimen name="module_v2x_surrounding_item_bottom">77px</dimen>
-    <dimen name="module_v2x_surrounding_item_bottom_image_height">50px</dimen>
-    <dimen name="module_v2x_surrounding_item_marigin_left">28px</dimen>
-    <dimen name="module_v2x_surrounding_item_marigin_bottom_left">16px</dimen>
-    <dimen name="module_v2x_panel_surrounding_marginbottom">5px</dimen>
-    <dimen name="module_v2x_panel_surrounding_stance">80px</dimen>
-    <dimen name="module_v2x_surrounding_top">22px</dimen>
-
-    <dimen name="module_v2x_surrounding_list_margin_left">20px</dimen>
-    <dimen name="module_v2x_surrounding_item_margin_left">30px</dimen>
-
-    <dimen name="module_v2x_surrounding_refresh_bt_radius">42px</dimen>
-    <dimen name="module_v2x_surrounding_top_textsize">30px</dimen>
-    <dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
-    <dimen name="module_v2x_surrounding_item_bottom_right_textsize">30px</dimen>
-    <dimen name="module_v2x_surrounding_item_maigin_left">50px</dimen>
-
-    <dimen name="module_v2x_panel_width">120px</dimen>
-
-    <dimen name="module_v2x_panel_tab_height">158px</dimen>
-
-    <!--适配 V2X 弹窗 UI-->
-    <dimen name="module_v2x_event_type_title_text_size">20px</dimen>
-    <dimen name="module_v2x_event_title_text_size">36px</dimen>
-    <dimen name="module_v2x_event_sub_title_text_size">28px</dimen>
-    <dimen name="module_v2x_event_head_size">55px</dimen>
-    <dimen name="module_v2x_event_live_error_text_size">36px</dimen>
-    <dimen name="module_v2x_live_window_height">310px</dimen>
-    <dimen name="module_v2x_event_button_size">110px</dimen>
-    <dimen name="module_v2x_event_button_size_detail">120px</dimen>
-
-    <!--道路事件 高的弹窗-->
-    <dimen name="module_v2x_event_image_height">270px</dimen>
-    <dimen name="module_v2x_event_image_width">480px</dimen>
-    <dimen name="module_v2x_event_window_height">330px</dimen>
-    <dimen name="module_v2x_event_window_height_ground">450px</dimen>
-
-    <!--疲劳驾驶、违章停车、道路求助-->
-    <dimen name="module_v2x_fatigue_driving_window_height_ground">200px</dimen>
-
-    <dimen name="module_v2x_event_help_head_size">75px</dimen>
-    <dimen name="module_v2x_event_help_title_text_size">32px</dimen>
-    <dimen name="module_v2x_event_help_sub_title_text_size">26px</dimen>
-    <dimen name="module_v2x_event_help_distance_text_size">80px</dimen>
-    <dimen name="module_v2x_event_parking_text_size">34px</dimen>
-
-    <!--最优路线-->
-    <dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
-    <dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
-
-    <!--适配 V2X 弹窗 UI-->
-
-    <dimen name="module_v2x_event_panel_btn_x">940px</dimen>
-    <dimen name="module_v2x_event_panel_btn_y">701px</dimen>
-    <dimen name="v2x_driving_width">150px</dimen>
-    <dimen name="v2x_driving_heigt">46px</dimen>
-    <dimen name="v2x_recommond_route_size">26px</dimen>
-
-
-</resources>
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 8e83da6e51..9229a21b5a 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
@@ -117,8 +117,8 @@
     <dimen name="module_v2x_event_parking_text_size">34px</dimen>
 
     <!--最优路线-->
-    <dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
-    <dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
+    <dimen name="module_v2x_event_warning_type_image_size">100px</dimen>
+    <dimen name="module_v2x_event_warning_type_text_size">32px</dimen>
 
     <!--适配 V2X 弹窗 UI-->
 

From 1b2feb6c47ca555477d0322d0b7310c07ca061c9 Mon Sep 17 00:00:00 2001
From: wujifei <wujifei@zhidaoauto.com>
Date: Mon, 17 May 2021 16:49:33 +0800
Subject: [PATCH 05/24] =?UTF-8?q?new#=E4=BC=98=E5=8C=96=E9=80=9F=E5=BA=A6?=
 =?UTF-8?q?=E8=A1=A8=E7=9B=98UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/module/extensions/view/ArcView.java  | 10 ++++++----
 .../src/main/res/values-xhdpi-2560x1440/dimens.xml     |  3 +++
 .../src/main/res/values-xhdpi/dimens.xml               |  3 +++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java
index df19dc6d38..fce75f2bc4 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java
@@ -15,6 +15,8 @@ import android.view.View;
 
 import androidx.annotation.Nullable;
 
+import com.mogo.module.extensions.R;
+
 /**
  * created by wujifei on 2021/3/24 16:20
  * describe:
@@ -28,7 +30,7 @@ public class ArcView extends View {
     //圆弧颜色
     private int mArcColor;
     //圆弧的画笔的宽度
-    private float mStrokeWith = dp2px(10);
+    private float mStrokeWith = getResources().getDimension(R.dimen.module_ext_arcView_stroke_with);
     //文字描述的paint
     private Paint mTextPaint;
 
@@ -73,11 +75,11 @@ public class ArcView extends View {
         mTextPaint.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
         //绘制中心的数值
         mTextPaint.getTextBounds(mValue, 0, mValue.length(), mRect);
-        canvas.drawText(mValue, getWidth() / 2, getHeight() / 2 + mRect.height() / 2-10, mTextPaint);
+        canvas.drawText(mValue, getWidth() / 2, getHeight() / 2 + mRect.height() / 2 - 10, mTextPaint);
 
         mTextPaint.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
         //绘制中心文字描述
-        mTextPaint.setTextSize(dp2px(28));
+        mTextPaint.setTextSize(getResources().getDimension(R.dimen.module_ext_arcView_des_text_size));
         mTextPaint.getTextBounds(mDes, 0, mDes.length(), mRect);
         canvas.drawText(mDes, getWidth() / 2, getHeight() * 17 / 20 + mRect.height() / 2, mTextPaint);
     }
@@ -116,7 +118,7 @@ public class ArcView extends View {
         //设置文本的对齐方式
         mTextPaint.setTextAlign(Paint.Align.CENTER);
         //mTextPaint.setTextSize(getResources().getDimensionPixelSize(R.dimen.dp_12));
-        mTextPaint.setTextSize(dp2px(80));
+        mTextPaint.setTextSize(getResources().getDimension(R.dimen.module_ext_arcView_center_text_size));
 
     }
 
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml
index c4155f70f7..703c97c9a2 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -5,4 +5,7 @@
     <dimen name="module_ext_speed_height">460px</dimen>
     <dimen name="module_ext_arcView_width">320px</dimen>
     <dimen name="module_ext_arcView_height">320px</dimen>
+    <dimen name="module_ext_arcView_stroke_with">15px</dimen>
+    <dimen name="module_ext_arcView_center_text_size">110px</dimen>
+    <dimen name="module_ext_arcView_des_text_size">40px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
index 67bc009a50..010482f882 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
@@ -187,5 +187,8 @@
 
     <dimen name="module_ext_arcView_width">200px</dimen>
     <dimen name="module_ext_arcView_height">200px</dimen>
+    <dimen name="module_ext_arcView_stroke_with">10px</dimen>
+    <dimen name="module_ext_arcView_center_text_size">80px</dimen>
+    <dimen name="module_ext_arcView_des_text_size">28px</dimen>
 
 </resources>
\ No newline at end of file

From 9f2eb25774df43044e1a014d3fa0013743f6dde2 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Mon, 17 May 2021 16:50:17 +0800
Subject: [PATCH 06/24] add new func of mockData

---
 .../map/impl/custom/CustomMapApiBuilder.java  |   2 +-
 .../service/intent/MockIntentHandler.java     |   5 +
 .../network/bean/MockSocketReceiverData.java  |  50 +++++++++
 .../timedelay/TimeDelayUploadManager.java     |  90 +++++++++++++--
 .../res/values-xhdpi-2560x1440/dimens.xml     |   6 +
 .../res/values-xhdpi-2560x1600/dimens.xml     | 105 ------------------
 6 files changed, 145 insertions(+), 113 deletions(-)
 create mode 100644 modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketReceiverData.java
 delete mode 100644 modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml

diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
index a38eff0242..b2eaad0e6d 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
@@ -95,7 +95,7 @@ class CustomMapApiBuilder implements IMogoMapApiBuilder {
     public IMogoMapView getMapView( Context context ) {
         Log.d(TAG,"setDebugMode==true");
         NavAutoApi.INSTANCE.init( context, MapParams.Companion.init()
-                .setDebugMode( true )
+                .setDebugMode( false )
                 .setCoordinateType( MapParams.COORDINATETYPE_GCJ02 )
                 .setPerspectiveMode( MapParams.MAP_PERSPECTIVE_2D )
                 .setZoom( 20 )
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
index 4374b23b9f..e829abc695 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
@@ -35,6 +35,7 @@ import com.mogo.module.common.uploadintime.SnapshotLocationController;
 import com.mogo.module.service.MarkerServiceHandler;
 import com.mogo.module.service.R;
 import com.mogo.module.service.status.EnvStatusManager;
+import com.mogo.module.service.timedelay.TimeDelayUploadManager;
 import com.mogo.realtime.entity.ADASRecognizedResult;
 import com.mogo.realtime.entity.CloudRoadData;
 import com.mogo.realtime.entity.MogoSnapshotSetData;
@@ -617,6 +618,10 @@ public class MockIntentHandler implements IntentHandler {
             case 54:
                 mTimeTickCarHandler.sendEmptyMessageDelayed(1, 0L);
                 break;
+            case 55:
+                //开启模拟数据Mock，用于验证算法准确性
+                TimeDelayUploadManager.getInstance().init(context);
+                break;
         }
     }
 
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketReceiverData.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketReceiverData.java
new file mode 100644
index 0000000000..0655504e6c
--- /dev/null
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketReceiverData.java
@@ -0,0 +1,50 @@
+package com.mogo.module.service.network.bean;
+
+public class MockSocketReceiverData {
+
+    public static final int MOCK_RECEIVER_STATUS_START = 0;
+    public static final int MOCK_RECEIVER_STATUS_STOP = 1;
+
+    private int status;
+    private double lat;
+    private double lon;
+    private double heading;
+    private long systemTime;
+    private long satelliteTime;
+
+    public int getStatus() {
+        return status;
+    }
+
+    public double getLat() {
+        return lat;
+    }
+
+    public double getLon() {
+        return lon;
+    }
+
+    public double getHeading() {
+        return heading;
+    }
+
+    public long getSystemTime() {
+        return systemTime;
+    }
+
+    public long getSatelliteTime() {
+        return satelliteTime;
+    }
+
+    @Override
+    public String toString() {
+        return "MockSocketReceiverData{" +
+                "status=" + status +
+                ", lat=" + lat +
+                ", lon=" + lon +
+                ", heading=" + heading +
+                ", systemTime=" + systemTime +
+                ", satelliteTime=" + satelliteTime +
+                '}';
+    }
+}
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
index fd8c1947e7..1c66762326 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
@@ -1,23 +1,44 @@
 package com.mogo.module.service.timedelay;
 
 import android.content.Context;
+import android.os.Handler;
+import android.os.Message;
 
 import com.mogo.module.common.MogoApisHandler;
+import com.mogo.module.common.uploadintime.SnapshotLocationController;
+import com.mogo.module.service.MarkerServiceHandler;
+import com.mogo.module.service.network.bean.MockSocketReceiverData;
+import com.mogo.realtime.api.MoGoAiCloudRealTime;
+import com.mogo.realtime.entity.MogoSnapshotSetData;
+import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
 import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.utils.WorkThreadHandler;
+import com.mogo.utils.logger.Logger;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import static com.mogo.module.service.network.bean.MockSocketReceiverData.MOCK_RECEIVER_STATUS_START;
 
 /**
  * 接收服务端模拟定位数据，对下发数据做实时Post上报，统计时延
  */
-public class TimeDelayUploadManager implements IMogoOnMessageListener {
+public class TimeDelayUploadManager implements IMogoOnMessageListener<MockSocketReceiverData>, IMogoCloudOnMsgListener {
+
+    private static final String TAG = "TimeDelayUploadManager";
 
     private volatile static TimeDelayUploadManager timeDelayUploadManager;
     private static final int MSG_SOCKET_TYPE = 403000;
+    private static final int MOCK_MSG = 1;
+    private boolean isMockData = false;
+    private MockSocketReceiverData mMockData;
+    private long mRecordSatelliteTime; //todo 后续多点模拟用
 
     private TimeDelayUploadManager() {
 
     }
 
-    public TimeDelayUploadManager getInstance() {
+    public static TimeDelayUploadManager getInstance() {
         if (timeDelayUploadManager == null) {
             synchronized (TimeDelayUploadManager.class) {
                 if (timeDelayUploadManager == null) {
@@ -31,16 +52,71 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener {
     public void init(Context mContext) {
         MogoApisHandler.getInstance()
                 .getApis()
-                .getSocketManagerApi(mContext).registerOnMessageListener(MSG_SOCKET_TYPE,this);
+                .getSocketManagerApi(mContext).registerOnMessageListener(MSG_SOCKET_TYPE, this);
+        MoGoAiCloudRealTime.registerOnMsgListener(this);
+    }
+
+    private final Handler mockHandler = new Handler(WorkThreadHandler.newInstance("mock-algorithm-work-thread").getLooper()) {
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            if (msg.what == MOCK_MSG) {
+                //改变地图定位数据，触发自车移动
+                JSONObject jo = new JSONObject();
+                try {
+                    jo.put("lon", mMockData.getLon());
+                    jo.put("lat", mMockData.getLat());
+                    jo.put("heading", mMockData.getHeading());
+                    jo.put("systemTime", System.currentTimeMillis());
+                    jo.put("satelliteTime", System.currentTimeMillis());
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                Logger.d(TAG, "更改自车定位点");
+                MarkerServiceHandler.getApis().getMapServiceApi().getMapUIController().syncLocation2Map(jo);
+                Logger.d(TAG, "同步定位信息，用于上报");
+                SnapshotLocationController.getInstance().syncAdasLocationInfo(jo);
+                mockHandler.sendEmptyMessageDelayed(MOCK_MSG, 50);
+            }
+        }
+    };
+
+    @Override
+    public Class<MockSocketReceiverData> target() {
+        return MockSocketReceiverData.class;
+    }
+
+    //接收socket数据
+    @Override
+    public void onMsgReceived(MockSocketReceiverData mockData) {
+        Logger.d(TAG, "onMsgReceived obj : " + mockData.toString());
+        if (mockData.getStatus() == MOCK_RECEIVER_STATUS_START) {
+            isMockData = true;
+            //开启定位模拟
+            mMockData = mockData;
+            mRecordSatelliteTime = mockData.getSatelliteTime();
+            mockHandler.sendEmptyMessage(MOCK_MSG);
+        } else {
+            isMockData = false;
+            //停止定位模拟
+            if (mockHandler.hasMessages(MOCK_MSG)) {
+                mockHandler.removeMessages(MOCK_MSG);
+                mMockData = null;
+                mRecordSatelliteTime = 0;
+            }
+        }
     }
 
     @Override
-    public Class target() {
-        return null;
+    public void onMsgSend(long id) {
+
     }
 
+    //接收实时数据监听回调，用于给服务端上报时延
     @Override
-    public void onMsgReceived(Object obj) {
-
+    public void onMsgReceived(MogoSnapshotSetData mogoSnapshotSetData) {
+        if (isMockData) {
+            //接口数据上报
+        }
     }
 }
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
index e09973a74e..d1f05d95d7 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -6,6 +6,12 @@
     <dimen name="module_v2x_road_event_icon_width">133px</dimen>
     <dimen name="module_v2x_road_event_icon_height">133px</dimen>
 
+    <dimen name="module_ext_top_view_no_link_width_in_vr_mode">778px</dimen>
+    <dimen name="module_v2x_event_see_live_window_height_vr">687px</dimen>
+    <dimen name="module_v2x_event_window_top_margin_vr">200px</dimen>
+    <dimen name="module_v2x_event_window_close_distance">10px</dimen>
+    <dimen name="module_v2x_event_window_height_vr_for_item">487px</dimen>
+    <dimen name="module_v2x_event_window_width_vr">778px</dimen>
 
     <dimen name="module_v2x_fatigue_driving_window_height_ground">234px</dimen>
     <dimen name="module_v2x_fault_help_width">1067px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml
deleted file mode 100644
index 1978407261..0000000000
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-    <!--联想PAD适配-->
-    <dimen name="module_main_v2x_animation_width">800px</dimen>
-
-    <dimen name="module_v2x_search_marginLeft">32px</dimen>
-    <dimen name="module_v2x_operation_panel_share_goneMarginRight">32px</dimen>
-
-    <dimen name="module_v2x_push_img_height">390px</dimen>
-    <dimen name="module_v2x_push_img_container_height">410px</dimen>
-
-
-    <dimen name="module_v2x_event_icon_size">160px</dimen>
-
-
-    <dimen name="module_v2x_event_distance_text">60px</dimen>
-    <dimen name="module_v2x_event_distance_title">40px</dimen>
-
-    <dimen name="module_v2x_history_event_icon_size">80px</dimen>
-
-    <dimen name="module_ext_top_view_no_link_width_in_vr_mode">778px</dimen>
-    <dimen name="module_v2x_event_see_live_window_height_vr">687px</dimen>
-    <dimen name="module_v2x_event_window_top_margin_vr">200px</dimen>
-    <dimen name="module_v2x_event_window_close_distance">10px</dimen>
-    <dimen name="module_v2x_event_window_height_vr_for_item">487px</dimen>
-    <dimen name="module_v2x_event_window_width_vr">778px</dimen>
-
-    <dimen name="module_v2x_surrounding_item_bottom_size">15px</dimen>
-    <dimen name="module_v2x_map_left">550px</dimen>
-    <dimen name="module_v2x_map_top">200px</dimen>
-    <dimen name="module_v2x_map_right">200px</dimen>
-    <dimen name="module_v2x_map_bottom">100px</dimen>
-    <dimen name="module_v2x_surrounding_top_height">90px</dimen>
-    <dimen name="module_v2x_surrounding_top_bt_width">162px</dimen>
-    <dimen name="module_v2x_surrounding_top_bt_height">64px</dimen>
-    <dimen name="module_v2x_surrounding_empty_iv_margin_top">80px</dimen>
-    <dimen name="module_v2x_surrounding_empty_tv_margin_top">26px</dimen>
-    <dimen name="module_v2x_surrounding_empty_bt_width">270px</dimen>
-    <dimen name="module_v2x_surrounding_empty_bt_height">86px</dimen>
-    <dimen name="module_v2x_surrounding_empty_bt_margin_top">58px</dimen>
-    <dimen name="module_v2x_surrounding_root_margin_left">48px</dimen>
-    <dimen name="module_v2x_surrounding_margin_left">48px</dimen>
-    <dimen name="module_v2x_surrounding_empty_image_height">349px</dimen>
-    <dimen name="module_v2x_surrounding_item_width">465px</dimen>
-    <dimen name="module_v2x_surrounding_item_height">306px</dimen>
-    <dimen name="module_v2x_surrounding_item_bottom">77px</dimen>
-    <dimen name="module_v2x_surrounding_item_bottom_image_height">50px</dimen>
-    <dimen name="module_v2x_surrounding_item_marigin_left">28px</dimen>
-    <dimen name="module_v2x_surrounding_item_marigin_bottom_left">16px</dimen>
-    <dimen name="module_v2x_panel_surrounding_marginbottom">5px</dimen>
-    <dimen name="module_v2x_panel_surrounding_stance">80px</dimen>
-    <dimen name="module_v2x_surrounding_top">22px</dimen>
-
-    <dimen name="module_v2x_surrounding_list_margin_left">20px</dimen>
-    <dimen name="module_v2x_surrounding_item_margin_left">30px</dimen>
-
-    <dimen name="module_v2x_surrounding_refresh_bt_radius">42px</dimen>
-    <dimen name="module_v2x_surrounding_top_textsize">30px</dimen>
-    <dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
-    <dimen name="module_v2x_surrounding_item_bottom_right_textsize">30px</dimen>
-    <dimen name="module_v2x_surrounding_item_maigin_left">50px</dimen>
-
-    <dimen name="module_v2x_panel_width">120px</dimen>
-
-    <dimen name="module_v2x_panel_tab_height">158px</dimen>
-
-    <!--适配 V2X 弹窗 UI-->
-    <dimen name="module_v2x_event_type_title_text_size">20px</dimen>
-    <dimen name="module_v2x_event_title_text_size">36px</dimen>
-    <dimen name="module_v2x_event_sub_title_text_size">28px</dimen>
-    <dimen name="module_v2x_event_head_size">55px</dimen>
-    <dimen name="module_v2x_event_live_error_text_size">36px</dimen>
-    <dimen name="module_v2x_live_window_height">310px</dimen>
-    <dimen name="module_v2x_event_button_size">110px</dimen>
-    <dimen name="module_v2x_event_button_size_detail">120px</dimen>
-
-    <!--道路事件 高的弹窗-->
-    <dimen name="module_v2x_event_image_height">270px</dimen>
-    <dimen name="module_v2x_event_image_width">480px</dimen>
-    <dimen name="module_v2x_event_window_height">330px</dimen>
-    <dimen name="module_v2x_event_window_height_ground">450px</dimen>
-
-    <!--疲劳驾驶、违章停车、道路求助-->
-    <dimen name="module_v2x_fatigue_driving_window_height_ground">200px</dimen>
-
-    <dimen name="module_v2x_event_help_head_size">75px</dimen>
-    <dimen name="module_v2x_event_help_title_text_size">32px</dimen>
-    <dimen name="module_v2x_event_help_sub_title_text_size">26px</dimen>
-    <dimen name="module_v2x_event_help_distance_text_size">80px</dimen>
-    <dimen name="module_v2x_event_parking_text_size">34px</dimen>
-
-    <!--最优路线-->
-    <dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
-    <dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
-
-    <!--适配 V2X 弹窗 UI-->
-
-    <dimen name="module_v2x_event_panel_btn_x">940px</dimen>
-    <dimen name="module_v2x_event_panel_btn_y">701px</dimen>
-    <dimen name="v2x_driving_width">150px</dimen>
-    <dimen name="v2x_driving_heigt">46px</dimen>
-    <dimen name="v2x_recommond_route_size">26px</dimen>
-
-
-</resources>

From 552b0d8592ea8c19cbe54b97a58b6f0c7344bc14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 17 May 2021 17:37:02 +0800
Subject: [PATCH 07/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E8=81=94?=
 =?UTF-8?q?=E6=83=B3=E6=B8=A0=E9=81=93-=E5=87=BA=E7=A7=9F=E8=BD=A6?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=8F=E5=B7=B4=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                     | 60 +++++++++++++++++++++++++++-
 app/functions/abiFilters.gradle      | 18 +++++++++
 app/functions/aicloudservices.gradle |  4 ++
 app/functions/basedmap.gradle        |  4 ++
 app/functions/baseservices.gradle    |  4 ++
 app/functions/bizguide.gradle        |  4 ++
 app/functions/leftpanel.gradle       |  4 ++
 app/functions/och.gradle             |  4 ++
 app/functions/skin.gradle            |  8 ++++
 app/functions/tts.gradle             |  4 ++
 app/regroup.gradle                   |  2 +-
 11 files changed, 114 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f2d477d65d..081adfd4df 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -229,7 +229,7 @@ android {
             dimension "product"
             buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
             // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
-            buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
+            buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
             buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
             manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue,CHANNEL_VALUE: "f8xx"]
             // 是否使用高德sdk自定义导航
@@ -251,6 +251,64 @@ android {
             // 是否需要使用工控机的rtk定位
             buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true'
         }
+        // f系列-网约车-出租车
+        fPadLenovoOchTaxi {
+            // 应用包名
+            applicationId rootProject.ext.android.fLauncherApplicationId
+            dimension "product"
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
+            // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
+            buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
+            buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
+            manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fochtaxi"]
+            // 是否使用高德sdk自定义导航
+            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
+            // 是否支持换肤
+            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true'
+            // 是否支持查询导航目的地车友
+            buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
+            // 是否支持桌面卡片刷新
+            buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false'
+            // 是否基于地图
+            buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
+            // 是否加载引导模块
+            buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false'
+            // 分享时是否隐藏 adas
+            buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false'
+            // 是否需要实时上报坐标
+            buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
+            // 是否需要使用工控机的rtk定位
+            buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true'
+        }
+        // f系列-网约车-小巴车
+        fPadLenovoOchBus {
+            // 应用包名
+            applicationId rootProject.ext.android.fLauncherApplicationId
+            dimension "product"
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
+            // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
+            buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
+            buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
+            manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue,CHANNEL_VALUE: "fochbus"]
+            // 是否使用高德sdk自定义导航
+            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
+            // 是否支持换肤
+            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true'
+            // 是否支持查询导航目的地车友
+            buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
+            // 是否支持桌面卡片刷新
+            buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false'
+            // 是否基于地图
+            buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
+            // 是否加载引导模块
+            buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false'
+            // 分享时是否隐藏 adas
+            buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false'
+            // 是否需要实时上报坐标
+            buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
+            // 是否需要使用工控机的rtk定位
+            buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true'
+        }
         // f系列-分体机
         phone {
             // 应用包名
diff --git a/app/functions/abiFilters.gradle b/app/functions/abiFilters.gradle
index 8243a5905d..d66359ad19 100644
--- a/app/functions/abiFilters.gradle
+++ b/app/functions/abiFilters.gradle
@@ -37,6 +37,24 @@ project.android.productFlavors {
             }
         }
     }
+    // 联想Pad
+    fPadLenovoOchTaxi {
+        externalNativeBuild {
+            ndk {
+                // 设置支持的SO库架构
+                abiFilters "arm64-v8a"
+            }
+        }
+    }
+    // 联想Pad
+    fPadLenovoOchBus {
+        externalNativeBuild {
+            ndk {
+                // 设置支持的SO库架构
+                abiFilters "arm64-v8a"
+            }
+        }
+    }
     // f系列-分体机
     f80x {
         externalNativeBuild {
diff --git a/app/functions/aicloudservices.gradle b/app/functions/aicloudservices.gradle
index a50fc6fae7..8e231d6f34 100644
--- a/app/functions/aicloudservices.gradle
+++ b/app/functions/aicloudservices.gradle
@@ -18,6 +18,8 @@ project.dependencies {
         em3Implementation rootProject.ext.dependencies.mogoaicloudserviceapk
         fochtaxiImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
         fochbusImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
+        fPadLenovoOchTaxi rootProject.ext.dependencies.mogoaicloudserviceapk
+        fPadLenovoOchBus  rootProject.ext.dependencies.mogoaicloudserviceapk
     } else {
         bydautoImplementation project(':foudations:mogo-aicloud-services-sdk')
         phoneImplementation project(':foudations:mogo-aicloud-services-sdk')
@@ -36,5 +38,7 @@ project.dependencies {
         em3Implementation project(':foudations:mogo-aicloud-services-apk')
         fochtaxiImplementation project(':foudations:mogo-aicloud-services-apk')
         fochbusImplementation project(':foudations:mogo-aicloud-services-apk')
+        fPadLenovoOchTaxiImplementation project(':foudations:mogo-aicloud-services-apk')
+        fPadLenovoOchBusImplementation project(':foudations:mogo-aicloud-services-apk')
     }
 }
\ No newline at end of file
diff --git a/app/functions/basedmap.gradle b/app/functions/basedmap.gradle
index 320d8a4e27..8c8272a1bd 100644
--- a/app/functions/basedmap.gradle
+++ b/app/functions/basedmap.gradle
@@ -8,6 +8,8 @@ project.dependencies {
         f80xImplementation rootProject.ext.dependencies.mapcustom
         fochtaxiImplementation rootProject.ext.dependencies.mapcustom
         fochbusImplementation rootProject.ext.dependencies.mapcustom
+        fPadLenovoOchTaxi rootProject.ext.dependencies.mapcustom
+        fPadLenovoOchBus  rootProject.ext.dependencies.mapcustom
         phoneImplementation rootProject.ext.dependencies.mapcustom
 
         f8AmapImplementation rootProject.ext.dependencies.mapamap
@@ -27,6 +29,8 @@ project.dependencies {
         f80xImplementation project(':libraries:map-custom')
         fochtaxiImplementation project(':libraries:map-custom')
         fochbusImplementation project(':libraries:map-custom')
+        fPadLenovoOchTaxiImplementation project(':libraries:map-custom')
+        fPadLenovoOchBusImplementation project(':libraries:map-custom')
         phoneImplementation project(':libraries:map-custom')
 
         f8AmapImplementation project(':libraries:map-amap')
diff --git a/app/functions/baseservices.gradle b/app/functions/baseservices.gradle
index f5a0f534a5..899c325566 100644
--- a/app/functions/baseservices.gradle
+++ b/app/functions/baseservices.gradle
@@ -19,6 +19,8 @@ project.dependencies {
         em3Implementation rootProject.ext.dependencies.mogobaseserviceapk
         fochtaxiImplementation rootProject.ext.dependencies.mogobaseserviceapk
         fochbusImplementation rootProject.ext.dependencies.mogobaseserviceapk
+        fPadLenovoOchTaxi rootProject.ext.dependencies.mogobaseserviceapk
+        fPadLenovoOchBus  rootProject.ext.dependencies.mogobaseserviceapk
     } else {
         bydautoImplementation project(':foudations:mogo-base-services-sdk')
         phoneImplementation project(':foudations:mogo-base-services-sdk')
@@ -37,5 +39,7 @@ project.dependencies {
         em3Implementation project(':foudations:mogo-base-services-apk')
         fochtaxiImplementation project(':foudations:mogo-base-services-apk')
         fochbusImplementation project(':foudations:mogo-base-services-apk')
+        fPadLenovoOchTaxiImplementation project(':foudations:mogo-base-services-apk')
+        fPadLenovoOchBusImplementation project(':foudations:mogo-base-services-apk')
     }
 }
\ No newline at end of file
diff --git a/app/functions/bizguide.gradle b/app/functions/bizguide.gradle
index 3ac507dd4a..3e99b88ceb 100644
--- a/app/functions/bizguide.gradle
+++ b/app/functions/bizguide.gradle
@@ -15,6 +15,8 @@ project.dependencies {
         em3Implementation rootProject.ext.dependencies.mogomoduleguide
         fochtaxiImplementation rootProject.ext.dependencies.mogomoduleguide
         fochbusImplementation rootProject.ext.dependencies.mogomoduleguide
+        fPadLenovoOchTaxi rootProject.ext.dependencies.mogomoduleguide
+        fPadLenovoOchBus rootProject.ext.dependencies.mogomoduleguide
     } else {
         bydautoImplementation project(':modules:mogo-module-guide')
         phoneImplementation project(':modules:mogo-module-guide')
@@ -29,5 +31,7 @@ project.dependencies {
         em3Implementation project(':modules:mogo-module-guide')
         fochtaxiImplementation project(':modules:mogo-module-guide')
         fochbusImplementation project(':modules:mogo-module-guide')
+        fPadLenovoOchTaxiImplementation project(':modules:mogo-module-guide')
+        fPadLenovoOchBusImplementation project(':modules:mogo-module-guide')
     }
 }
\ No newline at end of file
diff --git a/app/functions/leftpanel.gradle b/app/functions/leftpanel.gradle
index 8fbdf3da82..490bba4fca 100644
--- a/app/functions/leftpanel.gradle
+++ b/app/functions/leftpanel.gradle
@@ -19,6 +19,8 @@ project.dependencies {
         em3Implementation rootProject.ext.dependencies.moduleleftpanelnoop
         fochtaxiImplementation rootProject.ext.dependencies.moduleleftpanelnoop
         fochbusImplementation rootProject.ext.dependencies.moduleleftpanelnoop
+        fPadLenovoOchTaxi rootProject.ext.dependencies.moduleleftpanelnoop
+        fPadLenovoOchBus  rootProject.ext.dependencies.moduleleftpanelnoop
         phoneImplementation rootProject.ext.dependencies.moduleleftpanelnoop
     } else {
         bydautoImplementation project(':modules:mogo-module-left-panel')
@@ -37,6 +39,8 @@ project.dependencies {
         em3Implementation project(':modules:mogo-module-left-panel-noop')
         fochtaxiImplementation project(':modules:mogo-module-left-panel-noop')
         fochbusImplementation project(':modules:mogo-module-left-panel-noop')
+        fPadLenovoOchTaxiImplementation project(':modules:mogo-module-left-panel-noop')
+        fPadLenovoOchBusImplementation project(':modules:mogo-module-left-panel-noop')
         phoneImplementation project(':modules:mogo-module-left-panel-noop')
     }
 }
\ No newline at end of file
diff --git a/app/functions/och.gradle b/app/functions/och.gradle
index 2a4c8dd1fc..04832b3026 100644
--- a/app/functions/och.gradle
+++ b/app/functions/och.gradle
@@ -17,6 +17,8 @@ project.dependencies {
         e8xxImplementation rootProject.ext.dependencies.mogoochnoop
         fochtaxiImplementation rootProject.ext.dependencies.mogoochtaxi
         fochbusImplementation rootProject.ext.dependencies.mogoochbus
+        fPadLenovoOchTaxi rootProject.ext.dependencies.mogoochtaxi
+        fPadLenovoOchBus  rootProject.ext.dependencies.mogoochbus
     } else {
         bydautoImplementation project(':OCH:mogo-och-noop')
         phoneImplementation project(':OCH:mogo-och-noop')
@@ -34,5 +36,7 @@ project.dependencies {
         e8xxImplementation project(':OCH:mogo-och-noop')
         fochtaxiImplementation project(':OCH:mogo-och-taxi')
         fochbusImplementation project(':OCH:mogo-och-bus')
+        fPadLenovoOchTaxiImplementation project(':OCH:mogo-och-taxi')
+        fPadLenovoOchBusImplementation project(':OCH:mogo-och-bus')
     }
 }
\ No newline at end of file
diff --git a/app/functions/skin.gradle b/app/functions/skin.gradle
index 0d5cbb0ef0..fdb734d1d0 100644
--- a/app/functions/skin.gradle
+++ b/app/functions/skin.gradle
@@ -17,6 +17,8 @@ project.dependencies {
         e8xxImplementation rootProject.ext.dependencies.skinsupportimpl
         fochtaxiImplementation rootProject.ext.dependencies.skinsupportimpl
         fochbusImplementation rootProject.ext.dependencies.skinsupportimpl
+        fPadLenovoOchTaxi rootProject.ext.dependencies.skinsupportimpl
+        fPadLenovoOchBus  rootProject.ext.dependencies.skinsupportimpl
         phoneImplementation rootProject.ext.dependencies.skinsupportimpl
 
         f8xxImplementation rootProject.ext.dependencies.skinsupportlight
@@ -30,6 +32,8 @@ project.dependencies {
         em3Implementation rootProject.ext.dependencies.skinsupportlight
         fochtaxiImplementation rootProject.ext.dependencies.skinsupportlight
         fochbusImplementation rootProject.ext.dependencies.skinsupportlight
+        fPadLenovoOchTaxi rootProject.ext.dependencies.skinsupportlight
+        fPadLenovoOchBus  rootProject.ext.dependencies.skinsupportlight
         phoneImplementation rootProject.ext.dependencies.skinsupportlight
     } else {
 
@@ -51,6 +55,8 @@ project.dependencies {
         e8xxImplementation project(':skin:mogo-skin-support-impl')
         fochtaxiImplementation project(':skin:mogo-skin-support-impl')
         fochbusImplementation project(':skin:mogo-skin-support-impl')
+        fPadLenovoOchTaxiImplementation project(':skin:mogo-skin-support-impl')
+        fPadLenovoOchBusImplementation project(':skin:mogo-skin-support-impl')
         phoneImplementation project(':skin:mogo-skin-support-impl')
 
         f8xxImplementation project(':skin:mogo-skin-light')
@@ -64,6 +70,8 @@ project.dependencies {
         em3Implementation project(':skin:mogo-skin-light')
         fochtaxiImplementation project(':skin:mogo-skin-light')
         fochbusImplementation project(':skin:mogo-skin-light')
+        fPadLenovoOchTaxiImplementation project(':skin:mogo-skin-light')
+        fPadLenovoOchBusImplementation project(':skin:mogo-skin-light')
         phoneImplementation project(':skin:mogo-skin-light')
     }
 }
\ No newline at end of file
diff --git a/app/functions/tts.gradle b/app/functions/tts.gradle
index 17412804cd..6b1cac3804 100644
--- a/app/functions/tts.gradle
+++ b/app/functions/tts.gradle
@@ -15,6 +15,8 @@ project.dependencies {
         e8xxImplementation rootProject.ext.dependencies.ttszhi
         fochtaxiImplementation rootProject.ext.dependencies.ttszhi
         fochbusImplementation rootProject.ext.dependencies.ttszhi
+        fPadLenovoOchTaxi rootProject.ext.dependencies.ttszhi
+        fPadLenovoOchBus  rootProject.ext.dependencies.ttszhi
         phoneImplementation rootProject.ext.dependencies.ttszhi
     } else {
         bydautoImplementation project(':tts:tts-di')
@@ -32,6 +34,8 @@ project.dependencies {
         e8xxImplementation project(':tts:tts-zhi')
         fochtaxiImplementation project(':tts:tts-zhi')
         fochbusImplementation project(':tts:tts-zhi')
+        fPadLenovoOchTaxiImplementation project(':tts:tts-zhi')
+        fPadLenovoOchBusImplementation project(':tts:tts-zhi')
         phoneImplementation project(':tts:tts-zhi')
     }
 }
\ No newline at end of file
diff --git a/app/regroup.gradle b/app/regroup.gradle
index e3632ceefd..71bf5ac173 100644
--- a/app/regroup.gradle
+++ b/app/regroup.gradle
@@ -3,7 +3,7 @@
 afterEvaluate {
 
     def independent = ["em3", "em1", "d80x", "d82x", "bydauto", "em2", "phone"]
-    def launcher = ["f80x", "f8xx", "f8amap", "em4", "e8xx", "fochtaxi", "fochbus", "fPadLenovo"]
+    def launcher = ["f80x", "f8xx", "f8amap", "em4", "e8xx", "fochtaxi", "fochbus", "fPadLenovo", "fPadLenovoOchTaxi", "fPadLenovoOchBus"]
 
     it.getTasks().iterator().forEachRemaining {
         def task = it

From 2843807e1a92c3fe7886f7ed5b8ef9e6de7f4b00 Mon Sep 17 00:00:00 2001
From: wujifei <wujifei@zhidaoauto.com>
Date: Mon, 17 May 2021 17:42:12 +0800
Subject: [PATCH 08/24] =?UTF-8?q?new#=E4=BC=98=E5=8C=96V2X=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties                             |  2 +-
 .../src/main/res/drawable/bg_v2x_event_bg.xml |  2 +-
 .../res/layout/item_v2x_event_detail_vr.xml   | 20 +++++++++----------
 .../res/values-xhdpi-2560x1440/dimens.xml     |  6 +++++-
 .../src/main/res/values-xhdpi/dimens.xml      |  6 +++++-
 5 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 65c68bc372..8610c31a25 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -146,7 +146,7 @@ MOGO_OCH_TAXI_VERSION=1.0.0
 
 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=2.2.320
+CARCHATTING_VERSION=2.2.321
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.1.11
 # websocket
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml
index a3ba69250b..707a1b5291 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="#000000" />
-    <corners android:radius="20dp" />
+    <corners android:radius="@dimen/module_v2x_road_event_bg_radius" />
 </shape>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
index 1069f4c9f0..2036bdec17 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
@@ -229,7 +229,7 @@
             android:id="@+id/iv_event"
             android:layout_width="@dimen/module_v2x_road_event_icon_width"
             android:layout_height="@dimen/module_v2x_road_event_icon_height"
-            android:layout_marginLeft="24dp"
+            android:layout_marginLeft="@dimen/module_v2x_road_event_icon_margin_left"
             android:scaleType="fitXY"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -252,18 +252,18 @@
                 android:id="@+id/tv_event"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:maxWidth="480dp"
-                android:paddingLeft="20dp"
-                android:paddingRight="20dp"
+                android:layout_marginLeft="@dimen/module_v2x_road_event_icon_margin_left"
+                android:layout_marginRight="@dimen/module_v2x_road_event_icon_margin_left"
+                android:maxWidth="@dimen/dp_480"
                 android:textColor="@color/v2x_white_color"
-                android:textSize="30sp" />
+                android:textSize="@dimen/module_v2x_road_event_text_size" />
 
             <ImageView
                 android:id="@+id/iv_play"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="6dp"
-                android:paddingLeft="22dp"
+                android:layout_marginLeft="@dimen/module_v2x_road_event_icon_margin_left"
+                android:layout_marginTop="@dimen/module_v2x_road_event_icon_play_margin_top"
                 android:src="@drawable/icon_play"
                 android:visibility="gone" />
         </LinearLayout>
@@ -284,14 +284,12 @@
 
         <TextView
             android:id="@+id/tv_play"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/module_v2x_road_event_height"
             android:layout_height="@dimen/module_v2x_road_event_height"
             android:gravity="center"
-            android:paddingLeft="24dp"
-            android:paddingRight="24dp"
             android:text="播放"
             android:textColor="@color/v2x_event_play_text"
-            android:textSize="24sp"
+            android:textSize="@dimen/module_v2x_road_event_text_play_text_size"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
index 3213f45db8..1504183b46 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -3,9 +3,13 @@
 
     <dimen name="module_v2x_event_window_height_vr">227px</dimen>
     <dimen name="module_v2x_road_event_height">187px</dimen>
+    <dimen name="module_v2x_road_event_bg_radius">30px</dimen>
     <dimen name="module_v2x_road_event_icon_width">133px</dimen>
     <dimen name="module_v2x_road_event_icon_height">133px</dimen>
-
+    <dimen name="module_v2x_road_event_icon_margin_left">38px</dimen>
+    <dimen name="module_v2x_road_event_text_size">42px</dimen>
+    <dimen name="module_v2x_road_event_icon_play_margin_top">12px</dimen>
+    <dimen name="module_v2x_road_event_text_play_text_size">40px</dimen>
 
     <dimen name="module_v2x_fatigue_driving_window_height_ground">234px</dimen>
     <dimen name="module_v2x_fault_help_width">1067px</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 9229a21b5a..d274966902 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
@@ -136,9 +136,13 @@
     <dimen name="v2x_recommond_route_size">26px</dimen>
 
     <dimen name="module_v2x_road_event_height">140px</dimen>
-
+    <dimen name="module_v2x_road_event_bg_radius">20px</dimen>
     <dimen name="module_v2x_road_event_icon_width">100px</dimen>
     <dimen name="module_v2x_road_event_icon_height">100px</dimen>
+    <dimen name="module_v2x_road_event_icon_margin_left">30px</dimen>
+    <dimen name="module_v2x_road_event_text_size">32px</dimen>
+    <dimen name="module_v2x_road_event_icon_play_margin_top">8px</dimen>
+    <dimen name="module_v2x_road_event_text_play_text_size">30px</dimen>
 
     <dimen name="module_v2x_fault_help_width">800px</dimen>
     <dimen name="module_v2x_fault_help_height">140px</dimen>

From 8e9ad6398c122e4d4e438dabe0a4383da9f74375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 17 May 2021 20:16:15 +0800
Subject: [PATCH 09/24] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E8=81=94?=
 =?UTF-8?q?=E6=83=B3=E6=B8=A0=E9=81=93=E9=89=B4=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |  3 ---
 app/build.gradle                              |  9 +++------
 .../com/mogo/launcher/MogoApplication.java    | 19 ++++++++++++++-----
 .../java/com/mogo/commons/network/Utils.java  |  7 ++-----
 libraries/map-custom/build.gradle             |  2 +-
 .../mogo/map/impl/custom/AMapViewWrapper.java |  2 +-
 modules.txt                                   |  1 -
 settings.gradle                               |  2 --
 8 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 904f2b0e0d..e768208a07 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -25,8 +25,6 @@
             <option value="$PROJECT_DIR$/foudations/httpdns-tencent" />
             <option value="$PROJECT_DIR$/foudations/mogo-aicloud-services-apk" />
             <option value="$PROJECT_DIR$/foudations/mogo-aicloud-services-sdk" />
-            <option value="$PROJECT_DIR$/foudations/mogo-base-services-apk" />
-            <option value="$PROJECT_DIR$/foudations/mogo-base-services-sdk" />
             <option value="$PROJECT_DIR$/foudations/mogo-base-websocket-sdk" />
             <option value="$PROJECT_DIR$/foudations/mogo-commons" />
             <option value="$PROJECT_DIR$/foudations/mogo-utils" />
@@ -91,7 +89,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 081adfd4df..7307c7ffd3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -229,7 +229,7 @@ android {
             dimension "product"
             buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
             // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
-            buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
+            buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
             buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
             manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue,CHANNEL_VALUE: "f8xx"]
             // 是否使用高德sdk自定义导航
@@ -258,7 +258,7 @@ android {
             dimension "product"
             buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
             // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
-            buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
+            buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
             buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
             manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fochtaxi"]
             // 是否使用高德sdk自定义导航
@@ -287,7 +287,7 @@ android {
             dimension "product"
             buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
             // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
-            buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
+            buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
             buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
             manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue,CHANNEL_VALUE: "fochbus"]
             // 是否使用高德sdk自定义导航
@@ -707,7 +707,6 @@ dependencies {
         implementation project(':modules:mogo-module-search')
         implementation project(':modules:mogo-module-authorize')
         implementation project(':modules:mogo-module-service')
-//        implementation project(':modules:mogo-module-obu')
         implementation project(':modules:mogo-module-splash')
         implementation project(':modules:mogo-module-service')
         implementation project(':modules:mogo-module-v2x')
@@ -723,14 +722,12 @@ dependencies {
     apply from: "./functions/aicloudservices.gradle"
     apply from: "./functions/basedmap.gradle"
     apply from: "./functions/perform.gradle"
-//    apply from: "./functions/baseservices.gradle"
     apply from: "./functions/socketpush.gradle"
     apply from: "./functions/leftpanel.gradle"
     apply from: "./functions/skin.gradle"
     apply from: "./functions/crashreport.gradle"
     apply from: "./functions/widgets.gradle"
     apply from: "./functions/tts.gradle"
-//    apply from: "./functions/httpdns.gradle"
     apply from: "./functions/backwidget.gradle"
     apply from: "./functions/mediaui.gradle"
     apply from: "./functions/bizguide.gradle"
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index a16f097341..a25c82bec0 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -3,7 +3,6 @@ package com.mogo.launcher;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Process;
-import android.text.TextUtils;
 import android.util.Log;
 
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -34,7 +33,6 @@ import com.mogo.service.MogoServicePaths;
 import com.mogo.test.crashreport.ITestCrashReportProvider;
 import com.mogo.test.crashreport.upgrade.UpgradeReportProvider;
 import com.mogo.utils.ProcessUtils;
-import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.httpdns.HttpSimpleLocation;
 import com.mogo.utils.logger.LogLevel;
 import com.mogo.utils.logger.Logger;
@@ -213,13 +211,25 @@ public class MogoApplication extends AbsMogoApplication {
                 clientConfig.setNetMode(MogoHttpDnsConfig.HTTP_DNS_ENV_RELEASE);
         }
         // 设置是否是第三APP登录
-        clientConfig.setThirdLogin(false);
+        clientConfig.setThirdLogin(DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE);
         // 设置是否输出日志
         clientConfig.setShowDebugLog(true);
         // 设置是否是直播推流的主播
         clientConfig.setAnchor(false);
         // 设置从蘑菇AI开放平台获取的APPKey
-        clientConfig.setThirdPartyAppKey("wbvpzgar");
+        switch (DebugConfig.getCarMachineType()) {
+            // 衡阳-鹰眼项目
+            case DebugConfig.CAR_MACHINE_TYPE_LENOVO:
+                clientConfig.setThirdPartyAppKey("pfieouqg");
+                break;
+            // 比亚迪
+            case DebugConfig.CAR_MACHINE_TYPE_BYD:
+                clientConfig.setThirdPartyAppKey("bydauto");
+                break;
+            default:
+                // 默认使用智慧驾驶的AppKey
+                clientConfig.setThirdPartyAppKey("wbvpzgar");
+        }
         // 设置应用服务AppId  长链、鉴权
         clientConfig.setServiceAppId("com.mogo.launcher");
         // 设置AI云平台分配给三方应用的签名密钥，需要从AI云平台申请
@@ -230,7 +240,6 @@ public class MogoApplication extends AbsMogoApplication {
         // 设置是否使用MoGoAiCloud SDK内部定位进行实时数据上报
         clientConfig.setIsUseExternalLocation(true);
 
-
         // 设置DNS经纬度位置
         clientConfig.setIHttpDnsCurrentLocation(new IHttpDnsCurrentLocation() {
             @Override
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
index 90bc9e507d..6e3225295c 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
@@ -2,17 +2,15 @@ package com.mogo.commons.network;
 
 import android.Manifest;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.telephony.CellLocation;
 import android.telephony.TelephonyManager;
 import android.telephony.cdma.CdmaCellLocation;
 import android.telephony.gsm.GsmCellLocation;
-import android.text.TextUtils;
 
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
-import com.mogo.utils.storage.SharedPrefsMgr;
+import com.mogo.utils.DeviceIdUtils;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -66,9 +64,8 @@ public class Utils {
     public static final String PROPERTIES = "android.os.SystemProperties";
 
     public static String getSn() {
-
         if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE ) {
-            return SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).getString( "allocated_sn" );
+            return DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp());
         }
         return getSystemProperties( GSM_SERIAL );
     }
diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle
index 0b22d19eb9..246dc89190 100644
--- a/libraries/map-custom/build.gradle
+++ b/libraries/map-custom/build.gradle
@@ -67,7 +67,7 @@ dependencies {
         implementation project(':foudations:mogo-commons')
     }
 
-    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.24'
+    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.25'
 //    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4'
 }
 
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
index d6cefd890a..3297bf8e5d 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
@@ -766,7 +766,7 @@ public class AMapViewWrapper implements IMogoMapView,
                 if (!mIsDelayed) {
                     mIsDelayed = true;
                     UiThreadHandler.postDelayed(() -> {
-                        Logger.d(TAG, "倒计时结束");
+                        //Logger.d(TAG, "倒计时结束");
                         mIsFirstLocated = false;
                     }, 5_000L);
                 }
diff --git a/modules.txt b/modules.txt
index a5a9ea1689..0abf7fea3b 100644
--- a/modules.txt
+++ b/modules.txt
@@ -45,7 +45,6 @@
 :modules:mogo-module-left-panel
 :modules:mogo-module-left-panel-noop
 :foudations:mogo-base-services-apk
-:foudations:mogo-base-services-sdk
 :modules:mogo-module-push-base
 :modules:mogo-module-push-noop
 :modules:mogo-module-push
diff --git a/settings.gradle b/settings.gradle
index 5513b6d948..108f29c378 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -25,8 +25,6 @@ include ':skin:mogo-skin-support-noop'
 include ':skin:mogo-skin-support'
 include ':modules:mogo-module-widgets'
 include ':modules:mogo-module-monitor'
-include ':foudations:mogo-base-services-apk'
-include ':foudations:mogo-base-services-sdk'
 include ':modules:mogo-module-splash-noop'
 include ':modules:mogo-module-splash'
 include ':modules:mogo-module-left-panel-noop'

From 83331bbaa5d70082c70fe922997be739409b3b57 Mon Sep 17 00:00:00 2001
From: wujifei <wujifei@zhidaoauto.com>
Date: Tue, 18 May 2021 11:19:36 +0800
Subject: [PATCH 10/24] =?UTF-8?q?new#=E4=BC=98=E5=8C=96V2X=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties                                           | 2 +-
 .../src/main/res/layout/item_v2x_event_detail_vr.xml        | 3 ++-
 .../src/main/res/layout/window_road_event_detail_vr.xml     | 6 +++---
 .../src/main/res/values-xhdpi-2560x1440/dimens.xml          | 4 ++--
 .../mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml    | 3 ++-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 8610c31a25..40e096cda8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -146,7 +146,7 @@ MOGO_OCH_TAXI_VERSION=1.0.0
 
 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=2.2.321
+CARCHATTING_VERSION=2.2.324
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.1.11
 # websocket
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
index 2036bdec17..aef6b12987 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
@@ -2,8 +2,9 @@
 <LinearLayout 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:layout_width="@dimen/dp_822"
+    android:layout_width="@dimen/module_v2x_road_event_window_width_vr"
     android:layout_height="wrap_content"
+    android:layout_gravity="center"
     android:gravity="center">
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml
index 05f72a463e..8c54bdc86a 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml
@@ -2,14 +2,14 @@
 <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:layout_width="@dimen/dp_822"
-    android:layout_height="@dimen/module_v2x_event_window_height_vr"
+    android:layout_width="@dimen/module_v2x_road_event_window_width_vr"
+    android:layout_height="@dimen/module_v2x_road_event_window_height_vr"
     android:layout_marginTop="@dimen/dp_8">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvRoadEventList"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/module_v2x_event_window_height_vr"
+        android:layout_height="@dimen/module_v2x_road_event_window_height_vr"
         android:minHeight="@dimen/module_v2x_event_window_height"
         android:orientation="horizontal"
         android:overScrollMode="never"
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
index 6f257e51ab..bd5d9c6937 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <dimen name="module_v2x_event_window_height_vr">227px</dimen>
+    <dimen name="module_v2x_road_event_window_width_vr">1100px</dimen>
+    <dimen name="module_v2x_road_event_window_height_vr">227px</dimen>
     <dimen name="module_v2x_road_event_height">187px</dimen>
     <dimen name="module_v2x_road_event_bg_radius">30px</dimen>
     <dimen name="module_v2x_road_event_icon_width">133px</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 d274966902..6fc0fe97ff 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
@@ -97,7 +97,8 @@
 
     <!--适配 V2X 弹窗-VR-->
     <dimen name="module_v2x_event_button_size_detail_vr">80px</dimen>
-    <dimen name="module_v2x_event_window_height_vr">182px</dimen>
+    <dimen name="module_v2x_road_event_window_width_vr">882px</dimen>
+    <dimen name="module_v2x_road_event_window_height_vr">182px</dimen>
     <dimen name="module_v2x_event_button_size_vr">64px</dimen>
     <dimen name="module_v2x_event_icon_size_vr">60px</dimen>
 

From 43c2f267cdba79c5fadd3b81289fa5050adaddc1 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 May 2021 11:43:37 +0800
Subject: [PATCH 11/24] =?UTF-8?q?=E4=BF=AE=E5=A4=8Drelease=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=BC=95=E5=85=A5=E5=85=B3=E9=94=AE=E5=AD=90=E6=8B=BC?=
 =?UTF-8?q?=E5=86=99bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/functions/aicloudservices.gradle | 4 ++--
 app/functions/basedmap.gradle        | 4 ++--
 app/functions/baseservices.gradle    | 4 ++--
 app/functions/bizguide.gradle        | 4 ++--
 app/functions/leftpanel.gradle       | 4 ++--
 app/functions/och.gradle             | 4 ++--
 app/functions/skin.gradle            | 8 ++++----
 app/functions/tts.gradle             | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/functions/aicloudservices.gradle b/app/functions/aicloudservices.gradle
index 8e231d6f34..27db3d472c 100644
--- a/app/functions/aicloudservices.gradle
+++ b/app/functions/aicloudservices.gradle
@@ -18,8 +18,8 @@ project.dependencies {
         em3Implementation rootProject.ext.dependencies.mogoaicloudserviceapk
         fochtaxiImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
         fochbusImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
-        fPadLenovoOchTaxi rootProject.ext.dependencies.mogoaicloudserviceapk
-        fPadLenovoOchBus  rootProject.ext.dependencies.mogoaicloudserviceapk
+        fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
+        fPadLenovoOchBusImplementation  rootProject.ext.dependencies.mogoaicloudserviceapk
     } else {
         bydautoImplementation project(':foudations:mogo-aicloud-services-sdk')
         phoneImplementation project(':foudations:mogo-aicloud-services-sdk')
diff --git a/app/functions/basedmap.gradle b/app/functions/basedmap.gradle
index 8c8272a1bd..f860cd50f0 100644
--- a/app/functions/basedmap.gradle
+++ b/app/functions/basedmap.gradle
@@ -8,8 +8,8 @@ project.dependencies {
         f80xImplementation rootProject.ext.dependencies.mapcustom
         fochtaxiImplementation rootProject.ext.dependencies.mapcustom
         fochbusImplementation rootProject.ext.dependencies.mapcustom
-        fPadLenovoOchTaxi rootProject.ext.dependencies.mapcustom
-        fPadLenovoOchBus  rootProject.ext.dependencies.mapcustom
+        fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mapcustom
+        fPadLenovoOchBusImplementation  rootProject.ext.dependencies.mapcustom
         phoneImplementation rootProject.ext.dependencies.mapcustom
 
         f8AmapImplementation rootProject.ext.dependencies.mapamap
diff --git a/app/functions/baseservices.gradle b/app/functions/baseservices.gradle
index 899c325566..d55ecb16bb 100644
--- a/app/functions/baseservices.gradle
+++ b/app/functions/baseservices.gradle
@@ -19,8 +19,8 @@ project.dependencies {
         em3Implementation rootProject.ext.dependencies.mogobaseserviceapk
         fochtaxiImplementation rootProject.ext.dependencies.mogobaseserviceapk
         fochbusImplementation rootProject.ext.dependencies.mogobaseserviceapk
-        fPadLenovoOchTaxi rootProject.ext.dependencies.mogobaseserviceapk
-        fPadLenovoOchBus  rootProject.ext.dependencies.mogobaseserviceapk
+        fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mogobaseserviceapk
+        fPadLenovoOchBusImplementation  rootProject.ext.dependencies.mogobaseserviceapk
     } else {
         bydautoImplementation project(':foudations:mogo-base-services-sdk')
         phoneImplementation project(':foudations:mogo-base-services-sdk')
diff --git a/app/functions/bizguide.gradle b/app/functions/bizguide.gradle
index 3e99b88ceb..2c745ec561 100644
--- a/app/functions/bizguide.gradle
+++ b/app/functions/bizguide.gradle
@@ -15,8 +15,8 @@ project.dependencies {
         em3Implementation rootProject.ext.dependencies.mogomoduleguide
         fochtaxiImplementation rootProject.ext.dependencies.mogomoduleguide
         fochbusImplementation rootProject.ext.dependencies.mogomoduleguide
-        fPadLenovoOchTaxi rootProject.ext.dependencies.mogomoduleguide
-        fPadLenovoOchBus rootProject.ext.dependencies.mogomoduleguide
+        fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mogomoduleguide
+        fPadLenovoOchBusImplementation rootProject.ext.dependencies.mogomoduleguide
     } else {
         bydautoImplementation project(':modules:mogo-module-guide')
         phoneImplementation project(':modules:mogo-module-guide')
diff --git a/app/functions/leftpanel.gradle b/app/functions/leftpanel.gradle
index 490bba4fca..f2db9e564a 100644
--- a/app/functions/leftpanel.gradle
+++ b/app/functions/leftpanel.gradle
@@ -19,8 +19,8 @@ project.dependencies {
         em3Implementation rootProject.ext.dependencies.moduleleftpanelnoop
         fochtaxiImplementation rootProject.ext.dependencies.moduleleftpanelnoop
         fochbusImplementation rootProject.ext.dependencies.moduleleftpanelnoop
-        fPadLenovoOchTaxi rootProject.ext.dependencies.moduleleftpanelnoop
-        fPadLenovoOchBus  rootProject.ext.dependencies.moduleleftpanelnoop
+        fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.moduleleftpanelnoop
+        fPadLenovoOchBusImplementation  rootProject.ext.dependencies.moduleleftpanelnoop
         phoneImplementation rootProject.ext.dependencies.moduleleftpanelnoop
     } else {
         bydautoImplementation project(':modules:mogo-module-left-panel')
diff --git a/app/functions/och.gradle b/app/functions/och.gradle
index 04832b3026..cdcffebd93 100644
--- a/app/functions/och.gradle
+++ b/app/functions/och.gradle
@@ -17,8 +17,8 @@ project.dependencies {
         e8xxImplementation rootProject.ext.dependencies.mogoochnoop
         fochtaxiImplementation rootProject.ext.dependencies.mogoochtaxi
         fochbusImplementation rootProject.ext.dependencies.mogoochbus
-        fPadLenovoOchTaxi rootProject.ext.dependencies.mogoochtaxi
-        fPadLenovoOchBus  rootProject.ext.dependencies.mogoochbus
+        fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mogoochtaxi
+        fPadLenovoOchBusImplementation  rootProject.ext.dependencies.mogoochbus
     } else {
         bydautoImplementation project(':OCH:mogo-och-noop')
         phoneImplementation project(':OCH:mogo-och-noop')
diff --git a/app/functions/skin.gradle b/app/functions/skin.gradle
index fdb734d1d0..31cd21d8b1 100644
--- a/app/functions/skin.gradle
+++ b/app/functions/skin.gradle
@@ -17,8 +17,8 @@ project.dependencies {
         e8xxImplementation rootProject.ext.dependencies.skinsupportimpl
         fochtaxiImplementation rootProject.ext.dependencies.skinsupportimpl
         fochbusImplementation rootProject.ext.dependencies.skinsupportimpl
-        fPadLenovoOchTaxi rootProject.ext.dependencies.skinsupportimpl
-        fPadLenovoOchBus  rootProject.ext.dependencies.skinsupportimpl
+        fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.skinsupportimpl
+        fPadLenovoOchBusImplementation  rootProject.ext.dependencies.skinsupportimpl
         phoneImplementation rootProject.ext.dependencies.skinsupportimpl
 
         f8xxImplementation rootProject.ext.dependencies.skinsupportlight
@@ -32,8 +32,8 @@ project.dependencies {
         em3Implementation rootProject.ext.dependencies.skinsupportlight
         fochtaxiImplementation rootProject.ext.dependencies.skinsupportlight
         fochbusImplementation rootProject.ext.dependencies.skinsupportlight
-        fPadLenovoOchTaxi rootProject.ext.dependencies.skinsupportlight
-        fPadLenovoOchBus  rootProject.ext.dependencies.skinsupportlight
+        fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.skinsupportlight
+        fPadLenovoOchBusImplementation  rootProject.ext.dependencies.skinsupportlight
         phoneImplementation rootProject.ext.dependencies.skinsupportlight
     } else {
 
diff --git a/app/functions/tts.gradle b/app/functions/tts.gradle
index 6b1cac3804..4d0abe06d9 100644
--- a/app/functions/tts.gradle
+++ b/app/functions/tts.gradle
@@ -15,8 +15,8 @@ project.dependencies {
         e8xxImplementation rootProject.ext.dependencies.ttszhi
         fochtaxiImplementation rootProject.ext.dependencies.ttszhi
         fochbusImplementation rootProject.ext.dependencies.ttszhi
-        fPadLenovoOchTaxi rootProject.ext.dependencies.ttszhi
-        fPadLenovoOchBus  rootProject.ext.dependencies.ttszhi
+        fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.ttszhi
+        fPadLenovoOchBusImplementation  rootProject.ext.dependencies.ttszhi
         phoneImplementation rootProject.ext.dependencies.ttszhi
     } else {
         bydautoImplementation project(':tts:tts-di')

From 2014441a623cad1f904ba48ea6405dd9ab208318 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 May 2021 11:50:48 +0800
Subject: [PATCH 12/24] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96AiSDK=E7=9A=84=E6=97=B6=E5=80=99=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E7=9A=84=E6=98=AF=E5=90=A6=E6=98=AF=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=9A=84=E5=8F=82=E6=95=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/launcher/MogoApplication.java   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index a25c82bec0..af999d77fc 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -211,24 +211,25 @@ public class MogoApplication extends AbsMogoApplication {
                 clientConfig.setNetMode(MogoHttpDnsConfig.HTTP_DNS_ENV_RELEASE);
         }
         // 设置是否是第三APP登录
-        clientConfig.setThirdLogin(DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE);
+        clientConfig.setThirdLogin(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE);
         // 设置是否输出日志
         clientConfig.setShowDebugLog(true);
         // 设置是否是直播推流的主播
         clientConfig.setAnchor(false);
         // 设置从蘑菇AI开放平台获取的APPKey
         switch (DebugConfig.getCarMachineType()) {
-            // 衡阳-鹰眼项目
-            case DebugConfig.CAR_MACHINE_TYPE_LENOVO:
-                clientConfig.setThirdPartyAppKey("pfieouqg");
+            // 自研车机
+            case DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE:
+                clientConfig.setThirdPartyAppKey("wbvpzgar");
                 break;
             // 比亚迪
             case DebugConfig.CAR_MACHINE_TYPE_BYD:
                 clientConfig.setThirdPartyAppKey("bydauto");
                 break;
-            default:
-                // 默认使用智慧驾驶的AppKey
-                clientConfig.setThirdPartyAppKey("wbvpzgar");
+            // 衡阳-鹰眼项目
+            case DebugConfig.CAR_MACHINE_TYPE_LENOVO:
+                clientConfig.setThirdPartyAppKey("pfieouqg");
+                break;
         }
         // 设置应用服务AppId  长链、鉴权
         clientConfig.setServiceAppId("com.mogo.launcher");

From 71f8f71a3b20589e3f6b9c426f7e9c966eaece66 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Tue, 18 May 2021 16:30:34 +0800
Subject: [PATCH 13/24] wait to finish

---
 .../service/network/TimeDelayApiService.java  | 21 ++++++++++++++++
 .../MockDataDelayUploadHttpConstant.java      | 24 +++++++++++++++++++
 .../timedelay/TimeDelayUploadManager.java     | 17 ++++++++++++-
 3 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 modules/mogo-module-service/src/main/java/com/mogo/module/service/network/TimeDelayApiService.java
 create mode 100644 modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/MockDataDelayUploadHttpConstant.java

diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/TimeDelayApiService.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/TimeDelayApiService.java
new file mode 100644
index 0000000000..a07b6c58b8
--- /dev/null
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/TimeDelayApiService.java
@@ -0,0 +1,21 @@
+package com.mogo.module.service.network;
+
+import com.mogo.module.common.entity.MarkerResponse;
+
+import java.util.Map;
+
+import io.reactivex.Observable;
+import retrofit2.http.FieldMap;
+import retrofit2.http.FormUrlEncoded;
+import retrofit2.http.POST;
+
+public interface TimeDelayApiService {
+
+
+    /**
+     * 上报延时时间
+     */
+    @FormUrlEncoded
+    @POST("/yycp-computer-vision-service/mockEye/delayTimeCallBack")
+    Observable<Object> uploadDelayData(@FieldMap Map<String, Object> parameters);
+}
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/MockDataDelayUploadHttpConstant.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/MockDataDelayUploadHttpConstant.java
new file mode 100644
index 0000000000..ae5f0c3170
--- /dev/null
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/MockDataDelayUploadHttpConstant.java
@@ -0,0 +1,24 @@
+package com.mogo.module.service.timedelay;
+
+import com.mogo.commons.debug.DebugConfig;
+
+public class MockDataDelayUploadHttpConstant {
+
+    public static final String HOST_DEV = "http://dzt-test.zhidaozhixing.com";
+    public static final String HOST_TEST = "http://dzt-test.zhidaozhixing.com";
+    public static final String HOST_DEMO = "http://dzt-show.zhidaozhixing.com";
+    public static final String HOST_PRODUCT = "http://dzt.zhidaozhixing.com";
+
+    public static String getBaseUrl() {
+        switch (DebugConfig.getNetMode()) {
+            case DebugConfig.NET_MODE_DEV:
+                return HOST_DEV;
+            case DebugConfig.NET_MODE_QA:
+                return HOST_TEST;
+            case DebugConfig.NET_MODE_DEMO:
+                return HOST_DEMO;
+            default:
+                return HOST_PRODUCT;
+        }
+    }
+}
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
index 1c66762326..67e952d195 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
@@ -7,6 +7,7 @@ import android.os.Message;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.uploadintime.SnapshotLocationController;
 import com.mogo.module.service.MarkerServiceHandler;
+import com.mogo.module.service.network.TimeDelayApiService;
 import com.mogo.module.service.network.bean.MockSocketReceiverData;
 import com.mogo.realtime.api.MoGoAiCloudRealTime;
 import com.mogo.realtime.entity.MogoSnapshotSetData;
@@ -18,6 +19,9 @@ import com.mogo.utils.logger.Logger;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import io.reactivex.schedulers.Schedulers;
+import rx.android.schedulers.AndroidSchedulers;
+
 import static com.mogo.module.service.network.bean.MockSocketReceiverData.MOCK_RECEIVER_STATUS_START;
 
 /**
@@ -34,6 +38,8 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener<MockSocket
     private MockSocketReceiverData mMockData;
     private long mRecordSatelliteTime; //todo 后续多点模拟用
 
+    private TimeDelayApiService timeDelayApiService;
+
     private TimeDelayUploadManager() {
 
     }
@@ -90,12 +96,15 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener<MockSocket
     @Override
     public void onMsgReceived(MockSocketReceiverData mockData) {
         Logger.d(TAG, "onMsgReceived obj : " + mockData.toString());
-        if (mockData.getStatus() == MOCK_RECEIVER_STATUS_START) {
+        if (mockData.getStatus() == MOCK_RECEIVER_STATUS_START) { //todo 暂时以单条数据发送，后续多点实时发送Message
             isMockData = true;
             //开启定位模拟
             mMockData = mockData;
             mRecordSatelliteTime = mockData.getSatelliteTime();
             mockHandler.sendEmptyMessage(MOCK_MSG);
+            if (timeDelayApiService == null) {
+                timeDelayApiService = MogoApisHandler.getInstance().getApis().getNetworkApi().create(TimeDelayApiService.class, MockDataDelayUploadHttpConstant.getBaseUrl());
+            }
         } else {
             isMockData = false;
             //停止定位模拟
@@ -103,6 +112,7 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener<MockSocket
                 mockHandler.removeMessages(MOCK_MSG);
                 mMockData = null;
                 mRecordSatelliteTime = 0;
+                timeDelayApiService = null;
             }
         }
     }
@@ -117,6 +127,11 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener<MockSocket
     public void onMsgReceived(MogoSnapshotSetData mogoSnapshotSetData) {
         if (isMockData) {
             //接口数据上报
+
+//            timeDelayApiService.uploadDelayData()
+//                    .subscribeOn(Schedulers.io())
+//                    .observeOn(AndroidSchedulers.mainThread())
+//                    .subscribe()
         }
     }
 }

From 8d61b025e0a2d6151faf9791cbbbb1dd9556a51e Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Wed, 19 May 2021 10:34:23 +0800
Subject: [PATCH 14/24] wait to finish

---
 .idea/gradle.xml                              |  1 +
 .../service/network/TimeDelayApiService.java  |  3 +-
 .../timedelay/TimeDelayUploadManager.java     | 45 ++++++++++++++++---
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index e768208a07..fd91e149ef 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -89,6 +89,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/TimeDelayApiService.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/TimeDelayApiService.java
index a07b6c58b8..a4c4298fa7 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/TimeDelayApiService.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/TimeDelayApiService.java
@@ -1,5 +1,6 @@
 package com.mogo.module.service.network;
 
+import com.mogo.commons.data.BaseData;
 import com.mogo.module.common.entity.MarkerResponse;
 
 import java.util.Map;
@@ -17,5 +18,5 @@ public interface TimeDelayApiService {
      */
     @FormUrlEncoded
     @POST("/yycp-computer-vision-service/mockEye/delayTimeCallBack")
-    Observable<Object> uploadDelayData(@FieldMap Map<String, Object> parameters);
+    Observable<BaseData> uploadDelayData(@FieldMap Map<String, Object> parameters);
 }
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
index 67e952d195..99c4110213 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
@@ -1,27 +1,38 @@
 package com.mogo.module.service.timedelay;
 
 import android.content.Context;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Message;
 
+import androidx.annotation.RequiresApi;
+
+import com.mogo.commons.data.BaseData;
+import com.mogo.commons.network.SubscribeImpl;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.uploadintime.SnapshotLocationController;
 import com.mogo.module.service.MarkerServiceHandler;
 import com.mogo.module.service.network.TimeDelayApiService;
 import com.mogo.module.service.network.bean.MockSocketReceiverData;
 import com.mogo.realtime.api.MoGoAiCloudRealTime;
+import com.mogo.realtime.entity.CloudRoadData;
 import com.mogo.realtime.entity.MogoSnapshotSetData;
 import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
 import com.mogo.service.connection.IMogoOnMessageListener;
 import com.mogo.utils.WorkThreadHandler;
 import com.mogo.utils.logger.Logger;
+import com.mogo.utils.network.RequestOptions;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import io.reactivex.schedulers.Schedulers;
-import rx.android.schedulers.AndroidSchedulers;
+import java.util.HashMap;
+import java.util.Map;
 
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
+import static com.mogo.commons.AbsMogoApplication.getApp;
 import static com.mogo.module.service.network.bean.MockSocketReceiverData.MOCK_RECEIVER_STATUS_START;
 
 /**
@@ -123,15 +134,37 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener<MockSocket
     }
 
     //接收实时数据监听回调，用于给服务端上报时延
+    @RequiresApi(api = Build.VERSION_CODES.N)
     @Override
     public void onMsgReceived(MogoSnapshotSetData mogoSnapshotSetData) {
         if (isMockData) {
             //接口数据上报
+            CloudRoadData result = mogoSnapshotSetData.getAllList()
+                    .stream()
+                    .filter(cloudRoadData -> cloudRoadData.getUuid().equals(""))
+                    .findAny()
+                    .orElse(null);
+            if (result == null) {
+                return;
+            }
+            Map<String, Object> map = new HashMap<>();
+            map.put("systemTime", System.currentTimeMillis());
+            map.put("uuid", result.getUuid());
+            map.put("satelliteTime", result.getSatelliteTime());
+            timeDelayApiService.uploadDelayData(map)
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(new SubscribeImpl<BaseData>(RequestOptions.create(getApp())) {
+                        @Override
+                        public void onNext(BaseData o) {
+                            super.onNext(o);
+                        }
 
-//            timeDelayApiService.uploadDelayData()
-//                    .subscribeOn(Schedulers.io())
-//                    .observeOn(AndroidSchedulers.mainThread())
-//                    .subscribe()
+                        @Override
+                        public void onError(Throwable e) {
+                            super.onError(e);
+                        }
+                    });
         }
     }
 }

From a3735fdc7f9adfa9e7dcbc966a2a9d49624ae6a0 Mon Sep 17 00:00:00 2001
From: wujifei <wujifei@zhidaoauto.com>
Date: Wed, 19 May 2021 11:05:03 +0800
Subject: [PATCH 15/24] =?UTF-8?q?new#=E4=BC=98=E5=8C=96V2X=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/module/extensions/utils/TopViewAnimHelper.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
index 9fc3aeb8a8..63d682d408 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
@@ -75,6 +75,7 @@ public class TopViewAnimHelper {
     public void init(ConstraintLayout rootView, OnTopViewAnimSimpleListener listener) {
         topMotionLayout = rootView;
         topContainer = rootView.findViewById(R.id.module_entrance_id_top_container);
+        topContainer.getLayoutParams().width = (int) getDimen(R.dimen.module_ext_top_view_width);
         animNavInfoView = rootView.findViewById(R.id.module_ext_id_anim_nav_info);
         vrModeNavInfoView = rootView.findViewById(R.id.module_ext_id_vr_nav_info);
 

From add1a658c8c4a11cf8920eaa92a800a56c55fbf2 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Wed, 19 May 2021 16:34:33 +0800
Subject: [PATCH 16/24] add filter channel

---
 .idea/runConfigurations.xml                                    | 1 -
 .../mogo/module/service/timedelay/TimeDelayUploadManager.java  | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index e497da9998..7f68460d8b 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,7 +3,6 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
index 99c4110213..dc377b0d73 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
@@ -141,10 +141,11 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener<MockSocket
             //接口数据上报
             CloudRoadData result = mogoSnapshotSetData.getAllList()
                     .stream()
-                    .filter(cloudRoadData -> cloudRoadData.getUuid().equals(""))
+                    .filter(cloudRoadData -> cloudRoadData.getUuid().contains("serialNumber_"))
                     .findAny()
                     .orElse(null);
             if (result == null) {
+                Logger.d(TAG,"未找到与之匹配数据");
                 return;
             }
             Map<String, Object> map = new HashMap<>();

From 18647b9eed684fb6f70c03273b1721c9ae51eb17 Mon Sep 17 00:00:00 2001
From: wujifei <wujifei@zhidaoauto.com>
Date: Wed, 19 May 2021 18:45:25 +0800
Subject: [PATCH 17/24] =?UTF-8?q?new#=E5=8D=87=E7=BA=A7carchating=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
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 40e096cda8..6257d2ee0d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -146,7 +146,7 @@ MOGO_OCH_TAXI_VERSION=1.0.0
 
 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=2.2.324
+CARCHATTING_VERSION=2.2.325
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.1.11
 # websocket

From 3d9db5f4912abb125e92a5b683f0b2384c7b4beb 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 May 2021 19:53:14 +0800
Subject: [PATCH 18/24] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B0=8F=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E5=9C=A8=E8=81=94=E6=83=B3pad=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/launcher/MogoApplication.java    |  14 +-
 foudations/mogo-commons/build.gradle          |   1 +
 .../policy/MyPhoneLayoutInflater.java         |   0
 .../com/mogo/commons/AbsMogoApplication.java  |  10 +
 .../com/mogo/commons/mvp/MvpActivity.java     |   7 +-
 .../service/CarCorderController.kt            |  14 +-
 .../main/launcher/MainLauncherActivity.java   |   8 +-
 .../com/mogo/module/main/MainActivity.java    |   3 +
 modules/mogo-module-smp/consumer-rules.pro    |   6 +-
 .../src/main/AndroidManifest.xml              |   6 -
 .../main/java/com/amap/api/col/n3/le2.java    | 186 ------------------
 .../main/java/com/amap/api/col/n3/lg2.java    |  40 ----
 .../small/map/SmallMapDirectionView.java      |  53 ++---
 .../module/small/map/SmallMapFragment.java    |  43 ++++
 .../module/small/map/SmallMapProvider.java    | 101 ++++++++++
 .../module/small/map/SmallMapService.java     |  88 ---------
 .../module/small/map/SmallVisionProvider.java | 185 -----------------
 .../res/layout/module_small_map_fragment.xml  |  14 +-
 .../main/res/layout/module_small_map_view.xml |  15 +-
 .../res/values-xhdpi-2560x1440/dimens.xml     |  18 ++
 .../src/main/res/values-xhdpi/dimens.xml      |   4 +-
 .../service/map/IMogoSmallMapProvider.java    |   3 +-
 22 files changed, 263 insertions(+), 556 deletions(-)
 rename {modules/mogo-module-smp => foudations/mogo-commons}/src/main/java/com/android/internal/policy/MyPhoneLayoutInflater.java (100%)
 delete mode 100644 modules/mogo-module-smp/src/main/java/com/amap/api/col/n3/le2.java
 delete mode 100644 modules/mogo-module-smp/src/main/java/com/amap/api/col/n3/lg2.java
 create mode 100644 modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapFragment.java
 create mode 100644 modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
 delete mode 100644 modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapService.java
 delete mode 100644 modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallVisionProvider.java
 create mode 100644 modules/mogo-module-smp/src/main/res/values-xhdpi-2560x1440/dimens.xml

diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index af999d77fc..2f10de66a7 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -1,5 +1,6 @@
 package com.mogo.launcher;
 
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Process;
@@ -121,6 +122,17 @@ public class MogoApplication extends AbsMogoApplication {
             ARouter.getInstance().navigation(ITestCrashReportProvider.class);
         }
         Log.i("timer", "cost " + (System.currentTimeMillis() - start) + "ms");
+
+        try {
+            if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO) {
+                Intent intent = new Intent();
+                intent.setComponent(new ComponentName("com.zhidao.speech.voice.pad",
+                        "com.zhidao.speech.MainActivity"));
+                startActivity(intent);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     @Override
@@ -213,7 +225,7 @@ public class MogoApplication extends AbsMogoApplication {
         // 设置是否是第三APP登录
         clientConfig.setThirdLogin(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE);
         // 设置是否输出日志
-        clientConfig.setShowDebugLog(true);
+        clientConfig.setShowDebugLog(false);
         // 设置是否是直播推流的主播
         clientConfig.setAnchor(false);
         // 设置从蘑菇AI开放平台获取的APPKey
diff --git a/foudations/mogo-commons/build.gradle b/foudations/mogo-commons/build.gradle
index 7f4fbc1edc..ec4465a808 100644
--- a/foudations/mogo-commons/build.gradle
+++ b/foudations/mogo-commons/build.gradle
@@ -43,6 +43,7 @@ dependencies {
     implementation rootProject.ext.dependencies.rxjava
     implementation rootProject.ext.dependencies.accountsdk
     api rootProject.ext.dependencies.mogoaicloudrealtime
+    implementation rootProject.ext.dependencies.amapnavi3dmap
 
     if (Boolean.valueOf(RELEASE)) {
         implementation rootProject.ext.dependencies.mogoutils
diff --git a/modules/mogo-module-smp/src/main/java/com/android/internal/policy/MyPhoneLayoutInflater.java b/foudations/mogo-commons/src/main/java/com/android/internal/policy/MyPhoneLayoutInflater.java
similarity index 100%
rename from modules/mogo-module-smp/src/main/java/com/android/internal/policy/MyPhoneLayoutInflater.java
rename to foudations/mogo-commons/src/main/java/com/android/internal/policy/MyPhoneLayoutInflater.java
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
index 0681470777..f25f6a8ed4 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
@@ -11,6 +11,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.amap.api.navi.AMapNaviView;
+import com.android.internal.policy.MyPhoneLayoutInflater;
 import com.mogo.commons.analytics.AnalyticsUtils;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.device.Devices;
@@ -59,9 +61,17 @@ public abstract class AbsMogoApplication extends Application {
         return sApp;
     }
 
+   public static AMapNaviView aMapNaviView;
+
+    public static AMapNaviView getMapNaviView() {
+        return aMapNaviView;
+    }
+
     @Override
     public void onCreate() {
         super.onCreate();
+        aMapNaviView = new AMapNaviView(this);
+        aMapNaviView.onCreate(null);
         // 在设置皮肤布局填充器之前进行克隆一个出来
         mLayoutInflaterNoSkin = LayoutInflater.from(new ContextThemeWrapper(this, R.style.Theme_AppCompat)).cloneInContext(new ContextThemeWrapper(this, R.style.Theme_AppCompat));
         sApp = this;
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
index 7e7bae038c..2b8f50d889 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
@@ -30,7 +30,6 @@ public abstract class MvpActivity< V extends IView, P extends Presenter< V > >
 
     @Override
     protected void onCreate( @Nullable Bundle savedInstanceState ) {
-        hideBottomUIMenu();
         super.onCreate( savedInstanceState );
         beforeSetContentView(savedInstanceState);
         if ( DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_BYD ) {
@@ -43,6 +42,12 @@ public abstract class MvpActivity< V extends IView, P extends Presenter< V > >
         getLifecycle().addObserver( mPresenter );
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        hideBottomUIMenu();
+    }
+
     //隐藏导航栏
     protected void hideBottomUIMenu() {
         //隐藏虚拟按键
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
index ac1a0a8a49..7487c07477 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
@@ -68,11 +68,15 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
     }
 
     fun initCarCorderController() {
-        zdCarCoderController =
-                ZdCarCoderController.getInstance(AbsMogoApplication.getApp().applicationContext)
-        zdCarCoderController.addCallback(this)
-        zdCarCoderController.addVideoCallback(this)
-        zdCarCoderController.init()
+        try {
+            zdCarCoderController =
+                    ZdCarCoderController.getInstance(AbsMogoApplication.getApp().applicationContext)
+            zdCarCoderController.addCallback(this)
+            zdCarCoderController.addVideoCallback(this)
+            zdCarCoderController.init()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
     }
 
 
diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
index b8d5d84ae5..c185d432fc 100644
--- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
+++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
@@ -18,9 +18,9 @@ import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.main.MainActivity;
 import com.mogo.module.main.cards.MogoModulesManager;
 import com.mogo.module.service.receiver.MogoReceiver;
-import com.mogo.module.small.map.SmallVisionProvider;
 import com.mogo.och.IMogoOCH;
 import com.mogo.service.intent.IMogoIntentListener;
+import com.mogo.service.map.IMogoSmallMapProvider;
 import com.mogo.service.statusmanager.StatusDescriptor;
 import com.mogo.service.v2x.IV2XListener;
 import com.mogo.utils.logger.Logger;
@@ -116,6 +116,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
     @Override
     protected void loadOthersModules() {
         super.loadOthersModules();
+        Logger.d(TAG, "loadOthersModules");
         loadOCHModule();
         loadSmpModule();
     }
@@ -134,7 +135,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
      * 加载小地图模块
      */
     private void loadSmpModule() {
-        SmallVisionProvider smp = ARouter.getInstance().navigation(SmallVisionProvider.class);
+        IMogoSmallMapProvider smp = ARouter.getInstance().navigation(IMogoSmallMapProvider.class);
         if (smp != null) {
             smp.init(this, R.id.module_main_id_smp_fragment);
         }
@@ -170,7 +171,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
     }
 
 
-
     @Override
     public void warningChangedWithDirection(int type) {
         Log.d(TAG, "显示红色预警蒙层");
@@ -239,7 +239,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
 
     @Override
     public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
-        super.onStatusChanged(descriptor,isTrue);
+        super.onStatusChanged(descriptor, isTrue);
         if (isTrue) {
             mLeftShadowFrame.setVisibility(View.GONE);
             mApps.setVisibility(View.GONE);
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index 3e28dc2f18..843a95a9e6 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -229,6 +229,9 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
         MapCenterPointStrategy.setMapCenterPointByScene(mServiceApis.getMapServiceApi().getMapUIController(), Scene.AIMLESS);
     }
 
+    /**
+     * 加载其它模块
+     */
     protected void loadOthersModules() {
         // 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。
         loadContainerModules();
diff --git a/modules/mogo-module-smp/consumer-rules.pro b/modules/mogo-module-smp/consumer-rules.pro
index c3051b66d0..b294e7f5c4 100644
--- a/modules/mogo-module-smp/consumer-rules.pro
+++ b/modules/mogo-module-smp/consumer-rules.pro
@@ -1,4 +1,4 @@
--keep class com.mogo.module.small.map.SmallMapDirectionView{*;}
--keep class com.amap.api.col.n3.*{*;}
+-keep class com.mogo.module.small.map.*{*;}
 -keep class com.android.internal.policy.MyPhoneLayoutInflater{*;}
--keep class com.mogo.module.small.map.SmallVisionProvider{*;}
+-keep class com.amap.api.col.n3.*{*;}
+
diff --git a/modules/mogo-module-smp/src/main/AndroidManifest.xml b/modules/mogo-module-smp/src/main/AndroidManifest.xml
index 33c6adff88..3f004d131a 100644
--- a/modules/mogo-module-smp/src/main/AndroidManifest.xml
+++ b/modules/mogo-module-smp/src/main/AndroidManifest.xml
@@ -2,10 +2,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.mogo.module.small.map">
 
-    <!--<application>
-        <service
-            android:name=".SmallMapService"
-            android:exported="false"
-            />
-    </application>-->
 </manifest>
\ No newline at end of file
diff --git a/modules/mogo-module-smp/src/main/java/com/amap/api/col/n3/le2.java b/modules/mogo-module-smp/src/main/java/com/amap/api/col/n3/le2.java
deleted file mode 100644
index cd406be8a7..0000000000
--- a/modules/mogo-module-smp/src/main/java/com/amap/api/col/n3/le2.java
+++ /dev/null
@@ -1,186 +0,0 @@
-//
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by Fernflower decompiler)
-//
-
-package com.amap.api.col.n3;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.Resources.Theme;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.ContextThemeWrapper;
-import android.view.LayoutInflater;
-import android.view.LayoutInflater.Factory;
-import android.view.View;
-import android.view.ViewStub;
-
-import com.android.internal.policy.MyPhoneLayoutInflater;
-
-import java.lang.reflect.Constructor;
-import java.util.HashMap;
-import java.util.HashSet;
-
-public final class le2 extends ContextThemeWrapper {
-    private Resources a = lg.a();
-    private Theme b;
-    private LayoutInflater c;
-    private ClassLoader d;
-    private int e;
-    private static final String[] f = new String[]{"android.widget", "android.webkit", "android.app"};
-    private le2.a g = new le2.a();
-    private Factory h = new Factory() {
-        public final View onCreateView(String var1, Context var2, AttributeSet var3) {
-            return le2.this.a(var1, var2, var3);
-        }
-    };
-
-    public le2(Context var1, int var2, ClassLoader var3) {
-        super(var1, var2);
-        this.d = var3;
-        this.b = lg.b();
-        this.e = var2;
-        super.onApplyThemeResource(this.b, this.e, true);
-        (new StringBuilder("classloader:")).append(this.d);
-    }
-
-    public final Resources getResources() {
-        return this.a != null ? this.a : super.getResources();
-    }
-
-    public final void a(int var1) {
-        if (var1 != this.e) {
-            this.e = var1;
-            super.onApplyThemeResource(this.b, this.e, true);
-        }
-
-    }
-
-    public final Theme getTheme() {
-        return this.b != null ? this.b : super.getTheme();
-    }
-
-    public final Object getSystemService(String var1) {
-        if ("layout_inflater".equals(var1)) {
-            if (this.c == null) {
-                // 这里构建一个自己对的布局填充器
-                // 与已经被修改的context.getSystemService(Context.LAYOUT_INFLATER_SERVICE)
-                // 隔离从而保证高德地图SDK能正常初始化
-                LayoutInflater var2 = new MyPhoneLayoutInflater(getBaseContext());
-                this.c = var2.cloneInContext(this);
-                this.c.setFactory(this.h);
-                this.c = this.c.cloneInContext(this);
-            }
-
-            return this.c;
-        } else {
-            return super.getSystemService(var1);
-        }
-    }
-
-    private final View a(String var1, Context var2, AttributeSet var3) {
-        if (this.g.a.contains(var1)) {
-            return null;
-        } else {
-            Constructor var4;
-            if ((var4 = (Constructor) this.g.b.get(var1)) == null) {
-                Class var5 = null;
-                boolean var6 = false;
-                String var7 = "api.navi";
-
-                label71:
-                {
-                    label70:
-                    {
-                        Throwable var10000;
-                        label79:
-                        {
-                            boolean var10001;
-                            try {
-                                if (var1.contains(var7)) {
-                                    var5 = this.d.loadClass(var1);
-                                } else {
-                                    String[] var17;
-                                    int var8 = (var17 = f).length;
-                                    int var9 = 0;
-
-                                    while (var9 < var8) {
-                                        String var10 = var17[var9];
-
-                                        try {
-                                            var5 = this.d.loadClass(var10 + "." + var1);
-                                            break;
-                                        } catch (Throwable var13) {
-                                            ++var9;
-                                        }
-                                    }
-                                }
-
-                                if (var5 == null) {
-                                    break label71;
-                                }
-                            } catch (Throwable var15) {
-                                var10000 = var15;
-                                var10001 = false;
-                                break label79;
-                            }
-
-                            if (var5 == ViewStub.class) {
-                                break label71;
-                            }
-
-                            try {
-                                if (var5.getClassLoader() != this.d) {
-                                    break label71;
-                                }
-                                break label70;
-                            } catch (Throwable var14) {
-                                var10000 = var14;
-                                var10001 = false;
-                            }
-                        }
-
-                        Throwable var18 = var10000;
-                        (new StringBuilder("load view err:")).append(Log.getStackTraceString(var18));
-                        break label71;
-                    }
-
-                    var6 = true;
-                }
-
-                if (!var6) {
-                    this.g.a.add(var1);
-                    return null;
-                }
-
-                try {
-                    var4 = var5.getConstructor(Context.class, AttributeSet.class);
-                    this.g.b.put(var1, var4);
-                } catch (Throwable var12) {
-                    (new StringBuilder("create view err:")).append(Log.getStackTraceString(var12));
-                }
-            }
-
-            try {
-                View var16 = null;
-                if (var4 != null) {
-                    var16 = (View) var4.newInstance(var2, var3);
-                }
-
-                return var16;
-            } catch (Throwable var11) {
-                (new StringBuilder("create view err:")).append(Log.getStackTraceString(var11));
-                return null;
-            }
-        }
-    }
-
-    public static class a {
-        public HashSet<String> a = new HashSet();
-        public HashMap<String, Constructor<?>> b = new HashMap();
-
-        public a() {
-        }
-    }
-}
diff --git a/modules/mogo-module-smp/src/main/java/com/amap/api/col/n3/lg2.java b/modules/mogo-module-smp/src/main/java/com/amap/api/col/n3/lg2.java
deleted file mode 100644
index 347f98ddc6..0000000000
--- a/modules/mogo-module-smp/src/main/java/com/amap/api/col/n3/lg2.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.amap.api.col.n3;
-
-import android.content.Context;
-import android.content.res.XmlResourceParser;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- * 这里是为了解决 使用换肤框架后，高德地图初始化有问题加入的
- * 问题原因是：
- * skin 框架会替换 LayoutInflater 中的 setFactory2 从而导致高德 le 中的 setFactory 失效。
- * 解决方案为：
- * 直接通过内存地址替换整个 ArtMethod，来将需要修改的高德SDK中的方法指向我们修改过后的方法。
- */
-public class lg2 extends lg {
-    static le2 b;
-
-    public static View a(Context var0, int var1, ViewGroup var2) {
-        XmlResourceParser var9 = a().getXml(var1);
-        if (!a) {
-            return LayoutInflater.from(var0).inflate(var9, var2);
-        } else {
-            try {
-                if (b == null) {
-                    b = new le2(var0, c == -1 ? 0 : c, lg.class.getClassLoader());
-                }
-                b.a(c == -1 ? 0 : c);
-                View var3 = LayoutInflater.from(b).inflate(var9, var2);
-                return var3;
-            } catch (Throwable var7) {
-                var7.printStackTrace();
-                np.c(var7, "ResourcesUtil", "selfInflate(Activity activity, int resource, ViewGroup root)");
-            } finally {
-                var9.close();
-            }
-            return null;
-        }
-    }
-}
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
index 00010d9dd0..e85d84ffd6 100644
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
@@ -4,8 +4,10 @@ import android.content.Context;
 import android.graphics.BitmapFactory;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
 
 import androidx.annotation.Nullable;
@@ -18,6 +20,7 @@ import com.amap.api.navi.AMapNaviView;
 import com.amap.api.navi.AMapNaviViewOptions;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.module.common.MogoApisHandler;
+import com.mogo.module.common.view.RoundLayout;
 import com.mogo.utils.FileUtils;
 
 import java.io.IOException;
@@ -31,8 +34,10 @@ import java.io.IOException;
 public class SmallMapDirectionView extends RelativeLayout {
     private String styleFilePath = "/mnt/sdcard/amap/small_map_style.data";
 
+    private RoundLayout rlSmallMapBorder;
     private AMapNaviView mAMapNaviView;
     private int zoomLevel = 15;
+    private boolean mapIsLoaded = false;
 
     public SmallMapDirectionView(Context context) {
         this(context, null);
@@ -52,11 +57,11 @@ public class SmallMapDirectionView extends RelativeLayout {
     }
 
     private void initView(Context context) {
+        LayoutInflater.from(context).inflate(R.layout.module_small_map_view, this);
 
-        AbsMogoApplication.getLayoutInflaterNoSkin().inflate(R.layout.module_small_map_view, this);
-
-        mAMapNaviView = findViewById(R.id.aMapNaviView);
-        mAMapNaviView.onCreate(null);
+        mAMapNaviView = AbsMogoApplication.getMapNaviView();
+        rlSmallMapBorder = findViewById(R.id.rlSmallMapBorder);
+        rlSmallMapBorder.addView(mAMapNaviView);
 
         // 车头朝上
         mAMapNaviView.setNaviMode(AMapNaviView.CAR_UP_MODE);
@@ -133,7 +138,7 @@ public class SmallMapDirectionView extends RelativeLayout {
             // 2D模式
             options.setTilt(0);
             // 黑夜模式
-            // options.setNaviNight(true);
+            //options.setNaviNight(true);
             // 自定义地图样式
             options.setCustomMapStylePath(styleFilePath);
             mAMapNaviView.setViewOptions(options);
@@ -143,23 +148,6 @@ public class SmallMapDirectionView extends RelativeLayout {
         CameraUpdate cameraUpdate = CameraUpdateFactory.zoomTo(zoomLevel);
         aMap.moveCamera(cameraUpdate);
 
-        aMap.setOnMapLoadedListener(new AMap.OnMapLoadedListener() {
-
-            @Override
-            public void onMapLoaded() {
-                //Log.w("onMapLoaded", "===onMapLoaded====");
-                // 高德地图有bug，所以需要多次调用设置皮肤才能成功
-                if (options != null) {
-                    options.setCustomMapStylePath(styleFilePath);
-                    mAMapNaviView.setViewOptions(options);
-                }
-
-                //设置希望展示的地图缩放级别
-                CameraUpdate cameraUpdate = CameraUpdateFactory.zoomTo(zoomLevel);
-                aMap.moveCamera(cameraUpdate);
-            }
-        });
-
         try {
             // 判断是否有样式文件存在
             FileUtils.copy(
@@ -205,6 +193,27 @@ public class SmallMapDirectionView extends RelativeLayout {
             e.printStackTrace();
         }
 
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Thread.sleep(500L);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                // 高德地图有bug，所以需要多次调用设置皮肤才能成功
+                if (options != null) {
+                    options.setCustomMapStylePath(styleFilePath);
+                    mAMapNaviView.setViewOptions(options);
+                }
+
+                //设置希望展示的地图缩放级别
+                CameraUpdate cameraUpdate = CameraUpdateFactory.zoomTo(zoomLevel);
+                aMap.moveCamera(cameraUpdate);
+            }
+        }).start();
+
+
         setOnClickListener(view -> {
             MogoApisHandler.getInstance().getApis()
                     .getMapServiceApi()
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapFragment.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapFragment.java
new file mode 100644
index 0000000000..1aecd0d01f
--- /dev/null
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapFragment.java
@@ -0,0 +1,43 @@
+package com.mogo.module.small.map;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.mogo.commons.AbsMogoApplication;
+
+/**
+ * @author donghongyu
+ * @date 2021/5/19 10:50 上午
+ */
+public class SmallMapFragment extends Fragment {
+    private Context mContext;
+    protected View mRootView;
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mContext = context;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        if (mRootView == null) {
+            mRootView = AbsMogoApplication.getLayoutInflaterNoSkin()
+                    .inflate(R.layout.module_small_map_fragment, container, false);
+        } else {
+            ViewGroup viewGroup = (ViewGroup) mRootView.getParent();
+            if (viewGroup != null) {
+                viewGroup.removeView(mRootView);
+            }
+        }
+        return mRootView;
+    }
+}
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
new file mode 100644
index 0000000000..0dac09d276
--- /dev/null
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
@@ -0,0 +1,101 @@
+package com.mogo.module.small.map;
+
+import android.content.Context;
+import android.util.Log;
+
+import androidx.fragment.app.FragmentActivity;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.mogo.module.common.MogoApisHandler;
+import com.mogo.service.MogoServicePaths;
+import com.mogo.service.map.IMogoSmallMapProvider;
+import com.mogo.service.statusmanager.IMogoStatusChangedListener;
+import com.mogo.service.statusmanager.StatusDescriptor;
+import com.mogo.utils.logger.Logger;
+
+/**
+ * @author donghongyu
+ * @date 12/10/20 1:34 PM
+ */
+@Route(path = MogoServicePaths.PATH_SMALL_MAP)
+public class SmallMapProvider implements IMogoSmallMapProvider, IMogoStatusChangedListener {
+    private final String TAG = "SmallVisionProvider";
+
+    private Context mContext;
+    private int mContainerId;
+    private FragmentActivity mActivity;
+
+    private SmallMapFragment mSmallMapFragment;
+
+    @Override
+    public void init(FragmentActivity activity, int containerId) {
+        Log.d(TAG, "小地图模块初始化……init(FragmentActivity activity, int containerId)");
+        mActivity = activity;
+        mContainerId = containerId;
+
+        Logger.d(TAG, "addSmallMapView");
+
+    }
+
+    @Override
+    public void init(Context context) {
+        Log.d(TAG, "小地图模块初始化……init(Context context)");
+        mContext = context;
+
+        MogoApisHandler.getInstance()
+                .getApis()
+                .getStatusManagerApi()
+                .registerStatusChangedListener(
+                        MogoServicePaths.PATH_SMALL_MAP,
+                        StatusDescriptor.VR_MODE,
+                        this);
+
+        MogoApisHandler.getInstance()
+                .getApis()
+                .getStatusManagerApi()
+                .registerStatusChangedListener(
+                        MogoServicePaths.PATH_SMALL_MAP,
+                        StatusDescriptor.MAIN_PAGE_RESUME,
+                        this);
+    }
+
+    @Override
+    public void showPanel() {
+        Log.d(TAG, "小地图模块触发展示……");
+        if (mSmallMapFragment == null) {
+            Logger.d(TAG, "准备add fragment======");
+            mSmallMapFragment = new SmallMapFragment();
+            mActivity.getSupportFragmentManager().beginTransaction().add(mContainerId, mSmallMapFragment).commit();
+            return;
+        }
+        Logger.d(TAG, "准备show fragment");
+        mActivity.getSupportFragmentManager().beginTransaction().show(mSmallMapFragment).commit();
+    }
+
+    @Override
+    public void hidePanel() {
+        Log.d(TAG, "小地图模块触发隐藏……");
+        if (mSmallMapFragment != null) {
+            Logger.d(TAG, "准备hide fragment");
+            mActivity.getSupportFragmentManager().beginTransaction().hide(mSmallMapFragment).commit();
+        }
+    }
+
+    @Override
+    public void changeAngle(double angle) {
+
+    }
+
+    @Override
+    public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
+        Log.d(TAG, "onStatusChanged……descriptor=" + descriptor + "，isTrue=" + isTrue);
+
+        if (descriptor == StatusDescriptor.VR_MODE) {
+            if (isTrue) {
+                showPanel();
+            } else {
+                hidePanel();
+            }
+        }
+    }
+}
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapService.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapService.java
deleted file mode 100644
index 122c6d8c5f..0000000000
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapService.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.mogo.module.small.map;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-import android.view.Gravity;
-import android.view.WindowManager;
-
-import androidx.annotation.Nullable;
-
-import com.mogo.module.common.wm.WindowManagerView;
-import com.mogo.utils.logger.Logger;
-
-/**
- * @author donghongyu
- * @date 12/10/20 1:35 PM
- */
-public class SmallMapService extends Service {
-    private static final String TAG = "MachineVisionMapService";
-
-    private WindowManagerView mWindowManagerView;
-    private SmallMapDirectionView mSmallMapDirectionView;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        Logger.d(TAG, "onCreate");
-        addSmallMapView();
-    }
-
-    @Nullable
-    @Override
-    public IBinder onBind(Intent intent) {
-        Logger.d(TAG, "onBind");
-        return null;
-    }
-
-    @Override
-    public void onRebind(Intent intent) {
-        super.onRebind(intent);
-        addSmallMapView();
-        Logger.d(TAG, "onRebind");
-    }
-
-    @Override
-    public boolean onUnbind(Intent intent) {
-        Logger.d(TAG, "onUnbind");
-        if (mWindowManagerView != null && mWindowManagerView.isShowing()) {
-            mWindowManagerView.dismiss();
-        }
-        mWindowManagerView = null;
-        return true;
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        Logger.d(TAG, "onDestroy");
-        if (mWindowManagerView != null) {
-            mWindowManagerView.dismiss();
-        }
-    }
-
-    /**
-     * 添加小地图View
-     */
-    private void addSmallMapView() {
-        Logger.d(TAG, "addSmallMapView");
-
-        // 初始化小地图控件
-        mSmallMapDirectionView = new SmallMapDirectionView(getApplicationContext());
-
-        mWindowManagerView = new WindowManagerView.Builder(getApplicationContext())
-                .contentView(mSmallMapDirectionView)
-                .size(
-                        WindowManager.LayoutParams.WRAP_CONTENT,
-                        WindowManager.LayoutParams.WRAP_CONTENT
-                )
-                .position(
-                        getResources().getDimensionPixelOffset(R.dimen.module_small_map_view_x),
-                        getResources().getDimensionPixelOffset(R.dimen.module_small_map_view_y)
-                )
-                .gravity(Gravity.TOP | Gravity.LEFT)
-                .showInWindowManager();
-        mWindowManagerView.show();
-    }
-
-}
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallVisionProvider.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallVisionProvider.java
deleted file mode 100644
index 50d3ab9dc4..0000000000
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallVisionProvider.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package com.mogo.module.small.map;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.amap.api.col.n3.lg;
-import com.amap.api.col.n3.lg2;
-import com.mogo.hook.HookManager;
-import com.mogo.module.common.MogoApisHandler;
-import com.mogo.module.common.wm.WindowManagerView;
-import com.mogo.service.MogoServicePaths;
-import com.mogo.service.map.IMogoSmallMapProvider;
-import com.mogo.service.module.ModuleType;
-import com.mogo.service.statusmanager.IMogoStatusChangedListener;
-import com.mogo.service.statusmanager.StatusDescriptor;
-import com.mogo.utils.logger.Logger;
-
-import java.lang.reflect.Method;
-
-/**
- * @author donghongyu
- * @date 12/10/20 1:34 PM
- */
-@Route(path = MogoServicePaths.PATH_SMALL_MAP)
-public class SmallVisionProvider implements IMogoSmallMapProvider, IMogoStatusChangedListener {
-    private final String TAG = "SmallVisionProvider";
-
-    private Context mContext;
-    private int mContainerId;
-    private FragmentActivity mActivity;
-
-    private WindowManagerView mWindowManagerView;
-    private SmallMapDirectionView mSmallMapDirectionView;
-
-    @Override
-    public Fragment createFragment(Context context, Bundle data) {
-        return null;
-    }
-
-    @Override
-    public View createView(Context context) {
-        return null;
-    }
-
-    @NonNull
-    @Override
-    public String getModuleName() {
-        return TAG;
-    }
-
-    @Override
-    public int getType() {
-        return ModuleType.TYPE_SERVICE;
-    }
-
-    @Override
-    public void init(FragmentActivity activity, int containerId) {
-        mContainerId = containerId;
-        mActivity = activity;
-    }
-
-    @Override
-    public void init(Context context) {
-        Log.d(TAG, "小地图模块初始化……");
-        mContext = context;
-
-        MogoApisHandler.getInstance()
-                .getApis()
-                .getStatusManagerApi()
-                .registerStatusChangedListener(
-                        MogoServicePaths.PATH_SMALL_MAP,
-                        StatusDescriptor.VR_MODE,
-                        this);
-
-        MogoApisHandler.getInstance()
-                .getApis()
-                .getStatusManagerApi()
-                .registerStatusChangedListener(
-                        MogoServicePaths.PATH_SMALL_MAP,
-                        StatusDescriptor.MAIN_PAGE_RESUME,
-                        this);
-    }
-
-    @Override
-    public void onDestroy() {
-        Log.d(TAG, "小地图模块销毁……");
-        hidePanel();
-        // 释放组件内存
-        mSmallMapDirectionView = null;
-        mWindowManagerView = null;
-    }
-
-
-    @Override
-    public void showPanel() {
-        Log.d(TAG, "小地图模块触发展示……");
-        addSmallMapView();
-    }
-
-    @Override
-    public void hidePanel() {
-        Log.d(TAG, "小地图模块触发隐藏……");
-        if (mWindowManagerView != null && mWindowManagerView.isShowing()) {
-            mWindowManagerView.dismiss();
-        }
-    }
-
-    @Override
-    public void changeAngle(double angle) {
-
-    }
-
-    @Override
-    public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
-        Log.d(TAG, "onStatusChanged……descriptor=" + descriptor + "，isTrue=" + isTrue);
-
-        if (descriptor == StatusDescriptor.VR_MODE) {
-            if (isTrue) {
-                showPanel();
-            } else {
-                hidePanel();
-            }
-        }
-        if (descriptor == StatusDescriptor.MAIN_PAGE_RESUME) {
-            // 只有 VR 模式下才进行展示
-            if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
-                if (isTrue) {
-                    showPanel();
-                } else {
-                    hidePanel();
-                }
-            }
-        }
-    }
-
-
-    /**
-     * 添加小地图View
-     */
-    private void addSmallMapView() {
-        Logger.d(TAG, "addSmallMapView");
-
-        try {
-            // 替换高德地图的方法，解决因为加入换肤框架导致地图初始化失败
-            Method srcMethod = lg.class.getDeclaredMethod("a", Context.class, int.class, ViewGroup.class);
-            Method destMethod = lg2.class.getDeclaredMethod("a", Context.class, int.class, ViewGroup.class);
-            HookManager.get().hookMethod(srcMethod, destMethod);
-            Logger.d(TAG, "hook 高德地图成功");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        // 初始化小地图控件
-        if (mSmallMapDirectionView == null) {
-            mSmallMapDirectionView = new SmallMapDirectionView(mContext);
-        }
-
-        if (mWindowManagerView == null) {
-            mWindowManagerView = new WindowManagerView.Builder(mContext)
-                    .contentView(mSmallMapDirectionView)
-                    .size(
-                            WindowManager.LayoutParams.WRAP_CONTENT,
-                            WindowManager.LayoutParams.WRAP_CONTENT
-                    )
-                    .position(
-                            mContext.getResources().getDimensionPixelOffset(R.dimen.module_small_map_view_x),
-                            mContext.getResources().getDimensionPixelOffset(R.dimen.module_small_map_view_y)
-                    )
-                    .gravity(Gravity.TOP | Gravity.LEFT)
-                    .showInWindowManager();
-        }
-        mWindowManagerView.show();
-    }
-
-}
diff --git a/modules/mogo-module-smp/src/main/res/layout/module_small_map_fragment.xml b/modules/mogo-module-smp/src/main/res/layout/module_small_map_fragment.xml
index dfd4d52a64..e782c5d0af 100644
--- a/modules/mogo-module-smp/src/main/res/layout/module_small_map_fragment.xml
+++ b/modules/mogo-module-smp/src/main/res/layout/module_small_map_fragment.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.mogo.module.small.map.SmallMapDirectionView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/smallMapDirectionView"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:layout_height="match_parent">
+
+    <com.mogo.module.small.map.SmallMapDirectionView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml b/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml
index 587bffa950..bc57026070 100644
--- a/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml
+++ b/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml
@@ -6,7 +6,6 @@
     android:layout_height="wrap_content"
     tools:parentTag="RelativeLayout">
 
-
     <View
         android:layout_width="@dimen/module_small_map_view_border_width"
         android:layout_height="@dimen/module_small_map_view_border_height"
@@ -16,16 +15,16 @@
 
     <com.mogo.module.common.view.RoundLayout
         android:id="@+id/rlSmallMapBorder"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/module_small_map_view_width"
+        android:layout_height="@dimen/module_small_map_view_width"
         android:layout_centerInParent="true"
         app:roundLayoutRadius="360dp">
 
-        <com.amap.api.navi.AMapNaviView
-            android:id="@+id/aMapNaviView"
-            android:layout_width="@dimen/module_small_map_view_width"
-            android:layout_height="@dimen/module_small_map_view_width" />
-
+        <!--TODO Hook方案在Pad上有问题,优先 效果,后面在看如何解决-->
+        <!-- <com.amap.api.navi.AMapNaviView
+             android:id="@+id/aMapNaviView"
+             android:layout_width="@dimen/module_small_map_view_width"
+             android:layout_height="@dimen/module_small_map_view_width" />-->
     </com.mogo.module.common.view.RoundLayout>
 
 </merge>
\ No newline at end of file
diff --git a/modules/mogo-module-smp/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-smp/src/main/res/values-xhdpi-2560x1440/dimens.xml
new file mode 100644
index 0000000000..bce5be42b0
--- /dev/null
+++ b/modules/mogo-module-smp/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_small_map_padding">40px</dimen>
+
+    <dimen name="module_small_map_view_border_width">400px</dimen>
+    <dimen name="module_small_map_view_border_height">400px</dimen>
+
+    <dimen name="module_small_map_view_width">370px</dimen>
+    <dimen name="module_small_map_view_height">370px</dimen>
+
+    <dimen name="module_small_map_view_x">1620px</dimen>
+    <dimen name="module_small_map_view_y">780px</dimen>
+
+    <dimen name="module_small_map_big_view_x">0px</dimen>
+    <dimen name="module_small_map_big_view_y">0px</dimen>
+    <dimen name="module_small_map_big_view_width">1920px</dimen>
+    <dimen name="module_small_map_big_view_height">1080px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml
index fd5d8ff737..62836ac9d0 100644
--- a/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml
@@ -2,14 +2,12 @@
 <resources>
     <dimen name="module_small_map_padding">30px</dimen>
 
-    <dimen name="module_small_map_border_view_width">400px</dimen>
-    <dimen name="module_small_map_border_view_height">400px</dimen>
-
     <dimen name="module_small_map_view_border_width">288px</dimen>
     <dimen name="module_small_map_view_border_height">288px</dimen>
 
     <dimen name="module_small_map_view_width">260px</dimen>
     <dimen name="module_small_map_view_height">260px</dimen>
+
     <dimen name="module_small_map_view_x">1620px</dimen>
     <dimen name="module_small_map_view_y">780px</dimen>
 
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoSmallMapProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoSmallMapProvider.java
index 36a4110c30..61aa1e5b35 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoSmallMapProvider.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoSmallMapProvider.java
@@ -3,13 +3,14 @@ package com.mogo.service.map;
 import androidx.annotation.IdRes;
 import androidx.fragment.app.FragmentActivity;
 
+import com.alibaba.android.arouter.facade.template.IProvider;
 import com.mogo.service.module.IMogoModuleProvider;
 
 /**
  * @author donghongyu
  * @date 12/10/20 1:36 PM
  */
-public interface IMogoSmallMapProvider extends IMogoModuleProvider {
+public interface IMogoSmallMapProvider extends IProvider {
 
     /**
      * 初始化网约车容器

From e61195150d870fe569b2ad68a754370b6d245fc1 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 May 2021 19:59:31 +0800
Subject: [PATCH 19/24] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B0=8F=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E5=9C=A8=E8=81=94=E6=83=B3pad=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/module/small/map/SmallMapDirectionView.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
index e85d84ffd6..f43ed66f30 100644
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
@@ -197,7 +197,7 @@ public class SmallMapDirectionView extends RelativeLayout {
             @Override
             public void run() {
                 try {
-                    Thread.sleep(500L);
+                    Thread.sleep(1000L);
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                 }

From 716e02a9cb93d2a77290437bb5fe137143ffd942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Thu, 20 May 2021 11:52:04 +0800
Subject: [PATCH 20/24] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=9C=B0=E5=9B=BE1.0.0?=
 =?UTF-8?q?-vr-8.5.28?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libraries/map-custom/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle
index 246dc89190..f9adb43a4e 100644
--- a/libraries/map-custom/build.gradle
+++ b/libraries/map-custom/build.gradle
@@ -67,7 +67,7 @@ dependencies {
         implementation project(':foudations:mogo-commons')
     }
 
-    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.25'
+    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.28'
 //    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4'
 }
 

From 326bc44a34ec8a3da9a5a8ad2dd422b18b979538 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Fri, 21 May 2021 15:34:47 +0800
Subject: [PATCH 21/24] change the tomeDelay upload data

---
 .../com/mogo/launcher/MogoApplication.java    |  2 +-
 .../network/bean/MockSocketSendData.java      | 37 +++++++++++++++++++
 .../timedelay/TimeDelayUploadManager.java     | 11 ++++--
 3 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketSendData.java

diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 2f10de66a7..3459874a0f 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -225,7 +225,7 @@ public class MogoApplication extends AbsMogoApplication {
         // 设置是否是第三APP登录
         clientConfig.setThirdLogin(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE);
         // 设置是否输出日志
-        clientConfig.setShowDebugLog(false);
+        clientConfig.setShowDebugLog(true);
         // 设置是否是直播推流的主播
         clientConfig.setAnchor(false);
         // 设置从蘑菇AI开放平台获取的APPKey
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketSendData.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketSendData.java
new file mode 100644
index 0000000000..262b7b2d54
--- /dev/null
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketSendData.java
@@ -0,0 +1,37 @@
+package com.mogo.module.service.network.bean;
+
+public class MockSocketSendData {
+    private long systemTime;
+    private String uuid;
+    private long satelliteTime;
+
+    public MockSocketSendData(long systemTime, String uuid, long satelliteTime) {
+        this.systemTime = systemTime;
+        this.uuid = uuid;
+        this.satelliteTime = satelliteTime;
+    }
+
+    public long getSystemTime() {
+        return systemTime;
+    }
+
+    public void setSystemTime(long systemTime) {
+        this.systemTime = systemTime;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public long getSatelliteTime() {
+        return satelliteTime;
+    }
+
+    public void setSatelliteTime(long satelliteTime) {
+        this.satelliteTime = satelliteTime;
+    }
+}
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
index dc377b0d73..a2ad0b14db 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
@@ -9,11 +9,13 @@ import androidx.annotation.RequiresApi;
 
 import com.mogo.commons.data.BaseData;
 import com.mogo.commons.network.SubscribeImpl;
+import com.mogo.commons.network.Utils;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.uploadintime.SnapshotLocationController;
 import com.mogo.module.service.MarkerServiceHandler;
 import com.mogo.module.service.network.TimeDelayApiService;
 import com.mogo.module.service.network.bean.MockSocketReceiverData;
+import com.mogo.module.service.network.bean.MockSocketSendData;
 import com.mogo.realtime.api.MoGoAiCloudRealTime;
 import com.mogo.realtime.entity.CloudRoadData;
 import com.mogo.realtime.entity.MogoSnapshotSetData;
@@ -22,6 +24,7 @@ import com.mogo.service.connection.IMogoOnMessageListener;
 import com.mogo.utils.WorkThreadHandler;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.RequestOptions;
+import com.mogo.utils.network.utils.GsonUtil;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -145,13 +148,13 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener<MockSocket
                     .findAny()
                     .orElse(null);
             if (result == null) {
-                Logger.d(TAG,"未找到与之匹配数据");
+                Logger.d(TAG, "未找到与之匹配数据");
                 return;
             }
+            MockSocketSendData mockSocketSendData = new MockSocketSendData(System.currentTimeMillis(), result.getUuid(), result.getSatelliteTime());
             Map<String, Object> map = new HashMap<>();
-            map.put("systemTime", System.currentTimeMillis());
-            map.put("uuid", result.getUuid());
-            map.put("satelliteTime", result.getSatelliteTime());
+            map.put("sn", Utils.getSn());
+            map.put("data", GsonUtil.jsonFromObject(mockSocketSendData));
             timeDelayApiService.uploadDelayData(map)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())

From 26468c90fd32b0039f73a51f122e3f90226b7e27 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Fri, 21 May 2021 16:06:02 +0800
Subject: [PATCH 22/24] opt ui

---
 .../module_switch_map_angle.png               | Bin
 .../res/values-xhdpi-2560x1440/dimens.xml     |   1 +
 .../res/values-xhdpi-2560x1600/dimens.xml     | 167 ------------------
 3 files changed, 1 insertion(+), 167 deletions(-)
 rename modules/mogo-module-extensions/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/module_switch_map_angle.png (100%)
 delete mode 100644 modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml

diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1600/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1440/module_switch_map_angle.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1600/module_switch_map_angle.png
rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1440/module_switch_map_angle.png
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml
index 703c97c9a2..c317778eb9 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -8,4 +8,5 @@
     <dimen name="module_ext_arcView_stroke_with">15px</dimen>
     <dimen name="module_ext_arcView_center_text_size">110px</dimen>
     <dimen name="module_ext_arcView_des_text_size">40px</dimen>
+    <dimen name="module_switch_map">145px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml
deleted file mode 100644
index 027820a732..0000000000
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    module_ext_layout_entrance.xml-->
-    <dimen name="module_ext_search_height">90px</dimen>
-    <dimen name="module_ext_search_marginLeft">32px</dimen>
-    <dimen name="module_ext_search_marginTop">2px</dimen>
-    <dimen name="module_ext_search_drawablePadding">16px</dimen>
-    <dimen name="module_ext_search_paddingLeft">26px</dimen>
-    <dimen name="module_ext_search_paddingRight">26px</dimen>
-    <dimen name="module_ext_search_textSize">32px</dimen>
-
-    <dimen name="module_ext_common_address_height">90px</dimen>
-    <dimen name="module_ext_common_address_marginLeft">32px</dimen>
-    <dimen name="module_ext_common_address_marginTop">2px</dimen>
-    <dimen name="module_ext_common_address_home_width">100px</dimen>
-    <dimen name="module_ext_common_address_home_height">90px</dimen>
-    <dimen name="module_ext_common_address_divider_width">2px</dimen>
-    <dimen name="module_ext_common_address_divider_height">54px</dimen>
-    <dimen name="module_ext_common_address_company_width">100px</dimen>
-    <dimen name="module_ext_common_address_company_height">90px</dimen>
-    <dimen name="module_ext_weather_space_between_icon_and_tem">8px</dimen>
-
-    <dimen name="module_ext_speed_limit_width">180px</dimen>
-    <dimen name="module_ext_speed_limit_height">180px</dimen>
-    <dimen name="module_ext_speed_limit_marginTop">2px</dimen>
-    <dimen name="module_ext_speed_limit_marginRight">60px</dimen>
-    <dimen name="module_ext_speed_limit_value_textSize">60px</dimen>
-    <dimen name="module_ext_speed_limit_unit_textSize">28px</dimen>
-
-    <dimen name="module_ext_navi_panel_marginLeft">32px</dimen>
-    <dimen name="module_ext_navi_panel_marginTop">2px</dimen>
-
-    <dimen name="module_ext_operation_panel_width">140px</dimen>
-    <dimen name="module_ext_operation_panel_marginRight">32px</dimen>
-    <dimen name="module_ext_operation_panel_marginBottom">60px</dimen>
-    <dimen name="module_ext_operation_panel_vr_height">92px</dimen>
-    <dimen name="module_ext_operation_panel_vr_textSize">24px</dimen>
-    <dimen name="module_ext_operation_panel_divider_width">48px</dimen>
-    <dimen name="module_ext_operation_panel_divider_height">2px</dimen>
-    <dimen name="module_ext_operation_panel_move2_height">140px</dimen>
-    <dimen name="module_ext_operation_panel_share_width">140px</dimen>
-    <dimen name="module_ext_operation_panel_share_height">120px</dimen>
-    <dimen name="module_ext_operation_panel_share_marginBottom">20px</dimen>
-    <dimen name="module_ext_operation_panel_share_textSize">30px</dimen>
-    <dimen name="module_ext_operation_panel_share_goneMarginBottom">32px</dimen>
-    <dimen name="module_ext_operation_panel_share_goneMarginRight">32px</dimen>
-
-    <dimen name="module_ext_navi_exit_width">120px</dimen>
-    <dimen name="module_ext_navi_exit_height">120px</dimen>
-    <dimen name="module_ext_navi_exit_marginLeft">32px</dimen>
-    <dimen name="module_ext_navi_exit_marginBottom">60px</dimen>
-    <dimen name="module_ext_button_container_marginLeft">32px</dimen>
-    <dimen name="module_ext_button_container_marginBottom">60px</dimen>
-    <dimen name="module_ext_navi_exit_textSize">32px</dimen>
-    <dimen name="v2x_cancel_help_text_size">30px</dimen>
-    <dimen name="module_entrance_id_button_marginTop">20px</dimen>
-
-    <!--    module_ext_layout_extensions.xml-->
-    <dimen name="module_ext_height">120px</dimen>
-    <dimen name="module_ext_paddingRight">60px</dimen>
-    <dimen name="module_ext_paddingLeft">60px</dimen>
-    <dimen name="module_ext_voice_textSize">32px</dimen>
-    <dimen name="module_ext_time_textSize">48px</dimen>
-    <dimen name="module_ext_date_marginRight">80px</dimen>
-    <dimen name="module_ext_date_textSize">28px</dimen>
-    <dimen name="module_ext_weather_marginRight">26px</dimen>
-    <dimen name="module_ext_weather_icon_width">44px</dimen>
-    <dimen name="module_ext_weather_icon_height">44px</dimen>
-    <dimen name="module_ext_weather_temp_marginRight">18px</dimen>
-    <dimen name="module_ext_weather_temp_textSize">34px</dimen>
-    <dimen name="module_ext_weather_temp_desc_marginRight">26px</dimen>
-    <dimen name="module_ext_weather_temp_desc_textSize">28px</dimen>
-    <dimen name="module_ext_msg_marginRight">30px</dimen>
-    <dimen name="module_ext_msg_counter_width">30px</dimen>
-    <dimen name="module_ext_msg_counter_height">30px</dimen>
-    <dimen name="module_ext_msg_counter_textSize">20px</dimen>
-
-    <dimen name="module_ext_user_img_width">103px</dimen>
-    <dimen name="module_ext_user_img_height">103px</dimen>
-
-    <!--    module_map_layout_navi_info_panel.xml-->
-    <dimen name="module_ext_navi_info_panel_width">1058px</dimen>
-    <dimen name="module_ext_navi_info_panel_height">210px</dimen>
-    <dimen name="module_ext_navi_info_panel_small_height">144px</dimen>
-    <dimen name="module_ext_navi_info_panel_turn_icon_width">159px</dimen>
-    <dimen name="module_ext_navi_info_panel_turn_icon_height">159px</dimen>
-    <dimen name="module_ext_navi_info_panel_turn_icon_small_width">70px</dimen>
-    <dimen name="module_ext_navi_info_panel_turn_icon_small_height">70px</dimen>
-    <dimen name="module_ext_navi_info_panel_turn_icon_marginLeft">56px</dimen>
-    <dimen name="module_ext_navi_info_panel_turn_icon_small_marginLeft">83px</dimen>
-    <dimen name="module_ext_navi_info_panel_turn_icon_marginTop">24px</dimen>
-    <dimen name="module_ext_navi_info_panel_next_info_distance_marginTop">40px</dimen>
-    <dimen name="module_ext_navi_info_panel_next_info_distance_textSize">60px</dimen>
-    <dimen name="module_ext_navi_info_panel_next_info_distance_textSize_small">50px</dimen>
-    <dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginLeft">12px</dimen>
-    <dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginBottom">10px</dimen>
-    <dimen name="module_ext_navi_info_panel_next_info_distance_unit_textSize">40px</dimen>
-    <dimen name="module_ext_navi_info_panel_next_info_distance_unit_textSize_small">30px</dimen>
-    <dimen name="module_ext_navi_info_panel_next_info_road_textSize">34px</dimen>
-    <dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_marginTop">24px</dimen>
-    <dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_textSize">28px</dimen>
-    <dimen name="module_ext_navi_info_turn_icon_margin_bottom">23px</dimen>
-    <dimen name="module_ext_voice_msg_padding_top">17px</dimen>
-    <dimen name="module_ext_voice_msg_padding_bottom">17px</dimen>
-    <dimen name="module_ext_voice_msg_padding_left">36px</dimen>
-    <dimen name="module_ext_voice_msg_padding_right">36px</dimen>
-    <dimen name="module_ext_voice_msg_icon_margin_left">-2px</dimen>
-    <dimen name="module_ext_navi_extra_info_margin_right">95px</dimen>
-
-    <dimen name="module_ext_weather_bkg_corner">30px</dimen>
-    <dimen name="module_ext_weather_container_paddingLeft">40px</dimen>
-    <dimen name="module_ext_weather_container_paddingRight">40px</dimen>
-    <dimen name="module_ext_msg_dot_marginLeft">15px</dimen>
-    <dimen name="module_ext_msg_dot_marginRight">15px</dimen>
-    <dimen name="module_ext_navi_next_info_road_marginTop">5px</dimen>
-    <dimen name="module_ext_remaining_info_marginRight">50px</dimen>
-    <dimen name="module_ext_remaining_distance_textSize">56px</dimen>
-    <dimen name="module_ext_remaining_distance_unit_textSize">30px</dimen>
-    <dimen name="module_ext_remaining_time_textSize">56px</dimen>
-    <dimen name="module_ext_remaining_time_unit_textSize">30px</dimen>
-    <dimen name="module_ext_arrive_time_textSize">56px</dimen>
-    <dimen name="module_ext_arrive_time_unit_textSize">30px</dimen>
-    <dimen name="module_map_navi_next_info_road_turn_marginLeft">15px</dimen>
-    <dimen name="module_map_navi_next_info_road_turn_marginRight">15px</dimen>
-
-    <!-- 导航查看全程显示范围-->
-    <dimen name="module_map_display_overview_left_margin">1000px</dimen>
-    <dimen name="module_map_display_overview_top_margin">390px</dimen>
-    <dimen name="module_map_display_overview_bottom_margin">200px</dimen>
-    <dimen name="module_map_display_overview_right_margin">200px</dimen>
-    <dimen name="module_ext_north_goneMarginTop">240px</dimen>
-    <dimen name="module_ext_common_corner">30px</dimen>
-    <dimen name="module_ext_button_width">120px</dimen>
-    <dimen name="module_ext_button_height">120px</dimen>
-    <dimen name="module_ext_camera_button_marginTop">10px</dimen>
-    <dimen name="module_ext_display_overview_textSize">22px</dimen>
-    <dimen name="module_ext_display_overview_textSize_large">28px</dimen>
-    <dimen name="module_ext_north_textSize">28px</dimen>
-    <dimen name="module_ext_navi_info_panel_next_info_distance_next_step_textSize">30px</dimen>
-    <dimen name="module_entrance_id_uploading_width">90px</dimen>
-    <dimen name="module_entrance_id_uploading_height">90px</dimen>
-    <dimen name="module_map_id_navi_next_info_distance_marginTop">6dp</dimen>
-    <dimen name="module_map_id_navi_next_info_road_marginBottom">15px</dimen>
-    <dimen name="module_map_id_navi_next_info_road_marginBottom_small">4px</dimen>
-    <dimen name="module_map_id_navi_next_info_distance_marginStart">10px</dimen>
-    <dimen name="module_ext_display_overview_icon_marginTop">20px</dimen>
-
-    <dimen name="module_ext_top_over_navi_height">40px</dimen>
-    <dimen name="module_ext_msg_counter_margin">45px</dimen>
-    <dimen name="module_ext_user_avator_size">100px</dimen>
-    <dimen name="module_ext_user_avator_board_size">134px</dimen>
-    <dimen name="module_ext_layout_padding">30px</dimen>
-    <dimen name="module_ext_layout_paddingRight">20px</dimen>
-    <dimen name="module_ext_layout_paddingBottom">20px</dimen>
-    <dimen name="module_ext_destination_online_car_drawablePadding">8px</dimen>
-    <dimen name="module_ext_destination_online_car_paddingLeft">21px</dimen>
-    <dimen name="module_ext_destination_online_car_paddingRight">31px</dimen>
-    <dimen name="module_ext_top_view_max_width">1920px</dimen>
-
-    <dimen name="module_ext_navi_width">-1</dimen>
-    <dimen name="module_ext_bottom_btn_margin_bottom">0px</dimen>
-
-    <dimen name="module_event_live_error_text_size">36px</dimen>
-    <dimen name="module_video_window_height_content">393px</dimen>
-    <dimen name="module_video_window_width_content">700px</dimen>
-    <dimen name="module_switch_map">145px</dimen>
-</resources>
\ No newline at end of file

From 05db4d630765363f437fb86cd421fdd1896988d1 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Fri, 21 May 2021 17:02:55 +0800
Subject: [PATCH 23/24] add log

---
 .../mogo/module/service/timedelay/TimeDelayUploadManager.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
index a2ad0b14db..d712ba535e 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
@@ -92,9 +92,7 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener<MockSocket
                 } catch (JSONException e) {
                     e.printStackTrace();
                 }
-                Logger.d(TAG, "更改自车定位点");
                 MarkerServiceHandler.getApis().getMapServiceApi().getMapUIController().syncLocation2Map(jo);
-                Logger.d(TAG, "同步定位信息，用于上报");
                 SnapshotLocationController.getInstance().syncAdasLocationInfo(jo);
                 mockHandler.sendEmptyMessageDelayed(MOCK_MSG, 50);
             }
@@ -155,6 +153,7 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener<MockSocket
             Map<String, Object> map = new HashMap<>();
             map.put("sn", Utils.getSn());
             map.put("data", GsonUtil.jsonFromObject(mockSocketSendData));
+            Logger.d(TAG,"mockSocketSendData : " +  GsonUtil.jsonFromObject(mockSocketSendData));
             timeDelayApiService.uploadDelayData(map)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())

From 62ee66b629ba646db8b86aa070d9b2c0abc63ee3 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Mon, 24 May 2021 12:06:38 +0800
Subject: [PATCH 24/24] add log

---
 .../mogo/module/service/timedelay/TimeDelayUploadManager.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
index d712ba535e..891d6bd9a6 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
@@ -153,7 +153,8 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener<MockSocket
             Map<String, Object> map = new HashMap<>();
             map.put("sn", Utils.getSn());
             map.put("data", GsonUtil.jsonFromObject(mockSocketSendData));
-            Logger.d(TAG,"mockSocketSendData : " +  GsonUtil.jsonFromObject(mockSocketSendData));
+            Logger.d(TAG, "mockSocketSendData : " + GsonUtil.jsonFromObject(mockSocketSendData));
+            Logger.d(TAG, "data uuid : " + result.getUuid() + " duration : " + (System.currentTimeMillis() - result.getSatelliteTime()));
             timeDelayApiService.uploadDelayData(map)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())