From a6241e10f73b6b22933c2ff41be5da13ed990907 Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Mon, 10 Jan 2022 16:10:25 +0800
Subject: [PATCH] =?UTF-8?q?[Add]=20=E5=8F=91=E5=B8=83220=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=201=E3=80=81=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=202=E3=80=81DebugView=E6=94=B9=E7=89=88=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0git=E4=BF=A1=E6=81=AF=203=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=BC=95=E5=AF=BC=E7=BA=BF=E9=A2=9C=E8=89=B2=204?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8D=E7=BA=A2=E7=BB=BF=E7=81=AF=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
---
 .../main/res/layout/view_debug_setting.xml    |  21 +++
 gradle.properties                             | 156 +++++++++---------
 .../routeoverlay/RouteOverlayDrawer.java      |   2 +-
 3 files changed, 100 insertions(+), 79 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index 8f7d748a0e..4251cc7a23 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -31,6 +31,27 @@
                     android:textSize="@dimen/dp_34"
                     android:textStyle="bold" />
 
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="PAD系统时间："
+                        android:textColor="#000"
+                        android:textSize="@dimen/dp_36" />
+
+                    <TextClock
+                        android:id="@+id/tvNowTime"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:format12Hour="yyyy年MM月dd日  EEEE  aa  HH:mm:ss"
+                        android:format24Hour="yyyy年MM月dd日  EEEE  aa  HH:mm:ss"
+                        android:textColor="#000"
+                        android:textSize="@dimen/dp_36" />
+                </LinearLayout>
+
                 <TextView
                     android:id="@+id/tvAppInfo"
                     android:layout_width="match_parent"
diff --git a/gradle.properties b/gradle.properties
index e01c49e2f9..383d0bf192 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -37,14 +37,14 @@ kapt.include.compile.classpath=false
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-android.jetifier.blacklist=module-service-2.1.15.2.aar
+android.jetifier.blacklist=module-service-2.1.15.4.aar
 ## maven 配置
 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/
 SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
 USERNAME=xintai
 PASSWORD=xintai2018
 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本
-USE_MAVEN_PACKAGE=false
+USE_MAVEN_PACKAGE=true
 ##plugin 插件
 android.enableR8.libraries=false
 android.enableR8=false
@@ -89,102 +89,102 @@ applicationName=IntelligentPilot
 versionCode=80007
 versionName=8.0.15
 ################# 新架构模块Maven版本管理 #################
-MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.57.2
-MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.57.2
-MOGO_CORE_FUNCTION_HMI_VERSION=0.0.57.2
-MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.57.2
-MOGO_CORE_FUNCTION_MAP_VERSION=0.0.57.2
-MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.57.2
-MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.57.2
-MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.57.2
-MOGO_CORE_FUNCTION_SMP_VERSION=0.0.57.2
-MOGO_CORE_FUNCTION_V2X_VERSION=0.0.57.2
-MOGO_CORE_DATA_VERSION=0.0.57.2
-MOGO_CORE_FUNCTION_API_VERSION=0.0.57.2
-MOGO_CORE_FUNCTION_CALL_VERSION=0.0.57.2
-MOGO_CORE_RES_VERSION=0.0.57.2
-MOGO_CORE_UTILS_VERSION=0.0.57.2
-MOGO_CORE_NETWORK_VERSION=0.0.57.2
+MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.57.4
+MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.57.4
+MOGO_CORE_FUNCTION_HMI_VERSION=0.0.57.4
+MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.57.4
+MOGO_CORE_FUNCTION_MAP_VERSION=0.0.57.4
+MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.57.4
+MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.57.4
+MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.57.4
+MOGO_CORE_FUNCTION_SMP_VERSION=0.0.57.4
+MOGO_CORE_FUNCTION_V2X_VERSION=0.0.57.4
+MOGO_CORE_DATA_VERSION=0.0.57.4
+MOGO_CORE_FUNCTION_API_VERSION=0.0.57.4
+MOGO_CORE_FUNCTION_CALL_VERSION=0.0.57.4
+MOGO_CORE_RES_VERSION=0.0.57.4
+MOGO_CORE_UTILS_VERSION=0.0.57.4
+MOGO_CORE_NETWORK_VERSION=0.0.57.4
 ################# 旧版本架构模块版本 #################
 ## 工程内模块
