From d283d6060aa96818a5ab50f5fdb605f4c4d3fbd9 Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Mon, 13 Dec 2021 15:18:35 +0800
Subject: [PATCH] =?UTF-8?q?[Upload]=20=E5=8F=91=E5=B8=83=20Maven=200.0.46?=
 =?UTF-8?q?=202.1.5=20=E5=A2=9E=E5=8A=A0=E9=9A=90=E8=97=8F=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E7=AE=B1=E6=8C=89=E9=92=AE=E6=96=B9=E6=B3=95=20setToo?=
 =?UTF-8?q?lsViewVisibility?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
---
 ZD_README/README_Call.md                      |   2 +-
 .../core/function/hmi/ui/MoGoHmiFragment.kt   | 126 +++++++-------
 .../hmi/ui/setting/DebugSettingView.kt        |   4 +-
 .../src/main/res/layout/fragment_hmi.xml      |  11 +-
 .../main/res/layout/view_debug_setting.xml    |   4 +-
 .../api/hmi/warning/IMoGoWaringProvider.kt    |   4 +-
 .../function/call/hmi/CallerHmiManager.kt     |   6 +-
 gradle.properties                             | 154 +++++++++---------
 .../scene/seek/V2XSeekHelpScenario.java       |   3 +-
 upload.sh                                     |   2 +-
 10 files changed, 157 insertions(+), 159 deletions(-)

diff --git a/ZD_README/README_Call.md b/ZD_README/README_Call.md
index 652ee01041..c675586dfd 100644
--- a/ZD_README/README_Call.md
+++ b/ZD_README/README_Call.md
@@ -11,7 +11,7 @@ disableLimitingVelocity                : 关闭限速预警
 disableWarningTrafficLight             : 关闭红绿灯预警
 disableWarningV2X                      : 关闭指定floatTag 的 VR下V2X预警弹窗
 setAutopilotStatusViewVisibility       : 隐藏 自动驾驶触发 按钮
-setCheckStatusViewVisibility           : 隐藏 检测状态 按钮
+setToolsViewVisibility                 : 隐藏 工具箱 按钮
 setPerspectiveSwitchViewVisibility     : 隐藏 切换视角 按钮
 setSpeedChartViewVisibility            : 隐藏 脉速表
 showLimitingVelocity                   : 展示限速预警
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
index 542266a80b..572f9adcb9 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
@@ -22,7 +22,6 @@ import com.mogo.eagle.core.function.call.check.CallerCheckManager
 import com.mogo.eagle.core.function.call.monitor.CallerMonitorManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.WaringConst
-import com.mogo.eagle.core.function.hmi.WaringConst.NOTICE_FOR_NORMAL_KEY
 import com.mogo.eagle.core.function.hmi.notification.WarningFloat
 import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator
 import com.mogo.eagle.core.function.hmi.notification.enums.SidePattern
@@ -31,14 +30,12 @@ import com.mogo.eagle.core.function.hmi.ui.notice.NoticeBannerView
 import com.mogo.eagle.core.function.hmi.ui.notice.NoticeNormalBannerView
 import com.mogo.eagle.core.function.hmi.ui.setting.DebugSettingView
 import com.mogo.eagle.core.function.hmi.ui.tools.AutoPilotAndCheckView
-import com.mogo.eagle.core.function.hmi.ui.utils.visible
 import com.mogo.eagle.core.function.hmi.ui.widget.V2XNotificationView
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.module.common.enums.EventTypeEnum
 import com.mogo.utils.logger.Logger
 import kotlinx.android.synthetic.main.fragment_hmi.*
