[6.7.0-tmp]

2024-09-12 11:24:22 +08:00
parent 62ee482bd9
commit 5e3b75c730
24 changed files with 162 additions and 82 deletions
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneContainerView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneContainerView.kt
@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.hmi.ui.bone
+package com.mogo.eagle.core.function.hmi.bone

 import android.content.Context
 import android.util.AttributeSet
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneTabLayout.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneTabLayout.kt
@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.hmi.ui.bone
+package com.mogo.eagle.core.function.hmi.bone

 import android.content.Context
 import android.util.AttributeSet
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneTopStatusLayout.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneTopStatusLayout.kt
@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.hmi.ui.bone
+package com.mogo.eagle.core.function.hmi.bone

 import android.content.Context
 import android.util.AttributeSet
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/TabSwitchView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/TabSwitchView.kt
@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.hmi.ui.bone
+package com.mogo.eagle.core.function.hmi.bone

 import android.content.Context
 import android.util.AttributeSet
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt
@@ -0,0 +1,18 @@
+package com.mogo.eagle.core.function.hmi.bone.tab
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.function.hmi.R
+
+class CarInfoTabView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr){
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.view_bone_tab, this, true)
+    }
+}
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt
@@ -1,11 +1,9 @@
 package com.mogo.eagle.core.function.hmi.ui

 import android.content.Context
-import android.telecom.Call
 import android.text.TextUtils
 import android.view.Gravity
 import android.view.ViewGroup
-import android.view.WindowManager
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -32,7 +30,6 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
 import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.call.v2x.CallerTurnLightListenerManager
 import com.mogo.eagle.core.function.hmi.ui.camera.RoadVideoDialog
-import com.mogo.eagle.core.function.hmi.ui.greenwave.GreenWaveView
 import com.mogo.eagle.core.function.hmi.ui.lookaround.M1LookAroundView
 import com.mogo.eagle.core.function.hmi.ui.notice.DispatchDialogManager
 import com.mogo.eagle.core.function.hmi.ui.notice.NoticeCheckDialog
@@ -49,7 +46,6 @@ import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog
 import com.mogo.eagle.core.function.hmi.ui.widget.StatusBarView
 import com.mogo.eagle.core.function.hmi.xiaozhi.XiaoZhiStateManager
 import com.mogo.eagle.core.utilcode.floating.MoGoPopWindow
-import com.mogo.eagle.core.utilcode.kotlin.lifeCycleScope
 import com.mogo.eagle.core.utilcode.kotlin.safeCancel
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/switch/DemoModeHiddenSwitch.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/switch/DemoModeHiddenSwitch.kt
@@ -1,30 +0,0 @@
-package com.mogo.eagle.core.function.hmi.ui.switch
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View
-import com.mogo.eagle.core.data.config.FunctionBuildConfig
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
-import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
-
-class DemoModeHiddenSwitch(context: Context, attrs: AttributeSet?) : View(context, attrs) {
-
-    init {
-        isClickable = true
-        setOnClickListener {
-            //只在司机端设置美化模式开关功能
-            if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
-                //单次查询,是否有行程信息（订单进行中时点击不生效）,autopilotControlParameters为null代表不处于自动驾驶状态下
-                if (CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().autopilotControlParameters == null) {
-                    FunctionBuildConfig.isDemoMode = !FunctionBuildConfig.isDemoMode
-                    CallerAutoPilotControlManager.setDemoMode(FunctionBuildConfig.isDemoMode)
-                    if (!FunctionBuildConfig.isDemoMode) {
-                        //关闭美化模式时，通知工控机
-                        CallerAutoPilotControlManager.setIPCDemoMode(FunctionBuildConfig.isDemoMode)
-                    }
-                }
-            }
-        }
-    }
-}
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OfflineMapDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OfflineMapDialog.kt
@@ -1,8 +1,7 @@
-package com.mogo.eagle.core.function.hmi.ui.map
+package com.mogo.eagle.core.function.hmi.ui.tools

 import android.annotation.SuppressLint
 import android.content.Context
-import android.os.Looper
 import android.view.View
 import android.widget.ImageView
 import android.widget.ProgressBar
@@ -13,12 +12,8 @@ import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog
-import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog
 import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog.Companion.hmiAction