-MOGO_COMMONS_VERSION=2.1.15.2
-MOGO_UTILS_VERSION=2.1.15.2
-MAP_AMAP_VERSION=2.1.15.2
-MAP_AUTONAVI_VERSION=2.1.15.2
-MOGO_MAP_VERSION=2.1.15.2
-MOGO_MAP_API_VERSION=2.1.15.2
-MOGO_SERVICE_VERSION=2.1.15.2
-MOGO_SERVICE_API_VERSION=2.1.15.2
-MOGO_CONNECTION_VERSION=2.1.15.2
-MOGO_MODULE_APPS_VERSION=2.1.15.2
-MOGO_MODULE_NAVI_VERSION=2.1.15.2
-MOGO_MODULE_SHARE_VERSION=2.1.15.2
-MOGO_MODULE_COMMON_VERSION=2.1.15.2
-MOGO_MODULE_MAIN_VERSION=2.1.15.2
-MOGO_MODULE_MAP_VERSION=2.1.15.2
-MOGO_MODULE_SERVICE_VERSION=2.1.15.2
-MOGO_MODULE_EXTENSIONS_VERSION=2.1.15.2
-MOGO_MODULE_SEARCH_VERSION=2.1.15.2
-MOGO_MODULE_BACK_VERSION=2.1.15.2
-MOGO_MODULE_V2X_VERSION=2.1.15.2
+MOGO_COMMONS_VERSION=2.1.15.4
+MOGO_UTILS_VERSION=2.1.15.4
+MAP_AMAP_VERSION=2.1.15.4
+MAP_AUTONAVI_VERSION=2.1.15.4
+MOGO_MAP_VERSION=2.1.15.4
+MOGO_MAP_API_VERSION=2.1.15.4
+MOGO_SERVICE_VERSION=2.1.15.4
+MOGO_SERVICE_API_VERSION=2.1.15.4
+MOGO_CONNECTION_VERSION=2.1.15.4
+MOGO_MODULE_APPS_VERSION=2.1.15.4
+MOGO_MODULE_NAVI_VERSION=2.1.15.4
+MOGO_MODULE_SHARE_VERSION=2.1.15.4
+MOGO_MODULE_COMMON_VERSION=2.1.15.4
+MOGO_MODULE_MAIN_VERSION=2.1.15.4
+MOGO_MODULE_MAP_VERSION=2.1.15.4
+MOGO_MODULE_SERVICE_VERSION=2.1.15.4
+MOGO_MODULE_EXTENSIONS_VERSION=2.1.15.4
+MOGO_MODULE_SEARCH_VERSION=2.1.15.4
+MOGO_MODULE_BACK_VERSION=2.1.15.4
+MOGO_MODULE_V2X_VERSION=2.1.15.4
 # 探路
-MOGO_MODULE_TANLU_VERSION=2.1.15.2
+MOGO_MODULE_TANLU_VERSION=2.1.15.4
 # 推送
-MOGO_MODULE_PUSH_VERSION=2.1.15.2
-MOGO_MODULE_PUSH_BASE_VERSION=2.1.15.2
-MOGO_MODULE_PUSH_NOOP_VERSION=2.1.15.2
+MOGO_MODULE_PUSH_VERSION=2.1.15.4
+MOGO_MODULE_PUSH_BASE_VERSION=2.1.15.4
+MOGO_MODULE_PUSH_NOOP_VERSION=2.1.15.4
 # 探路上报和分享模块
-TANLULIB_VERSION=2.1.15.2
-MOGO_TANLU_API_VERSION=2.1.15.2
+TANLULIB_VERSION=2.1.15.4
+MOGO_TANLU_API_VERSION=2.1.15.4
 #左侧面板模块
-MOGO_MODULE_LEFT_PANEL_VERSION=2.1.15.2
-MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.15.2
+MOGO_MODULE_LEFT_PANEL_VERSION=2.1.15.4
+MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.15.4
 # 小控件
-MOGO_MODULE_WIDGETS_VERSION=2.1.15.2
+MOGO_MODULE_WIDGETS_VERSION=2.1.15.4
 # obu
-MOGO_MODULE_OBU_VERSION=2.1.15.2
-MOGO_MODULE_OBU_MOGO_VERSION=2.1.15.2
+MOGO_MODULE_OBU_VERSION=2.1.15.4
+MOGO_MODULE_OBU_MOGO_VERSION=2.1.15.4
 # monitor
