diff --git 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 index 633bbf8290..171dbad766 100644 --- 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 @@ -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) { diff --git a/OCH/charter/passenger/src/main/res/drawable/baseline_link_off_24.xml b/OCH/charter/passenger/src/main/res/drawable/baseline_link_off_24.xml new file mode 100644 index 0000000000..a99311bb32 --- /dev/null +++ b/OCH/charter/passenger/src/main/res/drawable/baseline_link_off_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/OCH/charter/passenger/src/main/res/layout/m1_statusview_datetime.xml b/OCH/charter/passenger/src/main/res/layout/m1_statusview_datetime.xml index 6d5970ffdc..7e5aa9f2ea 100644 --- a/OCH/charter/passenger/src/main/res/layout/m1_statusview_datetime.xml +++ b/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"/> + + +