[6.7.0] roadcross ui change and update och biz caller

2024-09-23 14:35:49 +08:00
parent 2e5a7e1ef2
commit cd7cf712cc
10 changed files with 56 additions and 61 deletions
--- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
@@ -101,17 +101,6 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent" />

-    <!--超视距-->
-    <com.mogo.eagle.core.function.hmi.ui.widget.CameraView
-        android:id="@+id/ivCameraIcon"
-        android:layout_width="120dp"
-        android:layout_height="120dp"
-        android:layout_marginTop="45dp"
-        android:layout_marginEnd="40dp"
-        app:layout_constraintRight_toLeftOf="@id/viewTrafficLightVr"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
-
    <!--限速牌子-->
    <com.mogo.eagle.core.function.hmi.ui.widget.LimitingVelocityView
        android:id="@+id/viewLimitingVelocity"
@@ -126,7 +115,7 @@
        android:textSize="60dp"
        android:visibility="gone"
        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/ivCameraIcon"
+        app:layout_constraintTop_toBottomOf="@+id/viewTrafficLightVr"
        tools:visibility="visible" />

    <com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
@@ -141,10 +130,10 @@

    <!--  前方路况探查  -->
    <com.mogo.eagle.core.function.view.RoadCrossRoamView
-        android:layout_width="@dimen/dp_600"
-        android:layout_height="@dimen/dp_740"
-        android:layout_marginTop="@dimen/dp_350"
-        android:layout_marginRight="@dimen/dp_45"
+        android:layout_width="@dimen/dp_654"
+        android:layout_height="@dimen/dp_790"
+        android:layout_marginTop="@dimen/dp_39"
+        android:layout_marginRight="@dimen/dp_4"
        android:visibility="gone"
        app:layout_constraintRight_toRightOf="parent"
        app:layout_constraintTop_toTopOf="parent" />
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
@@ -100,17 +100,6 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent" />

-    <!--超视距-->
-    <com.mogo.eagle.core.function.hmi.ui.widget.CameraView
-        android:id="@+id/ivCameraIcon"
-        android:layout_width="120dp"
-        android:layout_height="120dp"
-        android:layout_marginTop="45dp"
-        android:layout_marginEnd="40dp"
-        app:layout_constraintRight_toLeftOf="@id/viewTrafficLightVr"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
-
    <!--限速牌子-->
    <com.mogo.eagle.core.function.hmi.ui.widget.LimitingVelocityView
        android:id="@+id/viewLimitingVelocity"
@@ -125,7 +114,7 @@
        android:textSize="60dp"
        android:visibility="gone"
        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/ivCameraIcon"
+        app:layout_constraintTop_toBottomOf="@+id/viewTrafficLightVr"
        tools:visibility="visible" />

    <com.mogo.eagle.core.function.hmi.ui.mofang.MoFangStatusView
@@ -183,10 +172,10 @@

    <!--  前方路况探查  -->
    <com.mogo.eagle.core.function.view.RoadCrossRoamView
-        android:layout_width="@dimen/dp_600"
-        android:layout_height="@dimen/dp_740"
-        android:layout_marginTop="@dimen/dp_350"
-        android:layout_marginRight="@dimen/dp_45"
+        android:layout_width="@dimen/dp_654"
+        android:layout_height="@dimen/dp_790"
+        android:layout_marginTop="@dimen/dp_39"
+        android:layout_marginRight="@dimen/dp_4"
        android:visibility="gone"
        app:layout_constraintRight_toRightOf="parent"
        app:layout_constraintTop_toTopOf="parent" />
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneContainerView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneContainerView.kt
@@ -33,14 +33,6 @@ class BoneContainerView @JvmOverloads constructor(
        clBoneBiz.addView(view)
    }

