Merge remote-tracking branch 'origin/dev_robotaxi-d_230809_6.0.0' into dev_robotaxi-d_230809_6.0.0

2023-08-21 14:03:07 +08:00
parent 319a0f9ff0 417a3aa021
commit 0e72c6571d
10 changed files with 34 additions and 17 deletions
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java
@@ -20,15 +20,16 @@ import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout;
@Route( path = MogoServicePaths.PATH_STATUS_VIEW_MANAGER )
 public class StatusViewManager implements IStatusViewLayout {

+    private StatusBarView statusBarView;

    @NonNull
    @Override
    public View getStatusView(Context context) {
-        return new StatusBarView(context);
+        return statusBarView;
    }

    @Override
    public void init(Context context) {
-
+        statusBarView = new StatusBarView(context);
    }
 }
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
@@ -5,10 +5,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import com.alibaba.android.arouter.launcher.ARouter
 import com.amap.api.maps.model.LatLng
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.mvp.MvpFragment
 import com.mogo.eagle.core.data.config.HdMapBuildConfig
+import com.mogo.eagle.core.data.constants.MogoServicePaths
+import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMapUIController
 import com.mogo.eagle.core.function.hmi.ui.msgbox.MMsgBoxButtonView
 import com.mogo.eagle.core.function.view.SiteMarkerBean
@@ -24,6 +27,7 @@ import com.mogo.och.bus.passenger.ui.bottom.BottomBar
 import com.mogo.och.bus.passenger.ui.bottom.BottomClickView
 import com.mogo.och.bus.passenger.ui.dialogfragment.M1CarUserNoOrderFragment
 import com.mogo.och.bus.passenger.ui.dialogfragment.NoviceGuidanceFragment
+import com.mogo.och.bus.passenger.ui.statusbar.StatusBarView
 import com.mogo.och.bus.passenger.utils.ToastCharterUtils
 import com.mogo.och.common.module.biz.constant.LoginStatusManager
 import kotlinx.android.synthetic.main.m1_main_fragment.*
@@ -36,8 +40,7 @@ import java.lang.ref.WeakReference
 * @author: wangmingjun
 * @date: 2022/4/12
 */
-class MainFragment :
-    MvpFragment<MainFragment?, BusPassengerPresenter?>() {
+class MainFragment : MvpFragment<MainFragment?, BusPassengerPresenter?>() {

    private var m1CarUserNoOrderFragment: WeakReference<M1CarUserNoOrderFragment>? = null
    private var noviceGuidanceFragment: WeakReference<NoviceGuidanceFragment>? = null
@@ -59,7 +62,16 @@ class MainFragment :
        }
    }

+    private var statusBarView: StatusBarView? = null
+
    override fun getLayoutId(): Int {
+        (ARouter.getInstance().build(MogoServicePaths.PATH_STATUS_VIEW_MANAGER)
+            .navigation() as? IStatusViewLayout)?.apply {
+            val statusView = getStatusView(requireContext())
+            if (statusView is StatusBarView) {
+                statusBarView = statusView
+            }
+        }
        return R.layout.m1_main_fragment
    }

@@ -115,6 +127,7 @@ class MainFragment :
                    BottomBar.SelectView.VIDEO -> showBizView(showVideo = true)
                    else -> {
                        showBizView()
+                        statusBarView?.setBackgroudColor(R.color.bus_p_m1_80ffffff)
                    }
                }
                return false
