[Upload] 发布 Maven

0.0.46 2.1.5 增加隐藏工具箱按钮方法 setToolsViewVisibility Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2021-12-13 15:18:35 +08:00
parent 92565c7c6e
commit d283d6060a
10 changed files with 157 additions and 159 deletions
--- 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                   : 展示限速预警
--- 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

@@ -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
    }

    /**
--- 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)
            }
        }

--- 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"
--- 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
--- 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预警
--- 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)
    }

    /**
--- 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
 ################# 旧版本架构模块版本 #################
--- 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;