-MOGO_MODULE_MONITOR_VERSION=2.1.15.2
+MOGO_MODULE_MONITOR_VERSION=2.1.15.4
 # bugly
-CRASHREPORT_VERSION=2.1.15.2
-CRASHREPORT_BUGLY_VERSION=2.1.15.2
-CRASHREPORT_NOOP_VERSION=2.1.15.2
-CRASHREPORT_UPGRADE_VERSION=2.1.15.2
+CRASHREPORT_VERSION=2.1.15.4
+CRASHREPORT_BUGLY_VERSION=2.1.15.4
+CRASHREPORT_NOOP_VERSION=2.1.15.4
+CRASHREPORT_UPGRADE_VERSION=2.1.15.4
 ## tts
-TTS_BASE_VERSION=2.1.15.2
-TTS_DI_VERSION=2.1.15.2
-TTS_ZHI_VERSION=2.1.15.2
-TTS_PAD_VERSION=2.1.15.2
-TTS_NOOP_VERSION=2.1.15.2
+TTS_BASE_VERSION=2.1.15.4
+TTS_DI_VERSION=2.1.15.4
+TTS_ZHI_VERSION=2.1.15.4
+TTS_PAD_VERSION=2.1.15.4
+TTS_NOOP_VERSION=2.1.15.4
 # 自研地图
-MAP_CUSTOM_VERSION=2.1.15.2
-MOGO_MODULE_ADAS_VERSION=2.1.15.2
+MAP_CUSTOM_VERSION=2.1.15.4
+MOGO_MODULE_ADAS_VERSION=2.1.15.4
 # 基础服务实现：passport、socket、location
-MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.15.2
-MOGO_BASE_SERVICES_APK_VERSION=2.1.15.2
-MOGO_BASE_SERVICES_SDK_VERSION=2.1.15.2
-MOGO_MODULE_CHAT_VERSION=2.1.15.2
+MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.15.4
+MOGO_BASE_SERVICES_APK_VERSION=2.1.15.4
+MOGO_BASE_SERVICES_SDK_VERSION=2.1.15.4
+MOGO_MODULE_CHAT_VERSION=2.1.15.4
 # 车聊聊
-MOGO_MODULE_CARCHATTING_VERSION=2.1.15.2
+MOGO_MODULE_CARCHATTING_VERSION=2.1.15.4
 # 车聊聊接口
-MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.15.2
+MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.15.4
 
 # 皮肤
-MOGO_SKIN_SUPPORT_VERSION=2.1.15.2
-MOGO_SKIN_LIGHT_VERSION=2.1.15.2
-MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.15.2
-MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.15.2
-SKIN_SUPPORT_VERSION=2.1.15.2
-SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.15.2
-SKIN_SUPPORT_CARDVIEW_VERSION=2.1.15.2
-SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.15.2
-SKIN_SUPPORT_DESIGN_VERSION=2.1.15.2
+MOGO_SKIN_SUPPORT_VERSION=2.1.15.4
+MOGO_SKIN_LIGHT_VERSION=2.1.15.4
+MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.15.4
+MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.15.4
+SKIN_SUPPORT_VERSION=2.1.15.4
+SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.15.4
+SKIN_SUPPORT_CARDVIEW_VERSION=2.1.15.4
+SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.15.4
+SKIN_SUPPORT_DESIGN_VERSION=2.1.15.4
 # OCH
-MOGO_OCH_VERSION=2.1.15.2-test
+MOGO_OCH_VERSION=2.1.15.4-test
 MOGO_OCH_BUS_VERSION=2.0.66
 MOGO_OCH_NOOP_VERSION=2.0.66
 MOGO_OCH_TAXI_VERSION=2.0.66
 # mogoAiCloud sdk services
-MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.15.2
+MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.15.4
 ################# 旧版本架构模块版本 #################
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java
index bb0d483774..c8b4fc0a1c 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java
@@ -39,7 +39,7 @@ public class RouteOverlayDrawer {
     private static final String markerType = "route_ending";
     private RouteOverlayDrawer(Context context) {
         mPolylineOptions = new MogoPolylineOptions();
-        mPolylineOptions.zIndex(30000f);
+        mPolylineOptions.zIndex(75000f);
         mPolylineOptions.setGps(true);
         // 绘制路径集合
         mPolylinePointList = new ArrayList<>();