-    fun setCarNo(carNo: String){
-        clBoneTab.setCarNo(carNo)
-    }
-
-    fun setLoginInfo(loginNo: String){
-        clBoneTab.setLoginInfo(loginNo)
-    }
-
    fun loginOut(logOut:(() -> Unit)){
        this.logOut = logOut
    }
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt
@@ -192,22 +192,22 @@ class RoadCrossRoamView @JvmOverloads constructor(

    private fun attachView() {
        // 没有路线不做提示
-        if (CallerAutoPilotStatusListenerManager.getLineId() == 0L) {
-            return
-        }
-        // 处于漫游模式下不做处理
-        if (CallerMapIdentifyManager.roam.second) {
-            if (CallerMapIdentifyManager.roam.first != TAG) {
-                ToastUtils.showLong("正在漫游中，不展示路口漫游")
-            }
-            CallerLogger.d("$M_MAP$TAG", "正在漫游中，不展示路口漫游")
-            return
-        }
-        // 首页被遮挡不做提示
-        if (!CallerHmiViewControlListenerManager.getMainPageVisible()) {
-            CallerLogger.d("$M_MAP$TAG", "attachView return , mainPageVisible is false")
-            return
-        }
+//        if (CallerAutoPilotStatusListenerManager.getLineId() == 0L) {
+//            return
+//        }
+//        // 处于漫游模式下不做处理
+//        if (CallerMapIdentifyManager.roam.second) {
+//            if (CallerMapIdentifyManager.roam.first != TAG) {
+//                ToastUtils.showLong("正在漫游中，不展示路口漫游")
+//            }
+//            CallerLogger.d("$M_MAP$TAG", "正在漫游中，不展示路口漫游")
+//            return
+//        }
+//        // 首页被遮挡不做提示
+//        if (!CallerHmiViewControlListenerManager.getMainPageVisible()) {
+//            CallerLogger.d("$M_MAP$TAG", "attachView return , mainPageVisible is false")
+//            return
+//        }
        //播放语音
        val dis = CallerMapRoadListenerManager.getStopLineDistance()?.toInt() ?: 0
        if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
--- a/core/function-impl/mogo-core-function-map/src/main/res/drawable-nodpi/bg_road_cross_roam.9.png
+++ b/core/function-impl/mogo-core-function-map/src/main/res/drawable-nodpi/bg_road_cross_roam.9.png
--- a/core/function-impl/mogo-core-function-map/src/main/res/drawable-nodpi/bg_road_cross_roam.png
+++ b/core/function-impl/mogo-core-function-map/src/main/res/drawable-nodpi/bg_road_cross_roam.png
--- a/core/function-impl/mogo-core-function-map/src/main/res/drawable/anim_road_cross_progress.xml
+++ b/core/function-impl/mogo-core-function-map/src/main/res/drawable/anim_road_cross_progress.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animated-rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/icon_road_roam_progress"
+    android:pivotX="50%"
+    android:pivotY="50%">
+</animated-rotate>
--- a/core/function-impl/mogo-core-function-map/src/main/res/layout/item_road_cross_roam_tip.xml
+++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/item_road_cross_roam_tip.xml
@@ -9,9 +9,9 @@
        android:id="@+id/tvRoadItemTip"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:textSize="@dimen/dp_26"
        android:textColor="@color/white"
+        android:textSize="@dimen/dp_26"
+        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

@@ -19,7 +19,9 @@
        android:id="@+id/pbRoadItemTip"
        android:layout_width="@dimen/dp_35"
        android:layout_height="@dimen/dp_35"
-        android:progressDrawable="@drawable/icon_road_roam_progress"
+        android:indeterminateBehavior="repeat"
+        android:indeterminateDrawable="@drawable/anim_road_cross_progress"
+        android:indeterminateOnly="true"
        android:visibility="visible"
        app:layout_constraintRight_toRightOf="parent"
        app:layout_constraintTop_toTopOf="parent" />
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCall.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCall.kt
@@ -10,4 +10,9 @@ interface IOchFunctionCall {
     */
    fun registerToolKitDefaultItemClickListener(tag: String, listener: IToolKitItemClickListener) {}

+    /**
+     * 网约车回调登陆信息
+     */
+    fun invokeLoginInfo(){}
+
 }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerOchFunctionCallManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerOchFunctionCallManager.kt
@@ -2,22 +2,34 @@ package com.mogo.eagle.core.function.call.och

 import com.mogo.eagle.core.function.api.och.IOchFunctionCall
 import com.mogo.eagle.core.function.api.och.IToolKitItemClickListener
+import com.mogo.eagle.core.function.call.base.CallerBase
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager

 /**
 * 实现给 Och 业务层调用的接口
 */
-object CallerOchFunctionCallManager : IOchFunctionCall {
+object CallerOchFunctionCallManager : CallerBase<IOchFunctionCall>() {
    const val TAG = "CallerOchFunctionCallManager"

+    override fun doSomeAfterAddListener(tag: String, listener: IOchFunctionCall) {
+        super.doSomeAfterAddListener(tag, listener)
+        listener.invokeLoginInfo()
+    }
+
    /**
     * 注册 工具箱 item点击事件监听 (默认样式item的点击事件监听，自定义样式的item的点击交给view自己处理)
     */
-    override fun registerToolKitDefaultItemClickListener(
+    fun toolKitDefaultItemClickListener(
        tag: String,
        listener: IToolKitItemClickListener
    ) {
        CallerHmiManager.registerToolKitDefaultItemClickListener(tag, listener)
    }

+    fun invokeLoginInfo(){
+        M_LISTENERS.forEach {
+            val listener = it.value
+            listener.invokeLoginInfo()
+        }
+    }
 }