From 687b27b13f4a3c302806d065ef02ad078941f185 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 18 Apr 2023 16:21:10 +0800 Subject: [PATCH 1/4] [2.15.0] reject the socket reconnect when loc change --- .../mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt index 584308b320..3de77349bc 100644 --- a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt +++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt @@ -55,7 +55,7 @@ class HttpDnsStartUp : AndroidStartup() { private var gotToken = false private var httpDnsSimpleLocation by Delegates.observable(getDefaultSimpleLocation()) { _, oldValue, newValue -> - if (oldValue.cityCode != newValue.cityCode) { + if (gotToken && oldValue.cityCode != newValue.cityCode) { reConnectSocket(oldValue.cityCode, newValue.cityCode) } } From ec38e4c6ebc35e960c4ae0b5ad95fbc1b617c93a Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 18 Apr 2023 16:49:21 +0800 Subject: [PATCH 2/4] [2.15.0]miss the vol --- .../mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt index 3de77349bc..ed097621c4 100644 --- a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt +++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt @@ -52,6 +52,7 @@ class HttpDnsStartUp : AndroidStartup() { private var context: Context? = null + @Volatile private var gotToken = false private var httpDnsSimpleLocation by Delegates.observable(getDefaultSimpleLocation()) { _, oldValue, newValue -> From 9800077f0853aec39cdc01beff9f50fbb02e6ac0 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Tue, 18 Apr 2023 16:55:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=8Cdev=5Fopt=5F2.15.0=E3=80=8D=201?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8D=E4=B9=98=E5=AE=A2=E5=B1=8Fpnc?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=A2=AB=E7=9B=B4=E6=92=AD=E9=81=AE=E6=8C=A1?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/bus_p_base_fragment.xml | 65 ++++++++++--------- .../hmi/ui/widget/DriverMonitorView.kt | 41 ++++++------ 2 files changed, 54 insertions(+), 52 deletions(-) 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 88e7cb8ee6..0aa768d8c5 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 @@ -1,6 +1,7 @@ @@ -8,9 +9,9 @@ android:id="@+id/mapBizView" android:layout_width="@dimen/dp_1860" android:layout_height="match_parent" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent"/> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" /> + android:layout_height="match_parent" /> - - + app:layout_constraintRight_toRightOf="parent" + app:roma_close="@drawable/roma_bus_p_bg_selector" + app:roma_open="@drawable/iv_roma_bus_passenger_press_bg" /> + + app:layout_constraintTop_toTopOf="@+id/bus_p_cur_station_name"> @@ -143,21 +137,20 @@ + android:progress="0" + android:progressDrawable="@drawable/bus_progress_bar_bg" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" /> - + app:yOffset="0dp" + tools:visibility="visible"> + android:layout_marginRight="@dimen/dp_40" + app:layout_constraintRight_toLeftOf="@+id/bus_p_route_panel" + app:layout_constraintTop_toTopOf="parent" /> + + \ No newline at end of file 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 4864257121..3abb1c96db 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 @@ -110,26 +110,27 @@ class DriverMonitorView : fun showLive() { if (!isLived) { -// sopShowDriverMap[CallerTelematicManager.getServerToken()]?.let { -// Logger.d( -// "${SceneConstant.M_HMI}$TAG", -// "检查司机直播……isLived=$isLived 当前车上的司机端SN=${sopShowDriverMap[CallerTelematicManager.getServerToken()]}" -// ) -// CallerLogger.d( -// "${SceneConstant.M_HMI}$TAG", -// "检查司机直播……isLived=$isLived 当前车上的司机端SN=${sopShowDriverMap[CallerTelematicManager.getServerToken()]}" -// ) -// MoGoAiCloudTrafficLive.viewDesignativeVehicleLive( -// it, -// textureViewDriverMonitor, -// carLiveCallBack -// ) -// } - MoGoAiCloudTrafficLive.viewDesignativeVehicleLive( - "F803EB2046PZD00164", - textureViewDriverMonitor, - carLiveCallBack - ) + sopShowDriverMap[CallerTelematicManager.getServerToken()]?.let { + Logger.d( + "${SceneConstant.M_HMI}$TAG", + "检查司机直播……isLived=$isLived 当前车上的司机端SN=${sopShowDriverMap[CallerTelematicManager.getServerToken()]}" + ) + CallerLogger.d( + "${SceneConstant.M_HMI}$TAG", + "检查司机直播……isLived=$isLived 当前车上的司机端SN=${sopShowDriverMap[CallerTelematicManager.getServerToken()]}" + ) + MoGoAiCloudTrafficLive.viewDesignativeVehicleLive( + it, + textureViewDriverMonitor, + carLiveCallBack + ) + } + // TODO 测试用的 +// MoGoAiCloudTrafficLive.viewDesignativeVehicleLive( +// "F803EB2046PZD00164", +// textureViewDriverMonitor, +// carLiveCallBack +// ) } } From 4f27ee71d330b0f15d5e626bf071babea9afbc99 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Tue, 18 Apr 2023 17:20:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=8Cdev=5Fopt=5F2.15.0=E3=80=8D=201?= =?UTF-8?q?=E3=80=81=E5=8A=9F=E8=83=BD=E8=8C=83=E5=9B=B4=EF=BC=9Abus?= =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E5=B1=8F=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=85=B3?= =?UTF-8?q?=EF=BC=9Bbus=E4=B9=98=E5=AE=A2=E5=B1=8F=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=B5=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 交互&逻辑：在司机屏运营面板增加开关，用于控制是否展示视频位： 开关开启时，有视频流的车辆持续常驻展示视频流，无视频流的车辆不展示（无占位）； 开关关闭时，无论是否有视频流，均不展示（无占位）；开关默认关闭 开关开启后，有视频流的展示位置如图所示常驻展示： --- .../ui/BusPassengerBaseFragment.java | 9 +++++++ .../main/res/layout/bus_p_base_fragment.xml | 1 + .../hmi/ui/widget/DriverMonitorView.kt | 25 ++++++++++++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) 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