[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/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,
--- 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