-import androidx.core.view.isVisible as isVisible
 
 /**
  * @author xiaoyuzhou
@@ -66,6 +63,7 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
     private var cameraViewFloat: WarningFloat.Builder? = null
 
     private var toolsView: AutoPilotAndCheckView? = null
+
     // 检测、自动驾驶速度设置
     private var toolsViewFloat: WarningFloat.Builder? = null
 
@@ -158,40 +156,40 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
                     })
                 }
                 toolsViewFloat = WarningFloat.with(it)
-                    .setTag("ToolsViewFloat")
-                    .setLayout(toolsView!!)
-                    .setSidePattern(SidePattern.LEFT)
-                    .setGravity(Gravity.LEFT, offsetY = 72)
-                    .setImmersionStatusBar(true)
-                    .setAnimator(object : DefaultAnimator() {
-                        override fun enterAnim(
-                            view: View,
-                            params: WindowManager.LayoutParams,
-                            windowManager: WindowManager,
-                            sidePattern: SidePattern
-                        ): Animator? =
-                            super.enterAnim(view, params, windowManager, sidePattern)
-                                ?.apply {
-                                    interpolator = OvershootInterpolator()
-                                }
+                        .setTag("ToolsViewFloat")
+                        .setLayout(toolsView!!)
+                        .setSidePattern(SidePattern.LEFT)
+                        .setGravity(Gravity.LEFT, offsetY = 72)
+                        .setImmersionStatusBar(true)
+                        .setAnimator(object : DefaultAnimator() {
+                            override fun enterAnim(
+                                    view: View,
+                                    params: WindowManager.LayoutParams,
+                                    windowManager: WindowManager,
+                                    sidePattern: SidePattern
+                            ): Animator? =
+                                    super.enterAnim(view, params, windowManager, sidePattern)
+                                            ?.apply {
+                                                interpolator = OvershootInterpolator()
+                                            }
 
-                        override fun exitAnim(
-                            view: View,
-                            params: WindowManager.LayoutParams,
-                            windowManager: WindowManager,
-                            sidePattern: SidePattern
-                        ): Animator? =
-                            super.exitAnim(view, params, windowManager, sidePattern)
-                                ?.setDuration(200)
-                    })
-                    .addWarningStatusListener(object : IMoGoWarningStatusListener {
-                        override fun onDismiss() {
-                            toolsViewFloat = null
-                            toolsView = null
-                            // TODO:("")
-                        }
-                    })
-                    .show()
+                            override fun exitAnim(
+                                    view: View,
+                                    params: WindowManager.LayoutParams,
+                                    windowManager: WindowManager,
+                                    sidePattern: SidePattern
+                            ): Animator? =
+                                    super.exitAnim(view, params, windowManager, sidePattern)
+                                            ?.setDuration(200)
+                        })
+                        .addWarningStatusListener(object : IMoGoWarningStatusListener {
+                            override fun onDismiss() {
+                                toolsViewFloat = null
+                                toolsView = null
+                                // TODO:("")
+                            }
+                        })
+                        .show()
             } else {
                 toolsViewFloat?.show()
             }
@@ -225,9 +223,9 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
 
         // 控制 切换视角 展示
         if (HmiBuildConfig.isShowCheckStatusView) {
-            setCheckStatusViewVisibility(View.VISIBLE)
+            setToolsViewVisibility(View.VISIBLE)
         } else {
-            setCheckStatusViewVisibility(View.GONE)
+            setToolsViewVisibility(View.GONE)
         }
 
     }
@@ -256,8 +254,8 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
         viewPerspectiveSwitch?.visibility = visibility
     }
 
-    override fun setCheckStatusViewVisibility(visibility: Int) {
-//        viewCheckStatus?.visibility = visibility
+    override fun setToolsViewVisibility(visibility: Int) {
+        ivToolsIcon?.visibility = visibility
     }
 
     /**
@@ -491,30 +489,30 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
                 mNoticeFloat = it.let { it1 ->
                     noticeBannerView?.let { it2 ->
                         WarningFloat.with(it1)
-                            .setTag(WaringConst.NOTICE_FOR_NORMAL_KEY)
-                            .setLayout(it2)
-                            .setSidePattern(SidePattern.TOP)
-                            .setCountDownTime(10000)
-                            .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
-                            .setImmersionStatusBar(true)
-                            .addWarningStatusListener(object : IMoGoWarningStatusListener {
-                                override fun onShow() {
-                                    // 创建弹窗成功才进行TTS播报
-                                    //                                    AIAssist.getInstance(activity)
-                                    //                                            .speakTTSVoice("")
-                                }
-                            })
-                            .setAnimator(object : DefaultAnimator() {
-                                override fun enterAnim(
-                                    view: View,
-                                    params: WindowManager.LayoutParams,
-                                    windowManager: WindowManager,
-                                    sidePattern: SidePattern
-                                ): Animator? =
-                                    super.enterAnim(view, params, windowManager, sidePattern)
-                                        ?.apply {
-                                            interpolator = OvershootInterpolator()
-                                        }
+                                .setTag(WaringConst.NOTICE_FOR_NORMAL_KEY)
+                                .setLayout(it2)
+                                .setSidePattern(SidePattern.TOP)
+                                .setCountDownTime(10000)
+                                .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
+                                .setImmersionStatusBar(true)
+                                .addWarningStatusListener(object : IMoGoWarningStatusListener {
+                                    override fun onShow() {
+                                        // 创建弹窗成功才进行TTS播报
+                                        //                                    AIAssist.getInstance(activity)
+                                        //                                            .speakTTSVoice("")
+                                    }
+                                })
+                                .setAnimator(object : DefaultAnimator() {
+                                    override fun enterAnim(
+                                            view: View,
+                                            params: WindowManager.LayoutParams,
+                                            windowManager: WindowManager,
+                                            sidePattern: SidePattern
+                                    ): Animator? =
+                                            super.enterAnim(view, params, windowManager, sidePattern)
+                                                    ?.apply {
+                                                        interpolator = OvershootInterpolator()
+                                                    }
 
                                     override fun exitAnim(
                                             view: View,
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index b520c24664..031a3bc97e 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -124,9 +124,9 @@ class DebugSettingView @JvmOverloads constructor(
 
         tbCheckStatusView.setOnCheckedChangeListener { buttonView, isChecked ->
             if (!isChecked) {
-                CallerHmiManager.setCheckStatusViewVisibility(View.VISIBLE)
+                CallerHmiManager.setToolsViewVisibility(View.VISIBLE)
             } else {
-                CallerHmiManager.setCheckStatusViewVisibility(View.GONE)
+                CallerHmiManager.setToolsViewVisibility(View.GONE)
             }
         }
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
index 7f8775e20d..5a98ea9045 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
@@ -85,18 +85,17 @@
 
     <ImageView
         android:id="@+id/ivToolsIcon"
-        android:layout_width="102px"
-        android:layout_height="102px"
+        android:layout_width="@dimen/module_hmi_check_size"
+        android:layout_height="@dimen/module_hmi_check_size"
         android:layout_marginLeft="25px"
         android:layout_marginBottom="40px"
-        android:elevation="@dimen/dp_10"
         android:background="@drawable/module_ext_check"
-        android:src="@drawable/icon_tools_nor"
+        android:elevation="@dimen/dp_10"
         android:scaleType="center"
+        android:src="@drawable/icon_tools_nor"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/viewPerspectiveSwitch"
-        app:layout_goneMarginStart="50px"
-        />
+        app:layout_goneMarginStart="50px" />
 
     <ImageView
         android:id="@+id/ivCameraIcon"
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 33aff7f3d0..8d7789a508 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
@@ -87,8 +87,8 @@
                     android:layout_height="wrap_content"
                     android:layout_margin="2dp"
                     android:gravity="center"
-                    android:textOff="隐藏「车辆检测」"
-                    android:textOn="显示「车辆检测」"
+                    android:textOff="隐藏「工具箱」"
+                    android:textOn="显示「工具箱」"
                     android:textSize="@dimen/dp_34" />
 
                 <!--  <Button
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt
index 238e023f9c..766219767d 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt
@@ -29,10 +29,10 @@ interface IMoGoWaringProvider  {
     fun setPerspectiveSwitchViewVisibility(visibility: Int)
 
     /**
-     * 隐藏 检测状态 按钮
+     * 隐藏 工具箱 按钮
      * @param visibility View.VISIBLE, View.INVISIBLE,View.GONE
      */
