[Upload]

1、上传版本0.0.45、 2.1.3 2、增加小地图控制显示隐藏 ``` // 隐藏小地图 CallerSmpManager.hidePanel() // 显示小地图 CallerSmpManager.showPanel() ``` Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2021-12-08 18:19:50 +08:00
parent f8f994e789
commit 8000e565f4
4 changed files with 139 additions and 105 deletions
--- 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
@@ -26,6 +26,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarStatusListe
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.map.CallerHDMapManager
 import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager
+import com.mogo.eagle.core.function.call.map.CallerSmpManager
 import com.mogo.eagle.core.function.call.obu.CallerOBUManager
 import com.mogo.eagle.core.function.call.obu.CallerObuListenerManager
 import com.mogo.eagle.core.function.hmi.R
@@ -49,11 +50,11 @@ import kotlinx.android.synthetic.main.view_debug_setting.view.*
 * 展示 本机、网络、工控机、OBU等状态信息，支持设置IP，等参数进行调试
 */
 class DebugSettingView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoObuStatusListener,
-    IMoGoAutopilotStatusListener, IMoGoAutopilotCarStateListener, IMoGoMapLocationListener {
+        IMoGoAutopilotStatusListener, IMoGoAutopilotCarStateListener, IMoGoMapLocationListener {

    private val TAG = "DebugSettingView"

@@ -132,7 +133,7 @@ class DebugSettingView @JvmOverloads constructor(

        tvObuInfo.text = CallerObuListenerManager.getObuStatusInfoJsonString()
        tvAutopilotInfo.text =
-            CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfoJsonString()
+                CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfoJsonString()

        // 初始化App 配置信息
        val appConfigInfo = AppConfigInfo()
@@ -150,7 +151,7 @@ class DebugSettingView @JvmOverloads constructor(

        // 初始化OBU IP信息
        val ipAddress =
-            SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, "192.168.1.199")
+                SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, "192.168.1.199")

        etObuIP.setText(ipAddress)
        etObuIP.text?.let { etObuIP.setSelection(it.length) }
@@ -172,18 +173,18 @@ class DebugSettingView @JvmOverloads constructor(

        // 初始化 GSP数据源 数据
        rgGpsProvider.check(
-            when (FunctionBuildConfig.gpsProvider) {
-                0 -> {
-                    R.id.rbGpsProviderAndroid
+                when (FunctionBuildConfig.gpsProvider) {
+                    0 -> {
+                        R.id.rbGpsProviderAndroid
+                    }
+                    1 -> {
+                        R.id.rbGpsProviderRTK
+                    }
+                    2 -> {
+                        R.id.rbGpsProviderOBU
+                    }
+                    else -> R.id.rbGpsProviderAndroid
                }
-                1 -> {
-                    R.id.rbGpsProviderRTK
-                }
-                2 -> {
-                    R.id.rbGpsProviderOBU
-                }
-                else -> R.id.rbGpsProviderAndroid
-            }
        )
        rgGpsProvider.setOnCheckedChangeListener { group, checkedId ->
            when (checkedId) {
@@ -201,14 +202,14 @@ class DebugSettingView @JvmOverloads constructor(

        // 初始化 感知数据是否绘制 选择情况
        rgIsDrawIdentifyData.check(
-            when (FunctionBuildConfig.isDrawIdentifyData) {
-                true -> {
-                    R.id.rbDraw
+                when (FunctionBuildConfig.isDrawIdentifyData) {
+                    true -> {
+                        R.id.rbDraw
+                    }
+                    false -> {
+                        R.id.rbDoNotDraw
+                    }
                }
-                false -> {
-                    R.id.rbDoNotDraw
-                }
-            }
        )
        rgIsDrawIdentifyData.setOnCheckedChangeListener { group, checkedId ->
            when (checkedId) {
@@ -277,6 +278,13 @@ class DebugSettingView @JvmOverloads constructor(
                CallerAutoPilotManager.setIsWriteLog(true)
            }
        }
+        tbControlView.setOnCheckedChangeListener { buttonView, isChecked ->
+            if (isChecked) {
+                CallerSmpManager.hidePanel()
+            } else {
+                CallerSmpManager.showPanel()
+            }
+        }
    }

    /**
--- 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
@@ -91,6 +91,16 @@
                    android:textOn="显示「车辆检测」"
                    android:textSize="@dimen/dp_34" />

+                <ToggleButton
+                    android:id="@+id/tbControlView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:gravity="center"
+                    android:textOff="隐藏「小地图」"
+                    android:textOn="显示「小地图」"
+                    android:textSize="@dimen/dp_34" />
+
                <!--  <Button
                      android:id="@+id/tbChangeCarCenter100"
                      android:layout_width="wrap_content"
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.kt
@@ -14,7 +14,7 @@ import com.mogo.eagle.core.function.call.base.CallerBase
 object CallerSmpManager : CallerBase() {
    private val mogoSmallMapProvider: IMogoSmallMapProvider
        get() = ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_SMP)
-            .navigation() as IMogoSmallMapProvider
+                .navigation() as IMogoSmallMapProvider

    /**
     * 绘制路径线
@@ -31,4 +31,20 @@ object CallerSmpManager : CallerBase() {
    fun clearPolyline() {
        mogoSmallMapProvider.clearPolyline()
    }
+
+    /**
+     * 显示面板
+     */
+    @JvmStatic
+    fun showPanel() {
+        mogoSmallMapProvider.showPanel()
+    }
+
+    /**
+     * 隐藏面板
+     */
+    @JvmStatic
+    fun hidePanel() {
+        mogoSmallMapProvider.hidePanel()
+    }
 }
--- 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.2.aar
+android.jetifier.blacklist=module-service-2.1.3.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.14
 ################# 新架构模块Maven版本管理 #################
-MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.44
-MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.44
-MOGO_CORE_FUNCTION_HMI_VERSION=0.0.44
-MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.44
-MOGO_CORE_FUNCTION_MAP_VERSION=0.0.44
-MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.44
-MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.44
-MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.44
-MOGO_CORE_FUNCTION_SMP_VERSION=0.0.44
-MOGO_CORE_FUNCTION_V2X_VERSION=0.0.44
-MOGO_CORE_DATA_VERSION=0.0.44
-MOGO_CORE_FUNCTION_API_VERSION=0.0.44
-MOGO_CORE_FUNCTION_CALL_VERSION=0.0.44
-MOGO_CORE_RES_VERSION=0.0.44
-MOGO_CORE_UTILS_VERSION=0.0.44
-MOGO_CORE_NETWORK_VERSION=0.0.44
+MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.45
+MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.45
+MOGO_CORE_FUNCTION_HMI_VERSION=0.0.45
+MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.45
+MOGO_CORE_FUNCTION_MAP_VERSION=0.0.45
+MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.45
+MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.45
+MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.45
+MOGO_CORE_FUNCTION_SMP_VERSION=0.0.45
+MOGO_CORE_FUNCTION_V2X_VERSION=0.0.45
+MOGO_CORE_DATA_VERSION=0.0.45
+MOGO_CORE_FUNCTION_API_VERSION=0.0.45
+MOGO_CORE_FUNCTION_CALL_VERSION=0.0.45
+MOGO_CORE_RES_VERSION=0.0.45
+MOGO_CORE_UTILS_VERSION=0.0.45
+MOGO_CORE_NETWORK_VERSION=0.0.45
 ################# 旧版本架构模块版本 #################
 ## 工程内模块
-MOGO_COMMONS_VERSION=2.1.2
-MOGO_UTILS_VERSION=2.1.2
-MAP_AMAP_VERSION=2.1.2
-MAP_AUTONAVI_VERSION=2.1.2
-MOGO_MAP_VERSION=2.1.2
-MOGO_MAP_API_VERSION=2.1.2
-MOGO_SERVICE_VERSION=2.1.2
-MOGO_SERVICE_API_VERSION=2.1.2
-MOGO_CONNECTION_VERSION=2.1.2
-MOGO_MODULE_APPS_VERSION=2.1.2
-MOGO_MODULE_NAVI_VERSION=2.1.2
-MOGO_MODULE_SHARE_VERSION=2.1.2
-MOGO_MODULE_COMMON_VERSION=2.1.2
-MOGO_MODULE_MAIN_VERSION=2.1.2
-MOGO_MODULE_MAP_VERSION=2.1.2
-MOGO_MODULE_SERVICE_VERSION=2.1.2
-MOGO_MODULE_EXTENSIONS_VERSION=2.1.2
-MOGO_MODULE_SEARCH_VERSION=2.1.2
-MOGO_MODULE_BACK_VERSION=2.1.2
-MOGO_MODULE_V2X_VERSION=2.1.2
+MOGO_COMMONS_VERSION=2.1.3
+MOGO_UTILS_VERSION=2.1.3
+MAP_AMAP_VERSION=2.1.3
+MAP_AUTONAVI_VERSION=2.1.3
+MOGO_MAP_VERSION=2.1.3
+MOGO_MAP_API_VERSION=2.1.3
+MOGO_SERVICE_VERSION=2.1.3
+MOGO_SERVICE_API_VERSION=2.1.3
+MOGO_CONNECTION_VERSION=2.1.3
+MOGO_MODULE_APPS_VERSION=2.1.3
+MOGO_MODULE_NAVI_VERSION=2.1.3
+MOGO_MODULE_SHARE_VERSION=2.1.3
+MOGO_MODULE_COMMON_VERSION=2.1.3
+MOGO_MODULE_MAIN_VERSION=2.1.3
+MOGO_MODULE_MAP_VERSION=2.1.3
+MOGO_MODULE_SERVICE_VERSION=2.1.3
+MOGO_MODULE_EXTENSIONS_VERSION=2.1.3
+MOGO_MODULE_SEARCH_VERSION=2.1.3
+MOGO_MODULE_BACK_VERSION=2.1.3
+MOGO_MODULE_V2X_VERSION=2.1.3
 # 探路
-MOGO_MODULE_TANLU_VERSION=2.1.2
+MOGO_MODULE_TANLU_VERSION=2.1.3
 # 推送
-MOGO_MODULE_PUSH_VERSION=2.1.2
-MOGO_MODULE_PUSH_BASE_VERSION=2.1.2
-MOGO_MODULE_PUSH_NOOP_VERSION=2.1.2
+MOGO_MODULE_PUSH_VERSION=2.1.3
+MOGO_MODULE_PUSH_BASE_VERSION=2.1.3
+MOGO_MODULE_PUSH_NOOP_VERSION=2.1.3
 # 探路上报和分享模块
-TANLULIB_VERSION=2.1.2
-MOGO_TANLU_API_VERSION=2.1.2
+TANLULIB_VERSION=2.1.3
+MOGO_TANLU_API_VERSION=2.1.3
 #左侧面板模块
-MOGO_MODULE_LEFT_PANEL_VERSION=2.1.2
-MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.2
+MOGO_MODULE_LEFT_PANEL_VERSION=2.1.3
+MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.3
 # 小控件
-MOGO_MODULE_WIDGETS_VERSION=2.1.2
+MOGO_MODULE_WIDGETS_VERSION=2.1.3
 # obu
-MOGO_MODULE_OBU_VERSION=2.1.2
-MOGO_MODULE_OBU_MOGO_VERSION=2.1.2
+MOGO_MODULE_OBU_VERSION=2.1.3
+MOGO_MODULE_OBU_MOGO_VERSION=2.1.3
 # monitor
-MOGO_MODULE_MONITOR_VERSION=2.1.2
+MOGO_MODULE_MONITOR_VERSION=2.1.3
 # bugly
-CRASHREPORT_VERSION=2.1.2
-CRASHREPORT_BUGLY_VERSION=2.1.2
-CRASHREPORT_NOOP_VERSION=2.1.2
-CRASHREPORT_UPGRADE_VERSION=2.1.2
+CRASHREPORT_VERSION=2.1.3
+CRASHREPORT_BUGLY_VERSION=2.1.3
+CRASHREPORT_NOOP_VERSION=2.1.3
+CRASHREPORT_UPGRADE_VERSION=2.1.3
 ## tts
-TTS_BASE_VERSION=2.1.2
-TTS_DI_VERSION=2.1.2
-TTS_ZHI_VERSION=2.1.2
-TTS_PAD_VERSION=2.1.2
-TTS_NOOP_VERSION=2.1.2
+TTS_BASE_VERSION=2.1.3
+TTS_DI_VERSION=2.1.3
+TTS_ZHI_VERSION=2.1.3
+TTS_PAD_VERSION=2.1.3
+TTS_NOOP_VERSION=2.1.3
 # 自研地图
-MAP_CUSTOM_VERSION=2.1.2
-MOGO_MODULE_ADAS_VERSION=2.1.2
+MAP_CUSTOM_VERSION=2.1.3
+MOGO_MODULE_ADAS_VERSION=2.1.3
 # 基础服务实现：passport、socket、location
-MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.2
-MOGO_BASE_SERVICES_APK_VERSION=2.1.2
-MOGO_BASE_SERVICES_SDK_VERSION=2.1.2
-MOGO_MODULE_CHAT_VERSION=2.1.2
+MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.3
+MOGO_BASE_SERVICES_APK_VERSION=2.1.3
+MOGO_BASE_SERVICES_SDK_VERSION=2.1.3
+MOGO_MODULE_CHAT_VERSION=2.1.3
 # 车聊聊
-MOGO_MODULE_CARCHATTING_VERSION=2.1.2
+MOGO_MODULE_CARCHATTING_VERSION=2.1.3
 # 车聊聊接口
-MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.2
+MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.3

 # 皮肤
-MOGO_SKIN_SUPPORT_VERSION=2.1.2
-MOGO_SKIN_LIGHT_VERSION=2.1.2
-MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.2
-MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.2
-SKIN_SUPPORT_VERSION=2.1.2
-SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.2
-SKIN_SUPPORT_CARDVIEW_VERSION=2.1.2
-SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.2
-SKIN_SUPPORT_DESIGN_VERSION=2.1.2
+MOGO_SKIN_SUPPORT_VERSION=2.1.3
+MOGO_SKIN_LIGHT_VERSION=2.1.3
+MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.3
+MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.3
+SKIN_SUPPORT_VERSION=2.1.3
+SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.3
+SKIN_SUPPORT_CARDVIEW_VERSION=2.1.3
+SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.3
+SKIN_SUPPORT_DESIGN_VERSION=2.1.3
 # OCH
-MOGO_OCH_VERSION=2.1.2-test
-MOGO_OCH_BUS_VERSION=2.1.2-test
-MOGO_OCH_NOOP_VERSION=2.1.2-test
-MOGO_OCH_TAXI_VERSION=2.1.2-test
+MOGO_OCH_VERSION=2.1.3-test
+MOGO_OCH_BUS_VERSION=2.1.3-test
+MOGO_OCH_NOOP_VERSION=2.1.3-test
+MOGO_OCH_TAXI_VERSION=2.1.3-test
 # mogoAiCloud sdk services
-MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.2
+MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.3
 ################# 旧版本架构模块版本 #################