-import com.mogo.eagle.core.function.hmi.ui.widget.SystemVersionView
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
-import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.map.MogoData.Companion.mogoMapData
 import me.jessyan.autosize.utils.AutoSizeUtils

--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/greenwave/GreenWaveView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/greenwave/GreenWaveView.kt
@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.hmi.ui.greenwave
+package com.mogo.eagle.core.function.hmi.ui.widget

 import android.content.Context
 import android.util.AttributeSet
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt
@@ -2,7 +2,6 @@ package com.mogo.eagle.core.function.hmi.ui.widget

 import android.content.Context
 import android.util.AttributeSet
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
@@ -19,15 +18,13 @@ import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.function.hmi.ui.map.OfflineMapDialog
+import com.mogo.eagle.core.function.hmi.ui.tools.OfflineMapDialog
 import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog.Companion.hmiAction
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
 import com.mogo.eagle.core.utilcode.util.*
 import com.mogo.map.MogoData.Companion.mogoMapData
 import kotlinx.android.synthetic.main.view_system_version.view.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import system_master.SsmInfo
 import system_master.SystemStatusInfo

--- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/bg_tab_view_top.png
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/bg_tab_view_top.png
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
@@ -6,7 +6,7 @@
    android:background="@drawable/bone_bg"
    android:layout_gravity="center">

-    <com.mogo.eagle.core.function.hmi.ui.bone.BoneTopStatusLayout
+    <com.mogo.eagle.core.function.hmi.bone.BoneTopStatusLayout
        android:id="@+id/boneTopStatusLayout"
        android:layout_width="match_parent"
        app:layout_constraintTop_toTopOf="parent"
@@ -25,7 +25,7 @@
        app:layout_constraintRight_toRightOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

-    <com.mogo.eagle.core.function.hmi.ui.bone.BoneTabLayout
+    <com.mogo.eagle.core.function.hmi.bone.BoneTabLayout
        android:id="@+id/clBoneTab"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml
@@ -2,21 +2,40 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/dp_964"
+    android:layout_width="@dimen/dp_960"
    android:layout_height="match_parent">

+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/clBoneTabChild"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_1128"
+        android:elevation="1dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.mogo.eagle.core.function.hmi.bone.tab.CarInfoTabView
+            android:id="@+id/carInfoTabView"
+            android:layout_width="match_parent"
+            android:layout_marginStart="@dimen/dp_20"
+            android:layout_marginEnd="@dimen/dp_20"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_height="match_parent"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_224"
        android:layout_marginBottom="@dimen/dp_m_2"
        android:background="@drawable/bone_tab_bg"
        android:elevation="10dp"
-        android:orientation="horizontal"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintRight_toRightOf="parent">

-        <com.mogo.eagle.core.function.hmi.ui.bone.TabSwitchView
+        <com.mogo.eagle.core.function.hmi.bone.TabSwitchView
            android:id="@+id/tabSwitchCarInfo"
            android:layout_width="@dimen/dp_220"
            android:layout_height="@dimen/dp_140"
@@ -29,7 +48,7 @@
            app:layout_constraintLeft_toLeftOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

-        <com.mogo.eagle.core.function.hmi.ui.bone.TabSwitchView
+        <com.mogo.eagle.core.function.hmi.bone.TabSwitchView
            android:id="@+id/tabSwitchMsgBox"
            android:layout_width="@dimen/dp_220"
            android:layout_height="@dimen/dp_140"
@@ -40,7 +59,7 @@
            app:layout_constraintLeft_toRightOf="@+id/tabSwitchCarInfo"
            app:layout_constraintTop_toTopOf="parent" />

-        <com.mogo.eagle.core.function.hmi.ui.bone.TabSwitchView
+        <com.mogo.eagle.core.function.hmi.bone.TabSwitchView
            android:id="@+id/tabSwitchReport"
            android:layout_width="@dimen/dp_220"
            android:layout_height="@dimen/dp_140"
@@ -51,7 +70,7 @@
            app:layout_constraintLeft_toRightOf="@+id/tabSwitchMsgBox"
            app:layout_constraintTop_toTopOf="parent" />

-        <com.mogo.eagle.core.function.hmi.ui.bone.TabSwitchView
+        <com.mogo.eagle.core.function.hmi.bone.TabSwitchView
            android:id="@+id/tabSwitchMore"
            android:layout_width="@dimen/dp_220"
            android:layout_height="@dimen/dp_140"