-    fun setCheckStatusViewVisibility(visibility: Int)
+    fun setToolsViewVisibility(visibility: Int)
 
     /**
      * 展示VR下V2X预警
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt
index 476f963dd9..6cc235a4c9 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt
@@ -45,11 +45,11 @@ object CallerHmiManager : CallerBase() {
     }
 
     /**
-     * 隐藏 检测状态 按钮
+     * 隐藏 工具箱 按钮
      * @param visibility View.VISIBLE, View.INVISIBLE,View.GONE
      */
-    fun setCheckStatusViewVisibility(visibility: Int) {
-        waringProviderApi.setCheckStatusViewVisibility(visibility)
+    fun setToolsViewVisibility(visibility: Int) {
+        waringProviderApi.setToolsViewVisibility(visibility)
     }
 
     /**
diff --git a/gradle.properties b/gradle.properties
index 6cf76dd95c..245dbcfd7e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -37,7 +37,7 @@ 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.4.aar
+android.jetifier.blacklist=module-service-2.1.5.aar
 ## maven 配置
 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/
 SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
@@ -89,102 +89,102 @@ applicationName=IntelligentPilot
 versionCode=80007
 versionName=8.0.15
 ################# 新架构模块Maven版本管理 #################
-MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.46
-MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.46
-MOGO_CORE_FUNCTION_HMI_VERSION=0.0.46
-MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.46
-MOGO_CORE_FUNCTION_MAP_VERSION=0.0.46
-MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.46
-MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.46
-MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.46
-MOGO_CORE_FUNCTION_SMP_VERSION=0.0.46
-MOGO_CORE_FUNCTION_V2X_VERSION=0.0.46
-MOGO_CORE_DATA_VERSION=0.0.46
-MOGO_CORE_FUNCTION_API_VERSION=0.0.46
-MOGO_CORE_FUNCTION_CALL_VERSION=0.0.46
-MOGO_CORE_RES_VERSION=0.0.46
-MOGO_CORE_UTILS_VERSION=0.0.46
-MOGO_CORE_NETWORK_VERSION=0.0.46
+MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.47
+MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.47
+MOGO_CORE_FUNCTION_HMI_VERSION=0.0.47
+MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.47
+MOGO_CORE_FUNCTION_MAP_VERSION=0.0.47
+MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.47
+MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.47
+MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.47
+MOGO_CORE_FUNCTION_SMP_VERSION=0.0.47
+MOGO_CORE_FUNCTION_V2X_VERSION=0.0.47
+MOGO_CORE_DATA_VERSION=0.0.47
+MOGO_CORE_FUNCTION_API_VERSION=0.0.47
+MOGO_CORE_FUNCTION_CALL_VERSION=0.0.47
+MOGO_CORE_RES_VERSION=0.0.47
+MOGO_CORE_UTILS_VERSION=0.0.47
+MOGO_CORE_NETWORK_VERSION=0.0.47
 ################# 旧版本架构模块版本 #################
 ## 工程内模块
-MOGO_COMMONS_VERSION=2.1.4
-MOGO_UTILS_VERSION=2.1.4
-MAP_AMAP_VERSION=2.1.4
-MAP_AUTONAVI_VERSION=2.1.4
-MOGO_MAP_VERSION=2.1.4
-MOGO_MAP_API_VERSION=2.1.4
-MOGO_SERVICE_VERSION=2.1.4
-MOGO_SERVICE_API_VERSION=2.1.4
-MOGO_CONNECTION_VERSION=2.1.4
-MOGO_MODULE_APPS_VERSION=2.1.4
-MOGO_MODULE_NAVI_VERSION=2.1.4
-MOGO_MODULE_SHARE_VERSION=2.1.4
-MOGO_MODULE_COMMON_VERSION=2.1.4
-MOGO_MODULE_MAIN_VERSION=2.1.4
-MOGO_MODULE_MAP_VERSION=2.1.4
-MOGO_MODULE_SERVICE_VERSION=2.1.4
-MOGO_MODULE_EXTENSIONS_VERSION=2.1.4
-MOGO_MODULE_SEARCH_VERSION=2.1.4
-MOGO_MODULE_BACK_VERSION=2.1.4
-MOGO_MODULE_V2X_VERSION=2.1.4
+MOGO_COMMONS_VERSION=2.1.5
+MOGO_UTILS_VERSION=2.1.5
+MAP_AMAP_VERSION=2.1.5
+MAP_AUTONAVI_VERSION=2.1.5
+MOGO_MAP_VERSION=2.1.5
+MOGO_MAP_API_VERSION=2.1.5
+MOGO_SERVICE_VERSION=2.1.5
+MOGO_SERVICE_API_VERSION=2.1.5
+MOGO_CONNECTION_VERSION=2.1.5
+MOGO_MODULE_APPS_VERSION=2.1.5
+MOGO_MODULE_NAVI_VERSION=2.1.5
+MOGO_MODULE_SHARE_VERSION=2.1.5
+MOGO_MODULE_COMMON_VERSION=2.1.5
+MOGO_MODULE_MAIN_VERSION=2.1.5
+MOGO_MODULE_MAP_VERSION=2.1.5
+MOGO_MODULE_SERVICE_VERSION=2.1.5
+MOGO_MODULE_EXTENSIONS_VERSION=2.1.5
+MOGO_MODULE_SEARCH_VERSION=2.1.5
+MOGO_MODULE_BACK_VERSION=2.1.5
+MOGO_MODULE_V2X_VERSION=2.1.5
 # 探路
-MOGO_MODULE_TANLU_VERSION=2.1.4
+MOGO_MODULE_TANLU_VERSION=2.1.5
 # 推送
-MOGO_MODULE_PUSH_VERSION=2.1.4
-MOGO_MODULE_PUSH_BASE_VERSION=2.1.4
-MOGO_MODULE_PUSH_NOOP_VERSION=2.1.4
+MOGO_MODULE_PUSH_VERSION=2.1.5
+MOGO_MODULE_PUSH_BASE_VERSION=2.1.5
+MOGO_MODULE_PUSH_NOOP_VERSION=2.1.5
 # 探路上报和分享模块
-TANLULIB_VERSION=2.1.4
-MOGO_TANLU_API_VERSION=2.1.4
+TANLULIB_VERSION=2.1.5
+MOGO_TANLU_API_VERSION=2.1.5
 #左侧面板模块
-MOGO_MODULE_LEFT_PANEL_VERSION=2.1.4
-MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.4
+MOGO_MODULE_LEFT_PANEL_VERSION=2.1.5
+MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.5
 # 小控件
-MOGO_MODULE_WIDGETS_VERSION=2.1.4
+MOGO_MODULE_WIDGETS_VERSION=2.1.5
 # obu
-MOGO_MODULE_OBU_VERSION=2.1.4
-MOGO_MODULE_OBU_MOGO_VERSION=2.1.4
+MOGO_MODULE_OBU_VERSION=2.1.5
+MOGO_MODULE_OBU_MOGO_VERSION=2.1.5
 # monitor
-MOGO_MODULE_MONITOR_VERSION=2.1.4
+MOGO_MODULE_MONITOR_VERSION=2.1.5
 # bugly
-CRASHREPORT_VERSION=2.1.4
-CRASHREPORT_BUGLY_VERSION=2.1.4
-CRASHREPORT_NOOP_VERSION=2.1.4
-CRASHREPORT_UPGRADE_VERSION=2.1.4
+CRASHREPORT_VERSION=2.1.5
+CRASHREPORT_BUGLY_VERSION=2.1.5
+CRASHREPORT_NOOP_VERSION=2.1.5
+CRASHREPORT_UPGRADE_VERSION=2.1.5
 ## tts
-TTS_BASE_VERSION=2.1.4
-TTS_DI_VERSION=2.1.4
-TTS_ZHI_VERSION=2.1.4
-TTS_PAD_VERSION=2.1.4
-TTS_NOOP_VERSION=2.1.4
+TTS_BASE_VERSION=2.1.5
+TTS_DI_VERSION=2.1.5
+TTS_ZHI_VERSION=2.1.5
+TTS_PAD_VERSION=2.1.5
+TTS_NOOP_VERSION=2.1.5
 # 自研地图
-MAP_CUSTOM_VERSION=2.1.4
-MOGO_MODULE_ADAS_VERSION=2.1.4
+MAP_CUSTOM_VERSION=2.1.5
+MOGO_MODULE_ADAS_VERSION=2.1.5
 # 基础服务实现：passport、socket、location
-MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.4
-MOGO_BASE_SERVICES_APK_VERSION=2.1.4
-MOGO_BASE_SERVICES_SDK_VERSION=2.1.4
-MOGO_MODULE_CHAT_VERSION=2.1.4
+MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.5
+MOGO_BASE_SERVICES_APK_VERSION=2.1.5
+MOGO_BASE_SERVICES_SDK_VERSION=2.1.5
+MOGO_MODULE_CHAT_VERSION=2.1.5
 # 车聊聊
-MOGO_MODULE_CARCHATTING_VERSION=2.1.4
+MOGO_MODULE_CARCHATTING_VERSION=2.1.5
 # 车聊聊接口
-MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.4
+MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.5
 
 # 皮肤
-MOGO_SKIN_SUPPORT_VERSION=2.1.4
-MOGO_SKIN_LIGHT_VERSION=2.1.4
-MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.4
-MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.4
-SKIN_SUPPORT_VERSION=2.1.4
-SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.4
-SKIN_SUPPORT_CARDVIEW_VERSION=2.1.4
-SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.4
-SKIN_SUPPORT_DESIGN_VERSION=2.1.4
+MOGO_SKIN_SUPPORT_VERSION=2.1.5
+MOGO_SKIN_LIGHT_VERSION=2.1.5
+MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.5
+MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.5
+SKIN_SUPPORT_VERSION=2.1.5
+SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.5
+SKIN_SUPPORT_CARDVIEW_VERSION=2.1.5
+SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.5
+SKIN_SUPPORT_DESIGN_VERSION=2.1.5
 # OCH
-MOGO_OCH_VERSION=2.1.4-test
+MOGO_OCH_VERSION=2.1.5-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.4
+MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.5
 ################# 旧版本架构模块版本 #################
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
index 0567eb92e3..f218c859cd 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
@@ -32,7 +32,8 @@ public class V2XSeekHelpScenario extends AbsV2XScenario<List<V2XMarkerEntity>> i
 
     public V2XSeekHelpScenario() {
         setV2XWindow(new V2XSeekHelpWindow());
-        setV2XMarker(new V2XSeekHelpMarker());
+        // TODO 这里引起了地图的崩溃，由于本次交付不包含此功能，所以先注释掉 2021-12-13
+        //setV2XMarker(new V2XSeekHelpMarker());
     }
 
     private List<V2XMarkerEntity> mMarkerEntity;
diff --git a/upload.sh b/upload.sh
index f37cac23f5..981a9e2be8 100755
--- a/upload.sh
+++ b/upload.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 function upload(){
    ./gradlew $1:clean $1:uploadArchives
-   if [ $? -ne 0 ];the n exit; fi
+   if [ $? -ne 0 ];then exit; fi
 }
 
 for module in `cat modules.txt`;