[6.0.0]

[charter]
[展示是否和司机屏连接]

OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/statusbar/StatusBarView.kt

@@ -5,11 +5,13 @@ import android.content.Context
 import android.os.SystemClock
 import android.util.AttributeSet
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.ColorRes
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import chassis.ChassisStatesOuterClass
+import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoBatteryManagementSystemListener
@@ -20,12 +22,15 @@ import com.mogo.eagle.core.function.call.autopilot.CallerBatteryManagementSystem
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
 import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
+import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.util.ClickUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.bus.passenger.R
 import com.mogo.och.bus.passenger.ui.debugview.DebugEvent
-import com.mogo.och.bus.passenger.ui.debugview.DebugView
+import com.mogo.och.common.module.manager.loopmanager.BizLoopManager
+import com.mogo.och.common.module.manager.loopmanager.LoopInfo
 import kotlinx.android.synthetic.main.m1_statusview_datetime.view.*
 import me.jessyan.autosize.utils.AutoSizeUtils
 import org.greenrobot.eventbus.EventBus
@@ -97,6 +102,19 @@ class StatusBarView @JvmOverloads constructor(
 
         val state = CallerAutoPilotStatusListenerManager.getState()
         setAutoPilotStatusInfo(state)
+
+        BizLoopManager.setLoopFunction(TAG, LoopInfo(3, ::showConnectStatusWithDriver))
+    }
+
+    private fun showConnectStatusWithDriver(){
+        UiThreadHandler.post {
+            CallerLogger.d(TAG,"司机屏连接状态：${CallerTelematicManager.getClientConnStatus()}")
+            if(CallerTelematicManager.getClientConnStatus()){
+                aciv_connect_driver_status.visibility = View.GONE
+            }else{
+                aciv_connect_driver_status.visibility = View.VISIBLE
+            }
+        }
     }
 
     private fun setAutoPilotStatusInfo(state: Int) {
@@ -144,6 +162,7 @@ class StatusBarView @JvmOverloads constructor(
         CallerHmiViewControlListenerManager.removeListener(TAG)
         CallerSkinModeListenerManager.removeListener(TAG)
         CallerDevaToolsManager.hideStatusBar()
+        BizLoopManager.removeLoopFunction(TAG)
     }
 
     override fun onBatteryManagementSystemStates(states: ChassisStatesOuterClass.BMSSystemStates) {

OCH/charter/passenger/src/main/res/drawable/baseline_link_off_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="54dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="54dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1 0,1.43 -0.98,2.63 -2.31,2.98l1.46,1.46C20.88,15.61 22,13.95 22,12c0,-2.76 -2.24,-5 -5,-5zM16,11h-2.19l2,2L16,13zM2,4.27l3.11,3.11C3.29,8.12 2,9.91 2,12c0,2.76 2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1 0,-1.59 1.21,-2.9 2.76,-3.07L8.73,11L8,11v2h2.73L13,15.27L13,17h1.73l4.01,4L20,19.74 3.27,3 2,4.27z"/>
+</vector>

OCH/charter/passenger/src/main/res/layout/m1_statusview_datetime.xml

@@ -40,6 +40,17 @@
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_width="@dimen/dp_90"
         android:layout_height="@dimen/dp_47"/>
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/aciv_connect_driver_status"
+        app:layout_constraintTop_toTopOf="@+id/bizz_view"
+        app:layout_constraintBottom_toBottomOf="@+id/bizz_view"
+        app:layout_constraintStart_toStartOf="@+id/bizz_view"
+        app:layout_constraintEnd_toEndOf="@+id/bizz_view"
+        android:src="@drawable/baseline_link_off_24"
+        android:layout_width="@dimen/dp_34"
+        android:layout_height="@dimen/dp_34"/>
+
     <!--Wifi状态-->
     <com.mogo.eagle.core.function.hmi.ui.widget.WifiStateView
         android:id="@+id/wifiStateView"