@@ -63,21 +82,5 @@
            app:layout_constraintTop_toTopOf="parent" />
    </androidx.constraintlayout.widget.ConstraintLayout>

-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/clBoneTabChild"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_1128"
-        android:elevation="1dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/clCarInfo"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/acc_default_txt_color" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-

 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/background_color">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/dp_21">
+
+        <View
+            android:id="@+id/topViewPos"
+            android:layout_width="@dimen/dp_856"
+            android:layout_height="@dimen/dp_100"
+            android:background="@drawable/bg_tab_view_top"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_width="@dimen/dp_160"
+            android:layout_height="@dimen/dp_56"
+            android:layout_marginStart="@dimen/dp_64"
+            android:layout_marginTop="@dimen/dp_34"
+            android:text="@string/tab_car_info"
+            android:textColor="@color/color_CC_FFFFFF"
+            android:textSize="@dimen/dp_40"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/ivCarType"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_280"
+            android:layout_marginTop="@dimen/dp_75"
+            app:layout_constraintTop_toBottomOf="@+id/topViewPos"
+            tools:ignore="ContentDescription" />
+
+        <TextView
+            android:id="@+id/tvCarLoginPos"
+            android:layout_width="@dimen/dp_152"
+            android:layout_height="@dimen/dp_53"
+            android:layout_marginStart="@dimen/dp_60"
+            android:layout_marginTop="@dimen/dp_22"
+            android:text="@string/tab_car_login_info"
+            android:textColor="@color/white"
+            android:textSize="@dimen/dp_38"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ivCarType" />
+
+        <TextView
+            android:id="@+id/tvCarLoginInfo"
+            android:layout_width="@dimen/dp_185"
+            android:layout_height="@dimen/dp_45"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_7"
+            android:gravity="center"
+            android:textColor="@color/white"
+            android:textSize="@dimen/dp_32"
+            app:layout_constraintBottom_toBottomOf="@+id/tvCarLoginPos"
+            app:layout_constraintLeft_toRightOf="@+id/tvCarLoginPos"
+            app:layout_constraintTop_toTopOf="@+id/tvCarLoginPos" />
+
+        <TextView
+            android:id="@+id/tvCarExit"
+            android:layout_width="@dimen/dp_64"
+            android:layout_height="@dimen/dp_45"
+            android:layout_marginEnd="@dimen/dp_60"
+            android:gravity="center"
+            android:text="@string/tab_car_exit"
+            android:textColor="@color/color_FF1943"
+            android:textSize="@dimen/dp_32"
+            app:layout_constraintBottom_toBottomOf="@+id/tvCarLoginInfo"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tvCarLoginInfo" />
+
+        <TextView
+            android:id="@+id/tvCarNoPos"
+            android:layout_width="@dimen/dp_152"
+            android:layout_height="@dimen/dp_53"
+            android:layout_marginStart="@dimen/dp_60"
+            android:layout_marginTop="@dimen/dp_49"
+            android:text="@string/tab_car_no"
+            android:textColor="@color/white"
+            android:textSize="@dimen/dp_38"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvCarLoginPos" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
@@ -27,6 +27,7 @@
    <color name="color_252B3F">#252B3F</color>
    <color name="color_131415">#131415</color>
    <color name="color_B2BED9">#B2BED9</color>
+    <color name="color_FF1943">#FF1943</color>
    <color name="color_27FFFFFF">#27FFFFFF</color>
    <color name="color_1E111111">#1E111111</color>
    <color name="color_FF213757">#FF213757</color>
@@ -47,6 +48,7 @@
    <color name="foreground_info">#FF333333</color>
    <color name="foreground_warn">#FFCCCCCC</color>
    <color name="color_80FFFFFF">#80FFFFFF</color>
+    <color name="color_CC_FFFFFF">#CCFFFFFF</color>



--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
@@ -2,6 +2,11 @@
    <string name="app_name">mogo-core-function-hmi</string>
    <string name="motice_push_check">查看</string>

+    <string name="tab_car_info">我的车辆</string>
+    <string name="tab_car_login_info">登陆信息</string>
+    <string name="tab_car_exit">退出</string>
+    <string name="tab_car_no">车辆绑定</string>
+
    <string name="log_min">最小化</string>
    <string name="log_info">日志</string>
    <string name="log_info_edt_hint">输入想要过滤的关键字</string>