@@ -157,21 +170,25 @@ class MainFragment :
    ) {
        if (orderinfo) {
            biz_orderinfo.visibility = View.VISIBLE
+            statusBarView?.setBackgroudColor(R.color.bus_p_m1_80ffffff)
        } else {
            biz_orderinfo.visibility = View.GONE
        }
        if (softControl) {
            biz_softcontrol.visibility = View.VISIBLE
+            statusBarView?.setBackgroudColor(R.color.bus_p_m1_40ffffff)
        } else {
            biz_softcontrol.visibility = View.GONE
        }
        if (selectLine) {
            biz_selectline.visibility = View.VISIBLE
+            statusBarView?.setBackgroudColor(R.color.bus_p_m1_80ffffff)
        } else {
            biz_selectline.visibility = View.GONE
        }
        if (showVideo) {
            biz_video.visibility = View.VISIBLE
+            statusBarView?.setBackgroudColor(R.color.bus_p_m1_40ffffff)
        } else {
            biz_video.visibility = View.GONE
        }
@@ -208,7 +225,7 @@ class MainFragment :
        omvOverMap.onResume()
        UiThreadHandler.postDelayed({
            getMapUIController()?.setAllGesturesEnabled(false)
-        },200)
+        }, 200)
    }

    override fun onSaveInstanceState(outState: Bundle) {
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/statusbar/StatusBarView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/statusbar/StatusBarView.kt
@@ -6,6 +6,7 @@ import android.os.SystemClock
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.annotation.ColorRes
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import chassis.ChassisStatesOuterClass
@@ -64,6 +65,10 @@ class StatusBarView @JvmOverloads constructor(
        isFocusable = true
    }

+    fun setBackgroudColor(@ColorRes color:Int){
+        setBackgroundColor(ContextCompat.getColor(context,color))
+    }
+
    override fun onAttachedToWindow() {
        super.onAttachedToWindow()
        post {
--- a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_car_light.png
+++ b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_car_light.png
--- a/OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml
@@ -19,6 +19,7 @@
        android:layout_height="match_parent"
        app:bottomPadding="200"
        app:carDrawable="@drawable/bug_p_overmap_car_model"
+        app:compassDrawable="@drawable/charter_p_car_light"
        app:isClearArrived="true"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
--- a/OCH/charter/passenger/src/main/res/values/color.xml
+++ b/OCH/charter/passenger/src/main/res/values/color.xml
@@ -50,6 +50,7 @@
    <color name="bus_p_m1_91EFF6FF">#91EFF6FF</color>
    <color name="bus_p_m1_CCFFFFFF">#CCFFFFFF</color>
    <color name="bus_p_m1_80ffffff">#80FFFFFF</color>
+    <color name="bus_p_m1_40ffffff">#40FFFFFF</color>
    <color name="bus_p_m1_f0e0efff">#F0E0EFFF </color>
    <color name="bus_p_m1_66000000">#66000000</color>
 </resources>
--- a/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/systemsetting/TaxiPSettingView.kt
+++ b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/systemsetting/TaxiPSettingView.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.taxi.passenger.ui
+package com.mogo.och.taxi.passenger.ui.systemsetting

 import android.annotation.SuppressLint
 import android.content.Context
@@ -10,14 +10,12 @@ import android.media.AudioManager
 import android.provider.Settings
 import android.text.TextUtils
 import android.util.AttributeSet
-import android.util.Log
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.SeekBar
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
-import androidx.core.view.isVisible
 import com.mogo.commons.module.intent.IMogoIntentListener
 import com.mogo.commons.module.intent.IntentManager
 import com.mogo.commons.module.receiver.MogoReceiver
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -23,7 +23,7 @@ public class MogoApplication extends MainMoGoApplication {

    @Override
    public void onCreate() {
-        TraceNodeCore.Companion.getTraceNodeCore().setDebugMode(true); //todo
+//        TraceNodeCore.Companion.getTraceNodeCore().setDebugMode(false); //todo
        ARouterStartUp.init(this);
        ConfigStartUp.init(this);
        tryEnableStrictMode();
--- a/gradle.properties
+++ b/gradle.properties
@@ -56,14 +56,9 @@ bytex.forbidUseLenientMutationDuringGetArtifact=true
 bytex.verifyProguardConfigurationChanged=false
 bytex.ASM_API=ASM7

-HOOK_LOG_VERSION=1.6.1
-SERVICE_CHAIN_VERSION=1.1.0
-
-BIZCONFIG_VERSION=1.3.2
-SERVICE_BIZ_VERSION=1.2.4
 ################  外部依赖引用 ################
 # loglib
-LOGLIB_VERSION=1.8.2
+LOGLIB_VERSION=1.9.0
 ######## MogoAiCloudSDK Version ########
 # 网络请求LOGLIB_VERSION
 MOGO_NETWORK_VERSION=1.4.7.12
--- a/gradle/ext.gradle
+++ b/gradle/ext.gradle
@@ -2,7 +2,6 @@ ext {
    gradle_version = '3.5.3'
    kotlin_version = '1.5.30'
    plugin_version = '10.0.0_mogo'
-    hook_log_plugin_version = '1.7.2'
-    service_chain_version = '5.2.10'
+    service_chain_version = '5.3.5'
    lancetx_plugin_version = '10.0.4_mogo'
 }