diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java index 0f991d1346..88fdfe533b 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java @@ -16,6 +16,7 @@ import com.mogo.commons.mvp.MvpFragment; import com.mogo.commons.mvp.Presenter; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; +import com.mogo.eagle.core.function.hmi.ui.widget.DriverMonitorView; import com.mogo.eagle.core.function.view.MapBizView; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; @@ -42,6 +43,7 @@ public abstract class BusPassengerBaseFragment { + mLiveShadow.setVisibility(View.GONE); + } + ); + mLiveBtn.setOnLongClickListener(new View.OnLongClickListener() { @Override public boolean onLongClick(View v) { diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml index 0aa768d8c5..197be5155c 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml @@ -173,6 +173,7 @@ android:background="@drawable/bus_p_panel_cur_station_panel"> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt index 3abb1c96db..18412fbe52 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt @@ -15,7 +15,10 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.widget.RoundConstraintLayout -import kotlinx.android.synthetic.main.view_driver_monitor.view.* +import kotlinx.android.synthetic.main.view_driver_monitor.view.ivNormal +import kotlinx.android.synthetic.main.view_driver_monitor.view.liveProgressBar +import kotlinx.android.synthetic.main.view_driver_monitor.view.textureViewDriverMonitor +import kotlinx.android.synthetic.main.view_driver_monitor.view.tvLoadingHit /** * 乘客端查看当前车辆驾驶舱的司机监控View @@ -56,6 +59,8 @@ class DriverMonitorView : ) } + var liveListener: LiveListener? = null + constructor(context: Context?) : super(context) { initView(context) } @@ -124,6 +129,20 @@ class DriverMonitorView : textureViewDriverMonitor, carLiveCallBack ) + } ?: let { + //为空又怎么撸 + if (CallerTelematicManager.getServerToken().isNotEmpty()) { + Logger.d( + "${SceneConstant.M_HMI}$TAG", + "检查司机直播……isLived=$isLived 当前车辆SN=${CallerTelematicManager.getServerToken()} 不支持直播" + ) + CallerLogger.d( + "${SceneConstant.M_HMI}$TAG", + "检查司机直播……isLived=$isLived 当前车辆SN=${CallerTelematicManager.getServerToken()} 不支持直播" + ) + // 乘客屏幕连接上了司机屏,但是司机屏不在直播范围内,进行隐藏操作。 + liveListener?.onPlayError() + } } // TODO 测试用的 // MoGoAiCloudTrafficLive.viewDesignativeVehicleLive( @@ -186,4 +205,8 @@ class DriverMonitorView : } } + interface LiveListener { + fun onPlayError() + } + } \ No newline at end of file