From 687b27b13f4a3c302806d065ef02ad078941f185 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 18 Apr 2023 16:21:10 +0800 Subject: [PATCH 01/27] [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 02/27] [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 03/27] =?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 04/27] =?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 From ce97b3e33ea5e8406ce205b896a9cb599461e1f9 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 18 Apr 2023 17:23:54 +0800 Subject: [PATCH 05/27] =?UTF-8?q?[2.15.0]=20=E4=BF=AE=E6=94=B9=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt index be7e822a58..a421883ea4 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt @@ -52,7 +52,7 @@ class UpgradeManager : IDownload { fun downLoadPackage(context: Context, type: DownloadType, downloadKey: String, downloadUrl: String) { - CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "UpgradeManager downLoadPackage = " + downloadUrl.contains(".zip") + "----downloadKey = $downloadKey ---downloadUrl = $downloadUrl") + CallerLogger.d("$M_DEVA$TAG", "UpgradeManager downLoadPackage = " + downloadUrl.contains(".zip") + "---type =" + type + "----downloadKey = $downloadKey ---downloadUrl = $downloadUrl") types[downloadUrl] = type DownloadUtils.downLoad( context, From bd920c8d482daf5085d6ea8078c35dfa80863e55 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 18 Apr 2023 17:39:53 +0800 Subject: [PATCH 06/27] [2.15.0]add trace log of lineID change --- .../com/mogo/eagle/function/biz/v2x/road/LineUploadManager.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/LineUploadManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/LineUploadManager.kt index 27780b4702..bd49ec6ff4 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/LineUploadManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/LineUploadManager.kt @@ -2,13 +2,13 @@ package com.mogo.eagle.function.biz.v2x.road import android.content.Context import com.mogo.cloud.passport.MoGoAiCloudClientConfig -import com.mogo.commons.constants.HostConst.DATA_CENTER_HOST import com.mogo.commons.constants.HostConst.getEagleHost import com.mogo.eagle.core.data.v2x.LineUploadData import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.function.biz.v2x.V2XBizTrace import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable import io.reactivex.schedulers.Schedulers @@ -48,6 +48,7 @@ class LineUploadManager private constructor(context: Context) : IMoGoAutopilotSt override fun onAutopilotRouteLineId(lineId: Long) { super.onAutopilotRouteLineId(lineId) + V2XBizTrace.onAck("onAutopilotRouteLineId", "lineId: $lineId") if (lineId > 0) { uploadLine(lineId) } From a7b61aa124bc89e653ad0e50b2324efad8faf0c5 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Tue, 18 Apr 2023 20:58:19 +0800 Subject: [PATCH 07/27] =?UTF-8?q?=E3=80=8Cdev=5Fopt=5F2.15.0=E3=80=8D=201?= =?UTF-8?q?=E3=80=81=E5=AE=8C=E6=88=90bus=E5=8F=B8=E6=9C=BA=E5=B1=8F?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=85=B3=E6=8E=A7=E5=88=B6bus?= =?UTF-8?q?=E4=B9=98=E5=AE=A2=E5=B1=8F=E5=B1=95=E7=A4=BA=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E6=B5=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/BusPassengerBaseFragment.java | 33 +++++++++++++++++++ .../autopilot/telematic/TeleMsgHandler.kt | 5 +++ .../hmi/ui/setting/DebugSettingView.kt | 12 +++++++ .../main/res/layout/view_debug_setting.xml | 18 ++++++++-- .../data/multidisplay/TelematicConstant.kt | 1 + .../call/telematic/CallerTelematicManager.kt | 2 +- 6 files changed, 68 insertions(+), 3 deletions(-) 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 88fdfe533b..6de6ceb031 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 @@ -9,13 +9,17 @@ import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.core.widget.ContentLoadingProgressBar; import com.mogo.commons.mvp.IView; import com.mogo.commons.mvp.MvpFragment; import com.mogo.commons.mvp.Presenter; +import com.mogo.eagle.core.data.multidisplay.TelematicConstant; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; +import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener; +import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager; 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; @@ -44,6 +48,11 @@ public abstract class BusPassengerBaseFragment { + ThreadUtils.runOnUiThread { + CallerTelematicListenerManager.invokeReceivedMsg(TelematicConstant.CONTROL_PASSENGER_DRIVER_MONITOR,it.body) + } + } else -> { } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index d7173cbe6c..a6ff3ad01a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -45,6 +45,7 @@ import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.data.obu.MogoObuConst import com.mogo.eagle.core.data.obu.ObuStatusInfo import com.mogo.eagle.core.data.deva.report.ReportEntity +import com.mogo.eagle.core.data.multidisplay.TelematicConstant import com.mogo.eagle.core.function.api.autopilot.* import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsFuncConfigListener import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener @@ -581,6 +582,17 @@ internal class DebugSettingView @JvmOverloads constructor( } } + /** + * 控制乘客屏直播监控 + */ + tbControlPassengerDriverMonitor.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + CallerTelematicManager.sendMsgToAllClients(TelematicConstant.CONTROL_PASSENGER_DRIVER_MONITOR, "1".toByteArray()) + } else { + CallerTelematicManager.sendMsgToAllClients(TelematicConstant.CONTROL_PASSENGER_DRIVER_MONITOR, "0".toByteArray()) + } + } + //设置鹰眼本地参数配置监听 setEagleEyeConfigListener() //域控制器中心事件点击监听 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index 61166d3c1d..937c4e07c3 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -1355,8 +1355,8 @@ android:background="@drawable/setting_toggle_button_background" android:drawableEnd="@drawable/icon_right" android:padding="@dimen/dp_20" - android:textOff="HMI控制" - android:textOn="HMI控制" + android:textOff="打开HMI控制" + android:textOn="关闭HMI控制" android:textSize="@dimen/dp_24" /> + + Date: Wed, 19 Apr 2023 08:57:44 +0800 Subject: [PATCH 08/27] =?UTF-8?q?[2.15.0]=20=E4=BC=98=E5=8C=96UiThreadHand?= =?UTF-8?q?ler=E5=92=8CThreadUtils=E5=BE=80=E4=B8=BB=E7=BA=BF=E7=A8=8B?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=98=9F=E5=88=97=E6=B7=BB=E5=8A=A0=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E7=9A=84=E6=96=B9=E5=BC=8F=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E5=92=8C=E6=8E=92=E9=98=9F=E4=B8=A4=E7=A7=8D?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/launcher/lancet/ANRFix.kt | 130 +++++++++--------- .../hmi/ui/msgbox/DriverMsgBoxBubbleView.kt | 4 +- .../eagle/core/utilcode/util/ThreadUtils.java | 49 +++++-- .../core/utilcode/util/UiThreadHandler.java | 58 ++++++-- 4 files changed, 152 insertions(+), 89 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/lancet/ANRFix.kt b/app/src/main/java/com/mogo/launcher/lancet/ANRFix.kt index 746a875ee0..63ddc771a6 100644 --- a/app/src/main/java/com/mogo/launcher/lancet/ANRFix.kt +++ b/app/src/main/java/com/mogo/launcher/lancet/ANRFix.kt @@ -19,70 +19,70 @@ class ANRFix { companion object { - @JvmStatic - @TargetClass(value = "android.os.Handler", scope = ALL) - @TargetMethod(methodName = "post") - @ReplaceInvoke - fun handlerPostProxy(handler: Handler, action: Runnable): Boolean { - if (Looper.getMainLooper() != handler.looper) { - return handler.post(action) - } - val what = ObjectHashCodeUtils.getHashCodeIfNeed(action) - handler.removeMessages(what) - val msg = Message.obtain(handler, action) - msg.what = what - return handler.sendMessage(msg) - } - - @JvmStatic - @TargetClass(value = "android.os.Handler", scope = ALL) - @TargetMethod(methodName = "postDelayed") - @ReplaceInvoke - fun handlerPostDelayProxy(handler: Handler, action: Runnable, delayMillis: Long): Boolean { - if (Looper.getMainLooper() != handler.looper) { - return handler.postDelayed(action, delayMillis) - } - val what = ObjectHashCodeUtils.getHashCodeIfNeed(action) - handler.removeMessages(what) - val msg = Message.obtain(handler, action) - msg.what = what - return handler.sendMessageDelayed(msg, delayMillis) - } - - @JvmStatic - @TargetClass(value = "android.app.Activity", scope = ALL) - @TargetMethod(methodName = "post") - @ReplaceInvoke - fun runOnUiThreadOfActivityProxy(activity: Activity, action: Runnable) { - if (Looper.myLooper() != Looper.getMainLooper()) { - UiThreadHandler.post(action) - } else { - activity.runOnUiThread(action) - } - } - - @JvmStatic - @TargetClass(value = "android.view.View", scope = ALL) - @TargetMethod(methodName = "post") - @ReplaceInvoke - fun postOfViewProxy(view: View, action: Runnable): Boolean { - return if (Looper.myLooper() != Looper.getMainLooper()) { - UiThreadHandler.post(action) - } else { - view.post(action) - } - } - - @JvmStatic - @TargetClass(value = "android.view.View", scope = ALL) - @TargetMethod(methodName = "postDelayed") - @ReplaceInvoke - fun postDelayedOfViewProxy(view: View, action: Runnable, delayMillis: Long): Boolean { - return if (Looper.myLooper() != Looper.getMainLooper()) { - UiThreadHandler.postDelayed(action, delayMillis) - } else { - view.postDelayed(action, delayMillis) - } - } +// @JvmStatic +// @TargetClass(value = "android.os.Handler", scope = ALL) +// @TargetMethod(methodName = "post") +// @ReplaceInvoke +// fun handlerPostProxy(handler: Handler, action: Runnable): Boolean { +// if (Looper.getMainLooper() != handler.looper) { +// return handler.post(action) +// } +// val what = ObjectHashCodeUtils.getHashCodeIfNeed(action) +// handler.removeMessages(what) +// val msg = Message.obtain(handler, action) +// msg.what = what +// return handler.sendMessage(msg) +// } +// +// @JvmStatic +// @TargetClass(value = "android.os.Handler", scope = ALL) +// @TargetMethod(methodName = "postDelayed") +// @ReplaceInvoke +// fun handlerPostDelayProxy(handler: Handler, action: Runnable, delayMillis: Long): Boolean { +// if (Looper.getMainLooper() != handler.looper) { +// return handler.postDelayed(action, delayMillis) +// } +// val what = ObjectHashCodeUtils.getHashCodeIfNeed(action) +// handler.removeMessages(what) +// val msg = Message.obtain(handler, action) +// msg.what = what +// return handler.sendMessageDelayed(msg, delayMillis) +// } +// +// @JvmStatic +// @TargetClass(value = "android.app.Activity", scope = ALL) +// @TargetMethod(methodName = "post") +// @ReplaceInvoke +// fun runOnUiThreadOfActivityProxy(activity: Activity, action: Runnable) { +// if (Looper.myLooper() != Looper.getMainLooper()) { +// UiThreadHandler.post(action) +// } else { +// activity.runOnUiThread(action) +// } +// } +// +// @JvmStatic +// @TargetClass(value = "android.view.View", scope = ALL) +// @TargetMethod(methodName = "post") +// @ReplaceInvoke +// fun postOfViewProxy(view: View, action: Runnable): Boolean { +// return if (Looper.myLooper() != Looper.getMainLooper()) { +// UiThreadHandler.post(action) +// } else { +// view.post(action) +// } +// } +// +// @JvmStatic +// @TargetClass(value = "android.view.View", scope = ALL) +// @TargetMethod(methodName = "postDelayed") +// @ReplaceInvoke +// fun postDelayedOfViewProxy(view: View, action: Runnable, delayMillis: Long): Boolean { +// return if (Looper.myLooper() != Looper.getMainLooper()) { +// UiThreadHandler.postDelayed(action, delayMillis) +// } else { +// view.postDelayed(action, delayMillis) +// } +// } } } \ 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/msgbox/DriverMsgBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt index 0bf5097f02..28c772f1db 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt @@ -70,7 +70,7 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor( } override fun onDataChanged(category: MsgCategory, msgBoxBean: MsgBoxBean) { - UiThreadHandler.post { + UiThreadHandler.post({ when (category) { MsgCategory.NOTICE -> { MsgBoxConfig.noticeList.add(msgBoxBean) @@ -98,7 +98,7 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor( driverMsgBoxBubbleAdapter?.setData(dataList) } } - } + }, UiThreadHandler.MODE.QUEUE) } override fun onAttachedToWindow() { diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ThreadUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ThreadUtils.java index 42044644ee..171817dd7d 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ThreadUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ThreadUtils.java @@ -53,6 +53,18 @@ public final class ThreadUtils { private static Executor sDeliver; + public enum MODE { + /** + * 多次post同一个Runnable对象，只会执行最后一次 + */ + LATEST, + + /** + * 多次post，在主线程消息队列中排队执行 + */ + QUEUE + } + /** * Return whether the thread is the main thread. * @@ -63,23 +75,40 @@ public final class ThreadUtils { } public static void runOnUiThread(final Runnable r) { + runOnUiThread(r, MODE.LATEST); + } + + public static void runOnUiThread(final Runnable r, MODE mode) { if (Looper.myLooper() == Looper.getMainLooper()) { r.run(); } else { - int what = ObjectHashCodeUtils.getHashCodeIfNeed(r); - HANDLER.removeMessages(what); - Message msg = Message.obtain(HANDLER, r); - msg.what = what; - HANDLER.sendMessage(msg); + if (mode == MODE.LATEST) { + int what = ObjectHashCodeUtils.getHashCodeIfNeed(r); + HANDLER.removeMessages(what); + Message msg = Message.obtain(HANDLER, r); + msg.what = what; + HANDLER.sendMessage(msg); + } else { + HANDLER.post(r); + } } } public static void runOnUiThreadDelayed(final Runnable r, long delayMillis) { - int what = ObjectHashCodeUtils.getHashCodeIfNeed(r); - HANDLER.removeMessages(what); - Message msg = Message.obtain(HANDLER, r); - msg.what = what; - HANDLER.sendMessageDelayed(msg, delayMillis); + runOnUiThreadDelayed(r, delayMillis, MODE.LATEST); + } + + public static void runOnUiThreadDelayed(final Runnable r, long delayMillis, MODE mode) { + if (mode == MODE.LATEST) { + int what = ObjectHashCodeUtils.getHashCodeIfNeed(r); + HANDLER.removeMessages(what); + Message msg = Message.obtain(HANDLER, r); + msg.what = what; + HANDLER.sendMessageDelayed(msg, delayMillis); + } else { + HANDLER.postDelayed(r, delayMillis); + } + } /** diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/UiThreadHandler.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/UiThreadHandler.java index a8fc918cda..e4d3f8803a 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/UiThreadHandler.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/UiThreadHandler.java @@ -10,24 +10,58 @@ public class UiThreadHandler { private UiThreadHandler() { } + public enum MODE { + /** + * 多次post同一个Runnable对象，只会执行最后一次 + */ + LATEST, + + /** + * 多次post，在主线程消息队列中排队执行 + */ + QUEUE + } + public static boolean post( Runnable r ) { - int what = ObjectHashCodeUtils.getHashCodeIfNeed(r); - sUiHandler.removeMessages(what); - Message msg = Message.obtain(sUiHandler, r); - msg.what = what; - return sUiHandler.sendMessage(msg); + return post(r, MODE.LATEST); + } + + public static boolean post(Runnable r, MODE mode) { + if (mode == MODE.LATEST) { + int what = ObjectHashCodeUtils.getHashCodeIfNeed(r); + sUiHandler.removeMessages(what); + Message msg = Message.obtain(sUiHandler, r); + msg.what = what; + return sUiHandler.sendMessage(msg); + } + return sUiHandler.post(r); } public static boolean postDelayed( Runnable r, long delayMillis ) { - int what = ObjectHashCodeUtils.getHashCodeIfNeed(r); - sUiHandler.removeMessages(what); - Message msg = Message.obtain(sUiHandler, r); - msg.what = what; - return sUiHandler.sendMessageDelayed(msg, delayMillis); + return postDelayed(r, delayMillis, MODE.LATEST); + } + + public static boolean postDelayed( Runnable r, long delayMillis, MODE mode ) { + if (mode == MODE.LATEST) { + int what = ObjectHashCodeUtils.getHashCodeIfNeed(r); + sUiHandler.removeMessages(what); + Message msg = Message.obtain(sUiHandler, r); + msg.what = what; + return sUiHandler.sendMessageDelayed(msg, delayMillis); + } + return sUiHandler.postDelayed(r, delayMillis); } public static void removeCallbacks( Runnable r ) { - int what = ObjectHashCodeUtils.getHashCodeIfNeed(r); - sUiHandler.removeMessages(what); + removeCallbacks(r, MODE.LATEST); + } + + public static void removeCallbacks( Runnable r, MODE mode ) { + if (mode == MODE.LATEST) { + int what = ObjectHashCodeUtils.getHashCodeIfNeed(r); + sUiHandler.removeMessages(what); + } else { + sUiHandler.removeCallbacks(r); + } } } \ No newline at end of file From 700f58a2561e7a69c77461462c24bf8e13cfe48a Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 19 Apr 2023 09:03:42 +0800 Subject: [PATCH 09/27] =?UTF-8?q?[2.15.0][V2N]=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt index 1ab7cca965..ac372aa987 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt @@ -18,6 +18,7 @@ import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager.saveMsgBox import com.mogo.eagle.core.utilcode.mogo.* import com.mogo.eagle.core.utilcode.mogo.logger.* import com.mogo.eagle.core.utilcode.util.* +import com.mogo.eagle.function.biz.v2x.V2XBizTrace import com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.airoad.* import com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.airoad.AiRoadMarker.Marker import mogo.telematics.pad.MessagePad.Header @@ -199,6 +200,14 @@ internal object V2NIdentifyDrawer { override fun onAutopilotIdentifyDataUpdate(trafficData: List?) { super.onAutopilotIdentifyDataUpdate(trafficData) + try { + if (trafficData != null) { + V2XBizTrace.onAck("onAutopilotIdentifyDataUpdate", trafficData) + } + } catch (t: Throwable) { + t.printStackTrace() + } + val shiGong = trafficData?.filter { it.type == 501 || it.type == 502 } Logger.d(TAG, "--- onAutopilotIdentifyDataUpdate -- : trafficData: ${ trafficData?.joinToString(",") }") if (shiGong != null && shiGong.isNotEmpty()) { @@ -212,6 +221,13 @@ internal object V2NIdentifyDrawer { override fun onAutopilotV2nCongestionEvent(header: Header, rsi: RSI_PB) { super.onAutopilotV2nCongestionEvent(header, rsi) + + try { + V2XBizTrace.onAck("onAutopilotV2nCongestionEvent", rsi) + } catch (t: Throwable) { + t.printStackTrace() + } + rsi.rsiFrame?.rtes?.rteDataList?.filter { it.eventType == 102 }?.takeIf { From f29edcdb3ac535d60b7bfdf05d3f01983f48fe74 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Wed, 19 Apr 2023 11:38:40 +0800 Subject: [PATCH 10/27] =?UTF-8?q?=E3=80=8Cdev=5Fopt=5F2.15.0=E3=80=8D=201?= =?UTF-8?q?=E3=80=81=E5=BC=80=E5=85=B3=E5=85=B3=E9=97=AD=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E8=AE=BA=E6=98=AF=E5=90=A6=E6=9C=89=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E6=B5=81=EF=BC=8C=E5=9D=87=E4=B8=8D=E5=B1=95=E7=A4=BA=EF=BC=88?= =?UTF-8?q?=E6=97=A0=E5=8D=A0=E4=BD=8D=EF=BC=89=EF=BC=9B=E5=BC=80=E5=85=B3?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/bus_p_base_fragment.xml | 1 + 1 file changed, 1 insertion(+) 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 197be5155c..3a62a33c73 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 @@ -156,6 +156,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/bus_p_curent_station_panel_margin_left" + android:visibility="gone" app:bgColor="@android:color/transparent" app:blurRadius="@dimen/dp_30" app:layout_constraintBottom_toBottomOf="@+id/arrive_station_shadow" From 4ae4bd7ecb9997055d4422761b85366608626046 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 19 Apr 2023 12:36:03 +0800 Subject: [PATCH 11/27] [2.15.0] fix bug of roma click and add trace log --- .../core/function/hmi/ui/widget/RomaPassengerView.kt | 9 +++++++++ .../eagle/core/function/hmi/ui/widget/RomaView.kt | 8 ++++++++ .../business/ai/AiCloudIdentifyDataManager.kt | 12 ++++++------ .../business/ai/net/AiCloudIdentifyNetWorkModel.kt | 1 + .../business/ai/net/IAiCloudIdentifyApiService.kt | 1 + 5 files changed, 25 insertions(+), 6 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt index 91b4614747..03b0bbbe56 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt @@ -25,6 +25,9 @@ class RomaPassengerView @JvmOverloads constructor( @Volatile private var romaMode = false + @Volatile + private var click = false + private val openRes: Int private val normalRes: Int @@ -36,10 +39,15 @@ class RomaPassengerView @JvmOverloads constructor( normalRes = a.getResourceId(R.styleable.RomaPassengerView_roma_close, 0) a.recycle() setOnClickListener { + if(!click){ + return@setOnClickListener + } romaMode = !romaMode romaTrigger(romaMode) { mode -> + click = true romaMode = mode } + click = false } } @@ -65,6 +73,7 @@ class RomaPassengerView @JvmOverloads constructor( } override fun romaStatus(status: Boolean) { + click = true if (status) { romaMode = true if (openRes != 0) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaView.kt index b4b5867f90..51ab0766d8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaView.kt @@ -24,9 +24,15 @@ class RomaView @JvmOverloads constructor( @Volatile private var romaMode = false + @Volatile + private var click = false + init { LayoutInflater.from(context).inflate(R.layout.view_roma_bg, this, true) setOnClickListener { + if(!click){ + return@setOnClickListener + } romaMode = !romaMode // 司机屏发送事件给乘客屏 if (romaMode) { @@ -40,6 +46,7 @@ class RomaView @JvmOverloads constructor( "1".toByteArray() ) } + click = false } } @@ -49,6 +56,7 @@ class RomaView @JvmOverloads constructor( } override fun onReceivedMsg(type: Int, byteArray: ByteArray) { + click = true when(type){ TelematicConstant.OPEN_ROMA_STATUS -> { when (String(byteArray)) { diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt index 410ef494da..06a98493d3 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt @@ -128,17 +128,14 @@ class AiCloudIdentifyDataManager : IMogoMapListener, IReceivedMsgListener, private fun openRoma() { if (!MogoMapUIController.getInstance().currentMapVisualAngle.isRoma) { - requestRangeOfIdentify(true) updateLongSightLevel(true) + requestRangeOfIdentify(true) } } private fun closeRoma(manual: Boolean = true) { - if (!showAiCloud.get()) { - return - } - requestRangeOfIdentify(false) updateLongSightLevel(false) + requestRangeOfIdentify(false) MapIdentifySubscriber.instance.clearAiCloudRoma() // 主动关闭roma，回到中景视角 if (manual) { @@ -157,6 +154,7 @@ class AiCloudIdentifyDataManager : IMogoMapListener, IReceivedMsgListener, // CallerMapRomaListener.invokeMapRoma(false) // sendMsgToServer(TelematicConstant.OPEN_ROMA_STATUS, "4".toByteArray()) // } + MapBizTrace.log(TAG,"开启请求，data:$dataReceive") aiCloudIdentifyNetWorkModel.requestIdentifyRange(dataReceive, serverSn, { MapBizTrace.log( TAG, @@ -176,6 +174,8 @@ class AiCloudIdentifyDataManager : IMogoMapListener, IReceivedMsgListener, TAG, "requestIdentifyRange error : $it , startRange:$START_METRE, endRange:$END_METRE, dataReceive:$dataReceive" ) + CallerMapRomaListener.invokeMapRoma(false) + updateLongSightLevel(false) if(DebugConfig.isDebug()){ ToastUtils.showShort("漫游请求异常，msg:$it") } @@ -194,8 +194,8 @@ class AiCloudIdentifyDataManager : IMogoMapListener, IReceivedMsgListener, else -> { if (showAiCloud.get()) { MapBizTrace.log(TAG, "onMapVisualAngleChanged, invoke close roma") - closeRoma(false) showAiCloud.set(false) + closeRoma(false) FunctionBuildConfig.isDrawIdentifyData = true } } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt index 57f6e064f3..dffd5a9898 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt @@ -19,6 +19,7 @@ class AiCloudIdentifyNetWorkModel private constructor(){ } private fun getNetWorkApi(baseUrl: String = getEagleHost()): IAiCloudIdentifyApiService { +// private fun getNetWorkApi(baseUrl: String = "http://dzt-qa-city.zhidaozhixing.com/"): IAiCloudIdentifyApiService { //todo 2023/4/19 衡阳临时测试 return MoGoRetrofitFactory.getInstanceNoCallAdapter(baseUrl) .create(IAiCloudIdentifyApiService::class.java) } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/IAiCloudIdentifyApiService.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/IAiCloudIdentifyApiService.kt index 2a88126598..f26f8494f1 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/IAiCloudIdentifyApiService.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/IAiCloudIdentifyApiService.kt @@ -10,5 +10,6 @@ interface IAiCloudIdentifyApiService { @Headers("Content-type:application/json;charset=UTF-8") @POST("eagle-eye-dns/yycp-c-v2x-service/dataFusion/remoteDrivingSet") // @POST("yycp-data-center-service1/remoteDrivingSet") +// @POST("yycp-c-v2x-service/dataFusion/remoteDrivingSet") //todo 2023/4/19 衡阳临时测试 suspend fun identifyRange(@Body map: MutableMap): BaseResponse } \ No newline at end of file From 502b974050b896d95f30c49f705c5787f765e870 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 19 Apr 2023 12:44:35 +0800 Subject: [PATCH 12/27] [2.15.0]fixbug --- .../mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt index 03b0bbbe56..2ecc6dc2dc 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt @@ -26,7 +26,7 @@ class RomaPassengerView @JvmOverloads constructor( private var romaMode = false @Volatile - private var click = false + private var click = true private val openRes: Int private val normalRes: Int From 65fddb1af7f791d35b84671e3f2b72c240a6a802 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 19 Apr 2023 12:51:02 +0800 Subject: [PATCH 13/27] [2.15.0]fixbug --- .../eagle/core/function/hmi/ui/widget/RomaPassengerView.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt index 2ecc6dc2dc..abec42e15b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt @@ -42,12 +42,13 @@ class RomaPassengerView @JvmOverloads constructor( if(!click){ return@setOnClickListener } + click = false romaMode = !romaMode romaTrigger(romaMode) { mode -> click = true romaMode = mode } - click = false + } } From 44560f8978fccae1fafa18acb5ac6df7915bf067 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 19 Apr 2023 12:54:44 +0800 Subject: [PATCH 14/27] [2.15.0]code opt --- .../com/mogo/eagle/core/function/hmi/ui/widget/RomaView.kt | 2 +- .../core/function/business/ai/AiCloudIdentifyDataManager.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaView.kt index 51ab0766d8..38e830b0b7 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaView.kt @@ -33,6 +33,7 @@ class RomaView @JvmOverloads constructor( if(!click){ return@setOnClickListener } + click = false romaMode = !romaMode // 司机屏发送事件给乘客屏 if (romaMode) { @@ -46,7 +47,6 @@ class RomaView @JvmOverloads constructor( "1".toByteArray() ) } - click = false } } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt index 06a98493d3..30031b6f68 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt @@ -174,8 +174,9 @@ class AiCloudIdentifyDataManager : IMogoMapListener, IReceivedMsgListener, TAG, "requestIdentifyRange error : $it , startRange:$START_METRE, endRange:$END_METRE, dataReceive:$dataReceive" ) - CallerMapRomaListener.invokeMapRoma(false) updateLongSightLevel(false) + CallerMapRomaListener.invokeMapRoma(false) + sendMsgToServer(TelematicConstant.OPEN_ROMA_STATUS, "4".toByteArray()) if(DebugConfig.isDebug()){ ToastUtils.showShort("漫游请求异常，msg:$it") } From 7785fff66dc63a307063d14754fa050dee56a117 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 19 Apr 2023 14:43:26 +0800 Subject: [PATCH 15/27] =?UTF-8?q?[dev=5Frobotaxi-d=5F230412=5F2.15.0]?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=B0=83=E6=95=B4=E6=B6=88=E6=81=AF=E7=9B=92?= =?UTF-8?q?=E5=AD=90=E9=98=9F=E5=88=97=E5=A4=84=E7=90=86=E6=96=B9=E5=BC=8F?= =?UTF-8?q?+=E6=8E=A5=E7=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/msgbox/BusPassengerMsgBoxBubbleView.kt | 4 +- .../hmi/ui/msgbox/DriverMsgBoxListView.kt | 4 +- .../function/hmi/ui/msgbox/MBoxBubbleView.kt | 4 +- .../hmi/ui/msgbox/MMsgBoxBubbleView.kt | 4 +- .../function/hmi/ui/msgbox/MMsgBoxListView.kt | 4 +- .../ui/msgbox/PassengerMsgBoxBubbleView.kt | 4 +- .../hmi/ui/msgbox/PassengerMsgBoxListView.kt | 4 +- .../function/hmi/ui/vehicle/TakeOverView.kt | 70 ++++++++++++------- 8 files changed, 60 insertions(+), 38 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/BusPassengerMsgBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/BusPassengerMsgBoxBubbleView.kt index f88d023f2d..e867ee032b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/BusPassengerMsgBoxBubbleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/BusPassengerMsgBoxBubbleView.kt @@ -52,7 +52,7 @@ class BusPassengerMsgBoxBubbleView @JvmOverloads constructor( } override fun onDataChanged(category: MsgCategory, msgBoxList: MsgBoxBean){ - UiThreadHandler.post{ + UiThreadHandler.post({ if(category == MsgCategory.NOTICE){ if(msgBoxList.type == MsgBoxType.NOTICE || msgBoxList.type == MsgBoxType.V2X || msgBoxList.type == MsgBoxType.OBU || msgBoxList.type == MsgBoxType.OPERATION){ @@ -65,7 +65,7 @@ class BusPassengerMsgBoxBubbleView @JvmOverloads constructor( } } } - } + },UiThreadHandler.MODE.QUEUE) } override fun onAttachedToWindow() { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt index 75e5e6f583..88e872b9c5 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt @@ -171,7 +171,7 @@ class DriverMsgBoxListView @JvmOverloads constructor( } override fun onDataChanged(category: MsgCategory, msgBoxList: MsgBoxBean) { - UiThreadHandler.post{ + UiThreadHandler.post({ when (category) { MsgCategory.NOTICE -> { noticeList?.add(0,msgBoxList) @@ -192,7 +192,7 @@ class DriverMsgBoxListView @JvmOverloads constructor( } } } - } + },UiThreadHandler.MODE.QUEUE) } override fun onAttachedToWindow() { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MBoxBubbleView.kt index 42f7fa8178..37e6065841 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MBoxBubbleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MBoxBubbleView.kt @@ -55,7 +55,7 @@ class MBoxBubbleView @JvmOverloads constructor( } override fun onDataChanged(category: MsgCategory, msgBoxList: MsgBoxBean) { - UiThreadHandler.post { + UiThreadHandler.post({ if(category == MsgCategory.NOTICE){ if(msgBoxList.type == MsgBoxType.NOTICE || msgBoxList.type == MsgBoxType.V2X || msgBoxList.type == MsgBoxType.OBU || msgBoxList.type == MsgBoxType.OPERATION){ @@ -68,7 +68,7 @@ class MBoxBubbleView @JvmOverloads constructor( } } } - } + },UiThreadHandler.MODE.QUEUE) } override fun onAttachedToWindow() { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxBubbleView.kt index e6daa2e3ed..67526ebbdb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxBubbleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxBubbleView.kt @@ -49,14 +49,14 @@ class MMsgBoxBubbleView @JvmOverloads constructor( } override fun onDataChanged(category: MsgCategory, msgBoxList: MsgBoxBean) { - UiThreadHandler.post { + UiThreadHandler.post({ if(category == MsgCategory.NOTICE){ if(msgBoxList.type == MsgBoxType.NOTICE || msgBoxList.type == MsgBoxType.V2X || msgBoxList.type == MsgBoxType.OBU || msgBoxList.type == MsgBoxType.OPERATION){ update(msgBoxList) } } - } + },UiThreadHandler.MODE.QUEUE) } private fun update(msgBoxList: MsgBoxBean){ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxListView.kt index 726a6dae6d..69f68eb5eb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxListView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxListView.kt @@ -56,7 +56,7 @@ class MMsgBoxListView @JvmOverloads constructor( } override fun onDataChanged(category: MsgCategory, msgBoxList: MsgBoxBean) { - UiThreadHandler.post{ + UiThreadHandler.post({ if(category == MsgCategory.NOTICE){ if(msgBoxList.type == MsgBoxType.NOTICE || msgBoxList.type == MsgBoxType.V2X || msgBoxList.type == MsgBoxType.OBU || msgBoxList.type == MsgBoxType.OPERATION){ @@ -66,7 +66,7 @@ class MMsgBoxListView @JvmOverloads constructor( } } } - } + },UiThreadHandler.MODE.QUEUE) } override fun onAttachedToWindow() { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxBubbleView.kt index 0ed1eb0622..fc0db9c448 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxBubbleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxBubbleView.kt @@ -57,7 +57,7 @@ class PassengerMsgBoxBubbleView @JvmOverloads constructor( } override fun onDataChanged(category: MsgCategory, msgBoxList: MsgBoxBean) { - UiThreadHandler.post { + UiThreadHandler.post({ if(category == MsgCategory.NOTICE){ if(msgBoxList.type == MsgBoxType.NOTICE || msgBoxList.type == MsgBoxType.V2X || msgBoxList.type == MsgBoxType.OBU){ @@ -70,7 +70,7 @@ class PassengerMsgBoxBubbleView @JvmOverloads constructor( } } } - } + },UiThreadHandler.MODE.QUEUE) } override fun onAttachedToWindow() { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxListView.kt index cc8418f8d2..fcda7aec3e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxListView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxListView.kt @@ -60,7 +60,7 @@ class PassengerMsgBoxListView @JvmOverloads constructor( } override fun onDataChanged(category: MsgCategory, msgBoxList: MsgBoxBean) { - UiThreadHandler.post{ + UiThreadHandler.post({ if(category == MsgCategory.NOTICE){ if(msgBoxList.type == MsgBoxType.NOTICE || msgBoxList.type == MsgBoxType.V2X || msgBoxList.type == MsgBoxType.OBU){ @@ -70,7 +70,7 @@ class PassengerMsgBoxListView @JvmOverloads constructor( } } } - } + },UiThreadHandler.MODE.QUEUE) } override fun onAttachedToWindow() { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt index bfc61ae6ef..736037efd9 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt @@ -5,6 +5,7 @@ import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.enums.EventTypeEnumNew import com.mogo.eagle.core.data.msgbox.MsgBoxBean @@ -31,6 +32,10 @@ class TakeOverView @JvmOverloads constructor( const val TAG = "TakeOverView" } + private var autopilotStatus: Int = 0 //自动驾驶状态 0代表不可自动驾驶,1代表可自动驾驶,2代表自动驾驶中,7:平行驾驶中 + private var isParallel: Boolean = false //是否是平行驾驶 + + init { LayoutInflater.from(context).inflate(R.layout.view_take_over, this, true) } @@ -42,6 +47,20 @@ class TakeOverView @JvmOverloads constructor( CallerAutoPilotStatusListenerManager.addListener(TAG, this) } + /** + * 自动驾驶状态信息 + * + * @param autoPilotStatusInfo 状态信息 + */ + override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) { + autopilotStatus = autoPilotStatusInfo.state + if(autoPilotStatusInfo.state == 7){ + isParallel = true + }else if(autoPilotStatusInfo.state == 0 || autoPilotStatusInfo.state == 1){ + isParallel = false + } + } + /** * 工控机监控节点上报 */ @@ -84,38 +103,41 @@ class TakeOverView @JvmOverloads constructor( takeOver = false visibility = View.GONE } - },isFromObu = false - ) + } + ,isFromObu = false) } //弱网 MogoReport.Code.Error.EMAP.EPARALLEL_AICLOUD_NETWORK_WEAK, MogoReport.Code.Error.EMAP.EPARALLEL_AICLOUD_CONNECTION_ERROR -> { - CallerHmiManager.warningV2X( - EventTypeEnumNew.NETWORK_WEAK_EVENT.poiType, - EventTypeEnumNew.NETWORK_WEAK_EVENT.content, - EventTypeEnumNew.NETWORK_WEAK_EVENT.tts, - object : IMoGoWarningStatusListener { - override fun onShow() { - takeOver = true - visibility = View.VISIBLE - //加入消息盒子 - saveMsgBox( - MsgBoxBean( - MsgBoxType.V2X, V2XMsg( - EventTypeEnumNew.NETWORK_WEAK_EVENT.poiType, - EventTypeEnumNew.NETWORK_WEAK_EVENT.content, - EventTypeEnumNew.NETWORK_WEAK_EVENT.tts + //如果是平行驾驶状态下，提示弱网接管 + if(isParallel){ + CallerHmiManager.warningV2X( + EventTypeEnumNew.NETWORK_WEAK_EVENT.poiType, + EventTypeEnumNew.NETWORK_WEAK_EVENT.content, + EventTypeEnumNew.NETWORK_WEAK_EVENT.tts, + object : IMoGoWarningStatusListener { + override fun onShow() { + takeOver = true + visibility = View.VISIBLE + //加入消息盒子 + saveMsgBox( + MsgBoxBean( + MsgBoxType.V2X, V2XMsg( + EventTypeEnumNew.NETWORK_WEAK_EVENT.poiType, + EventTypeEnumNew.NETWORK_WEAK_EVENT.content, + EventTypeEnumNew.NETWORK_WEAK_EVENT.tts + ) ) ) - ) - } + } - override fun onDismiss() { - takeOver = false - visibility = View.GONE + override fun onDismiss() { + takeOver = false + visibility = View.GONE + } } - },isFromObu = false - ) + ,isFromObu = false) + } } } } From 7578d0943486fac8c80c099904fad34a5d79db0a Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 19 Apr 2023 14:48:04 +0800 Subject: [PATCH 16/27] [2.15.0]fixbug of listener lineid --- .../call/autopilot/CallerAutoPilotStatusListenerManager.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt index 34facf277a..e86ce263b1 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt @@ -27,16 +27,12 @@ object CallerAutoPilotStatusListenerManager : CallerBase = - ConcurrentHashMap() - @Volatile private var autoPilotMessageCode: String = "" From 1d0a0dfa60e72e24bcdabedefa826b3936506020 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 19 Apr 2023 14:57:14 +0800 Subject: [PATCH 17/27] =?UTF-8?q?[2.15.0][Opt]=E5=A2=9E=E5=8A=A0=E9=AB=98?= =?UTF-8?q?=E7=B2=BE=E5=9C=B0=E5=9B=BE=E7=BC=93=E5=AD=98=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt | 1 + .../mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt index 1256f601a1..e7706741cc 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt @@ -143,6 +143,7 @@ class SystemVersionView @JvmOverloads constructor( ToastUtils.showShort(resources.getString(R.string.location_try_again)) } else {// 拿到了高精的经纬度 val dialog = OfflineMapDialog(context) + CallerLogger.i("$M_HMI$$TAG", "location lon is:${location?.longitude}, lat is:${location?.latitude}") dialog.location = location dialog.show() } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index 06e1dd1641..766a18c135 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -1090,6 +1090,7 @@ public class AMapViewWrapper implements IMogoMapView, public void cacheHDDataByCity(IHdCacheListener listener, MogoLocation location) { if (mMapView.getMapAutoViewHelper() != null) { hdCacheListener = listener; + CallerLogger.INSTANCE.i(M_MAP + TAG, "location lon is:" + location.getLongitude() + ",lat is:" + location.getLatitude()); mMapView.getMapAutoViewHelper().cacheHDDataByCityByLonLat(location.getLongitude(), location.getLatitude(), new OnHdDataDownByCityListener() { @Override public void onMapHDDataCacheProgressByCity(int cityId, double progress) { @@ -1128,6 +1129,7 @@ public class AMapViewWrapper implements IMogoMapView, public boolean isCityDataCached() { if (mMapView.getMapAutoViewHelper() != null) { String gdCityCode = GDLocationClient.getInstance(getContext()).getLastCityCode(); + CallerLogger.INSTANCE.i(M_MAP + TAG, "gdCityCode is:" + gdCityCode); Integer id = HDMapUtils.getHDCityCode(gdCityCode); if (id != null) { List cityInfoList = mMapView.getMapAutoViewHelper().getAllCityCode(); From 539644a499b0a21064c23852f6d85616101c9b04 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 19 Apr 2023 15:15:30 +0800 Subject: [PATCH 18/27] [2.15.0]reset test env to verify roma --- .../function/business/ai/net/AiCloudIdentifyNetWorkModel.kt | 4 ++-- .../function/business/ai/net/IAiCloudIdentifyApiService.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt index dffd5a9898..41181c26be 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt @@ -18,8 +18,8 @@ class AiCloudIdentifyNetWorkModel private constructor(){ } } - private fun getNetWorkApi(baseUrl: String = getEagleHost()): IAiCloudIdentifyApiService { -// private fun getNetWorkApi(baseUrl: String = "http://dzt-qa-city.zhidaozhixing.com/"): IAiCloudIdentifyApiService { //todo 2023/4/19 衡阳临时测试 +// private fun getNetWorkApi(baseUrl: String = getEagleHost()): IAiCloudIdentifyApiService { + private fun getNetWorkApi(baseUrl: String = "http://dzt-qa-city.zhidaozhixing.com/"): IAiCloudIdentifyApiService { //todo 2023/4/19 衡阳临时测试 return MoGoRetrofitFactory.getInstanceNoCallAdapter(baseUrl) .create(IAiCloudIdentifyApiService::class.java) } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/IAiCloudIdentifyApiService.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/IAiCloudIdentifyApiService.kt index f26f8494f1..111ff9435d 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/IAiCloudIdentifyApiService.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/IAiCloudIdentifyApiService.kt @@ -8,8 +8,8 @@ import retrofit2.http.POST interface IAiCloudIdentifyApiService { @Headers("Content-type:application/json;charset=UTF-8") - @POST("eagle-eye-dns/yycp-c-v2x-service/dataFusion/remoteDrivingSet") +// @POST("eagle-eye-dns/yycp-c-v2x-service/dataFusion/remoteDrivingSet") // @POST("yycp-data-center-service1/remoteDrivingSet") -// @POST("yycp-c-v2x-service/dataFusion/remoteDrivingSet") //todo 2023/4/19 衡阳临时测试 + @POST("yycp-c-v2x-service/dataFusion/remoteDrivingSet") //todo 2023/4/19 衡阳临时测试 suspend fun identifyRange(@Body map: MutableMap): BaseResponse } \ No newline at end of file From 124e21f6019ff7c02358043f0ab3306f7fa80991 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 19 Apr 2023 15:26:56 +0800 Subject: [PATCH 19/27] =?UTF-8?q?[2.15.0]=20=E6=B7=BB=E5=8A=A0=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E9=94=99=E8=AF=AF=E7=9A=84=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upgrade/UpgradeAppNetWorkManager.kt | 2 +- .../upgrade/UpgradeManager.kt | 18 +++++++++++++++--- .../breakpoint/callback/DownloadCallBack.java | 6 ++++++ .../breakpoint/services/DownloadService.java | 8 ++++++++ .../breakpoint/thread/DownloadTask.java | 5 +++++ .../breakpoint/thread/DownloadThread.java | 2 ++ 6 files changed, 37 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt index 75af486bdf..38ca984932 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt @@ -60,7 +60,7 @@ class UpgradeAppNetWorkManager private constructor() { provider?.recordUpgradeRecord(sn ?: "", macAddress, type, FunctionBuildConfig.isSupportPatchUpgrade) provider?.recordUpgradeRequestStart() val info = mUpgradeApiService.getUpgradeInfo(requestBody) - SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.APP_UPGRADE_CONTENT, if (info.result != null) GsonUtils.toJson(info) + "--mac:$macAddress --type:$type --sn:$sn --versionName:$versionName" else "info.result == null --mac:$macAddress --type:$type --sn:$sn --versionName:$versionName") + SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.APP_UPGRADE_CONTENT, if (info.result != null) GsonUtils.toJson(info) + "--mac:$macAddress --type:$type --sn:$sn --versionName:$versionName" else "info.result == null --mac:$macAddress --type:$type --sn:$sn --versionName:$versionName --versionCode:$versionCode") if (info.result != null) { provider?.recordUpgradeRequestSuccess(GsonUtils.toJson(info)) doUpgrade(info) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt index a421883ea4..1f7ab7769b 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt @@ -2,6 +2,7 @@ package com.zhjt.mogo_core_function_devatools.upgrade import android.content.Context import android.content.pm.PackageInstaller +import android.util.Log import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.function.api.upgrade.IMoGoUpgradeProvider import com.mogo.eagle.core.function.call.base.CallerBase @@ -229,10 +230,17 @@ class UpgradeManager : IDownload { CallerDevaToolsUpgradeListenerManager.addListener( TAG, object : IMogoDevaToolsUpgradeListener { - override fun onStart(url: String?) {} - override fun onPause(url: String?) {} + override fun onStart(url: String?) { + CallerLogger.d("$M_DEVA$TAG", "updateUpgradeProgress onStart ----> ") + } + override fun onPause(url: String?) { + CallerLogger.d("$M_DEVA$TAG", "updateUpgradeProgress onPause ----> ") + } override fun onProgress(url: String?, length: Int) { - updateStatusBarDownloadView(true, "download", length) +// CallerLogger.d("$M_DEVA$TAG", "updateUpgradeProgress onPause ----> length = $length") + if (length in 1..99) { + updateStatusBarDownloadView(true, "download", length) + } } override fun onFinished(url: String?, localPath: String) { @@ -242,6 +250,10 @@ class UpgradeManager : IDownload { } override fun onError(url: String?, errorMsg: String?) { + CallerLogger.d("$M_DEVA$TAG", "updateUpgradeProgress errorMsg = $errorMsg") + Log.e(TAG, "updateUpgradeProgress errorMsg = $errorMsg") + //出错后，去掉下载进度ui，提示检查网络 + updateStatusBarDownloadView(false, "download", 0) } }) } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/callback/DownloadCallBack.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/callback/DownloadCallBack.java index 0bda622268..31ada1d8f5 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/callback/DownloadCallBack.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/callback/DownloadCallBack.java @@ -31,4 +31,10 @@ public interface DownloadCallBack { * @param localPath */ void threadDownLoadFinished(String url, ThreadBean threadBean, String localPath); + + /** + * 下载错误 + * @param msg + */ + void errorCallBack(String url, String msg); } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/services/DownloadService.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/services/DownloadService.java index 9a11b686d8..1f5832abe5 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/services/DownloadService.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/services/DownloadService.java @@ -161,6 +161,14 @@ public class DownloadService implements InitThread.InitCallBack, DownloadCallBac } } + @Override + public void errorCallBack(String url, String msg) { + IDownload iDownload = callBacks.get(url); + if (iDownload != null) { + iDownload.onError(url, msg); + } + } + @Override public void onConnected(NetworkUtils.NetworkType networkType) { //网络连接已连接 diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadTask.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadTask.java index 5e2a0280ba..70a8cc23ed 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadTask.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadTask.java @@ -153,6 +153,11 @@ public class DownloadTask implements DownloadCallBack { } } + @Override + public void errorCallBack(String url, String msg) { + UiThreadHandler.post(() -> downloadCallBack.errorCallBack(url, msg)); + } + public FileBean getFileBean() { return fileBean; } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java index d233fdbc73..fab591c394 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java @@ -82,6 +82,8 @@ public class DownloadThread extends Thread { DownloadData downloadData = new DownloadData(); downloadData.setUrl(fileBean.getUrl()); downloadData.setMsg(e.getMessage()); + UiThreadHandler.post(() -> callback.errorCallBack(this.fileBean.getUrl(), e.getMessage())); + // EventMessage eventMessage = new EventMessage(EventMessage.TYPE_ERROR,downloadData); // EventBus.getDefault().post(eventMessage); } finally { From 5b1cd38538eb7e37fca68bbe09a2f78689809b19 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 19 Apr 2023 15:34:26 +0800 Subject: [PATCH 20/27] =?UTF-8?q?[2.15.0]=20=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../obucombine/IMoGoObuDcCombineListener.kt | 16 ------------ .../CallerObuDcCombineListenerManager.kt | 26 ------------------- 2 files changed, 42 deletions(-) delete mode 100644 core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/obu/obucombine/IMoGoObuDcCombineListener.kt delete mode 100644 core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obucombine/CallerObuDcCombineListenerManager.kt diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/obu/obucombine/IMoGoObuDcCombineListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/obu/obucombine/IMoGoObuDcCombineListener.kt deleted file mode 100644 index f4af18034d..0000000000 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/obu/obucombine/IMoGoObuDcCombineListener.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.mogo.eagle.core.function.api.datacenter.obu.obucombine - -import mogo.v2x.ObuWarningEvent - -/** - * obu和dc 通道打通融合 - */ -interface IMoGoObuDcCombineListener { - - /** - * obu透传v2i数据，（标牌，弱势交通，红绿灯，限速，道路危险状况） - * @param obuWarningData - */ - fun onMoGoObuDcCombineData(obuWarningData: ObuWarningEvent.ObuWarningData?) - - } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obucombine/CallerObuDcCombineListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obucombine/CallerObuDcCombineListenerManager.kt deleted file mode 100644 index 1650f26193..0000000000 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obucombine/CallerObuDcCombineListenerManager.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.mogo.eagle.core.function.call.obucombine - -import com.mogo.eagle.core.function.api.datacenter.obu.obucombine.IMoGoObuDcCombineListener -import com.mogo.eagle.core.function.call.base.CallerBase -import mogo.v2x.ObuWarningEvent -import java.util.concurrent.ConcurrentHashMap - -/** - * obu和dc数据通道 回调监听 - */ -object CallerObuDcCombineListenerManager : CallerBase() { - // 存储所有注册了监听的对象，invokeXXXX进行遍历回调，将信息同步 - private val M_DC_COMBINE_LISTENERS: ConcurrentHashMap = - ConcurrentHashMap() - - /** - * v2i数据 - */ - fun invokeObuDcData(obuWarningData: ObuWarningEvent.ObuWarningData?){ - M_DC_COMBINE_LISTENERS.forEach{ - val listener = it.value - listener.onMoGoObuDcCombineData(obuWarningData) - } - } - -} \ No newline at end of file From f4cffe569a2fd64f11174dba75f8bb50b2c473f3 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 19 Apr 2023 16:26:30 +0800 Subject: [PATCH 21/27] =?UTF-8?q?[2.15.0][Opt]=E5=A2=9E=E5=8A=A0=E9=AB=98?= =?UTF-8?q?=E7=B2=BE=E5=9C=B0=E5=9B=BE=E7=BC=93=E5=AD=98=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index 766a18c135..f4276d4c34 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -1048,6 +1048,7 @@ public class AMapViewWrapper implements IMogoMapView, public void cacheHDDataByCity(IHdCacheListener listener) { if (mMapView.getMapAutoViewHelper() != null) { String gdCityCode = GDLocationClient.getInstance(getContext()).getLastCityCode(); + CallerLogger.INSTANCE.i(M_MAP + TAG, "gdCityCode is:" + gdCityCode); Integer id = HDMapUtils.getHDCityCode(gdCityCode); if (id != null) { hdCacheListener = listener; From bde82664f48c4161598fb509664a298f96a65368 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 19 Apr 2023 15:50:59 +0800 Subject: [PATCH 22/27] =?UTF-8?q?[2.15.0][V2N]=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=97=A5=E5=BF=97;=20=E6=94=BE=E5=AE=BDv2n?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=A7=A6=E5=8F=91=E6=9D=A1=E4=BB=B6[diffAngl?= =?UTF-8?q?e:20->30,=20eventAngle:=2020=20->=2025]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/v2x/v2n/alarm/V2XAlarmServer.java | 16 ++++++++-------- .../biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt | 5 ++--- .../v2n/scenario/scene/airoad/AiRoadMarker.kt | 12 ++++++++++++ 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/alarm/V2XAlarmServer.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/alarm/V2XAlarmServer.java index 8c3b605103..529f838883 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/alarm/V2XAlarmServer.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/alarm/V2XAlarmServer.java @@ -37,7 +37,7 @@ public class V2XAlarmServer { CopyOnWriteArrayList v2XRoadEventEntityList, MogoLocation currentLocation) { try { - //Logger.d(TAG, "getDriveFrontAlarmEvent --- 1 ---" + currentLocation ); + Logger.d(TAG, "getDriveFrontAlarmEvent --- 1 ---" + currentLocation ); if (!showedEvents.isEmpty()) { Iterator iterator = showedEvents.iterator(); while (iterator.hasNext()) { @@ -54,7 +54,7 @@ public class V2XAlarmServer { } } } - //Logger.d(TAG, "getDriveFrontAlarmEvent --- 2 ---" + currentLocation); + Logger.d(TAG, "getDriveFrontAlarmEvent --- 2 ---" + currentLocation); if (currentLocation != null && v2XRoadEventEntityList != null) { // 因为集合是按照距离排序后的所以这里检索出来第一个就发出警告 for (V2XRoadEventEntity v2XRoadEventEntity : v2XRoadEventEntityList) { @@ -65,7 +65,7 @@ public class V2XAlarmServer { MarkerLocation eventLocation = v2XRoadEventEntity.getLocation(); // 1、判断是否到达了触发距离,20 ~ 500, double distance = v2XRoadEventEntity.getDistance(); - //Logger.d(TAG, "distance:" + distance); + Logger.d(TAG, "distance:" + distance + ",poiType:" + v2XRoadEventEntity.getPoiType()); if (distance <= 500) { if (EventTypeEnumNew.GHOST_PROBE.getPoiType().equals(v2XRoadEventEntity.getPoiType())) { if (distance > 25) { @@ -76,8 +76,8 @@ public class V2XAlarmServer { double carBearing = currentLocation.getHeading(); double eventBearing = eventLocation.getAngle(); double diffAngle = DrivingDirectionUtils.getAngleDiff(carBearing, eventBearing); - //Logger.d(TAG, "car_bearing:" + carBearing + ",eventBearing:" + eventBearing + ",diffAngle:" + diffAngle); - if (diffAngle <= 20) { + Logger.d(TAG, "car_bearing:" + carBearing + ",eventBearing:" + eventBearing + ",diffAngle:" + diffAngle); + if (diffAngle <= 30) { // 3、计算当前车辆行驶方向与事件位置之间夹角《20度，保证道路事件在车辆前方 double eventAngle = DrivingDirectionUtils.getDegreeOfCar2Poi( currentLocation.getLongitude(), @@ -87,12 +87,12 @@ public class V2XAlarmServer { (int) currentLocation.getHeading() ); - //Logger.d(TAG, "eventAngle:" + eventAngle); - if (0 <= eventAngle && eventAngle <= 20) { + Logger.d(TAG, "eventAngle:" + eventAngle); + if (0 <= eventAngle && eventAngle <= 25) { if (showedEvents.contains(v2XRoadEventEntity)) { return null; } - //Logger.d(TAG, "showed---"); + Logger.d(TAG, "showed---"); showedEvents.add(v2XRoadEventEntity); return v2XRoadEventEntity; } diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt index ac372aa987..db572abb63 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt @@ -207,9 +207,8 @@ internal object V2NIdentifyDrawer { } catch (t: Throwable) { t.printStackTrace() } - - val shiGong = trafficData?.filter { it.type == 501 || it.type == 502 } Logger.d(TAG, "--- onAutopilotIdentifyDataUpdate -- : trafficData: ${ trafficData?.joinToString(",") }") + val shiGong = trafficData?.filter { it.type == 501 || it.type == 502 } if (shiGong != null && shiGong.isNotEmpty()) { drawShiGong(shiGong) } @@ -221,7 +220,7 @@ internal object V2NIdentifyDrawer { override fun onAutopilotV2nCongestionEvent(header: Header, rsi: RSI_PB) { super.onAutopilotV2nCongestionEvent(header, rsi) - + Logger.d(TAG, "--- onAutopilotV2nCongestionEvent -- : rsi: ${ GsonUtils.toJson(rsi) }") try { V2XBizTrace.onAck("onAutopilotV2nCongestionEvent", rsi) } catch (t: Throwable) { diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt index 8ccd111468..4404876599 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt @@ -4,6 +4,7 @@ import android.animation.ArgbEvaluator import android.graphics.Color import android.os.Handler import android.os.Looper +import android.util.Log import android.view.animation.DecelerateInterpolator import androidx.core.util.Pair import com.mogo.eagle.core.data.map.MogoLatLng @@ -88,6 +89,7 @@ class AiRoadMarker { 300f ) //施工中心点后方的自车行驶方向上300米距离 + Log.d(TAG, "--- marker --- 3 --- l1:$l1") V2XBizTrace.onAck("$TAG --- marker --- 3 --- l1:", l1) val l2 = MogoMap.getInstance().mogoMap.getCenterLineRangeInfo( marker.poi_lon, @@ -96,9 +98,11 @@ class AiRoadMarker { -300f ) if (l1.points.isEmpty() || l2.points.isEmpty()) { + Log.d(TAG, " --- marker --- 3 --- return ----") V2XBizTrace.onAck("$TAG --- marker --- 3 --- return ----", "") return } + Log.d(TAG, " --- marker --- 4 --- l2: $l2") V2XBizTrace.onAck("$TAG --- marker --- 4 --- l2:", l2) val points = LinkedList() if (l2 != null && l2.points.isNotEmpty()) { @@ -108,6 +112,7 @@ class AiRoadMarker { } val centerX = marker.poi_lon val centerY = marker.poi_lat + Log.d(TAG, "--- marker --- 5 --- marker: $marker") V2XBizTrace.onAck("$TAG --- marker --- 5 --- marker:", marker) val farthestPoint = marker.polygon?.let { var find: Pair = Pair(centerX, centerY) @@ -128,6 +133,7 @@ class AiRoadMarker { MogoLatLng(find.second, find.first) } ?: MogoLatLng(centerY, centerX) marker.farthestPoint = Pair(farthestPoint.lon, farthestPoint.lat) + Log.d(TAG, "--- marker --- 6 --- marker:$marker") V2XBizTrace.onAck("$TAG --- marker --- 6 --- marker:", marker) if (l1 != null && l1.points.isNotEmpty()) { for (l in l1.points) { @@ -160,6 +166,7 @@ class AiRoadMarker { var line = line.get() options.points(points) options.colorValues(colors) + Log.d(TAG, "--- marker --- 7 --- points:${points.size}") V2XBizTrace.onAck("$TAG --- marker --- 7 --- points:", "${points.size}") if (line == null || line.isDestroyed) { val l = overlayManager?.addPolyline(options) @@ -183,8 +190,10 @@ class AiRoadMarker { private fun removeLine() { val old = line.get() + Log.d(TAG, " --- removeRedLine --- 1") V2XBizTrace.onAck("$TAG --- removeRedLine --- 1", "") if (old != null) { + Log.d(TAG,"--- removeRedLine --- 2") V2XBizTrace.onAck("$TAG --- removeRedLine --- 2", "") line.set(null) old.isVisible = false @@ -193,6 +202,7 @@ class AiRoadMarker { } private fun unMarker(marker: Marker) { + Log.d(TAG,"$TAG --- unMarker ---") V2XBizTrace.onAck("$TAG --- unMarker ---", "") this.marker.set(null) removeLine() @@ -202,11 +212,13 @@ class AiRoadMarker { } fun receive() { + Log.d(TAG, " --- receive --- 1 ---") V2XBizTrace.onAck("$TAG --- receive --- 1 ---", "") val poi = this.marker.get() val car = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() if (poi != null) { val distance = CoordinateUtils.calculateLineDistance(car.longitude, car.latitude, poi.poi_lon, poi.poi_lat) + Log.d(TAG ," --- receive --- 2 ---car:[${car.longitude}, ${car.latitude}] -> poi:[${poi.poi_lon}, ${poi.poi_lat}] --> distance:$distance") V2XBizTrace.onAck( "$TAG --- receive --- 2 ---", "car:[${car.longitude}, ${car.latitude}] -> poi:[${poi.poi_lon}, ${poi.poi_lat}] --> distance:$distance" From 55495234d5d4de59532010d0ec939599bf77435c Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 19 Apr 2023 17:09:26 +0800 Subject: [PATCH 23/27] =?UTF-8?q?[2.15.0][V2N]=20=E4=BC=98=E5=8C=96v2n?= =?UTF-8?q?=E6=96=B0=E9=93=BE=E8=B7=AF=E4=BA=8B=E4=BB=B6=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt index 4404876599..daf151375b 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt @@ -226,6 +226,7 @@ class AiRoadMarker { if (distance < 500) { checkExpired() } else { + unMarker(poi) handler.removeCallbacks(checkExpiredTask) } } else { From 469a2e618b8fb5a6c79b7aa715def6d2ffa30279 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 19 Apr 2023 17:09:26 +0800 Subject: [PATCH 24/27] =?UTF-8?q?[2.15.0][V2N]=20=E4=BC=98=E5=8C=96v2n?= =?UTF-8?q?=E6=96=B0=E9=93=BE=E8=B7=AF=E4=BA=8B=E4=BB=B6=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [2.15.0][V2N] 优化逻辑 --- .../mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt index db572abb63..7bf873fb68 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt @@ -57,7 +57,7 @@ internal object V2NIdentifyDrawer { AiRoadMarker().apply { val poiType = getPoiType(itx.type).poiType val polygon = itx.polygonList.map { Pair.create(it.longitude, it.latitude) } - marker(Marker(id, poiType, itx.longitude, itx.latitude, itx.heading, polygon, null, + marker(Marker(id, poiType, itx.latitude,itx.longitude, itx.heading, polygon, null, V2XRoadEventEntity().also { e -> e.poiType = poiType e.location = MarkerLocation().also { l -> @@ -112,7 +112,7 @@ internal object V2NIdentifyDrawer { AiRoadMarker.aiMakers.getOrPut(id) { AiRoadMarker().apply { val poiType = getPoiType(itx.eventType).poiType - marker(Marker(id, poiType, lon, lat, car.heading, null, null, + marker(Marker(id, poiType, lat, lon, car.heading, null, null, V2XRoadEventEntity().also { e -> e.poiType = poiType e.location = MarkerLocation().also { l -> From 57276f4a3e1d2b2b1b34fdcccbbc1b178fd14b40 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 19 Apr 2023 17:56:08 +0800 Subject: [PATCH 25/27] =?UTF-8?q?[2.15.0]=E6=96=B0=E5=A2=9E=E5=81=9C?= =?UTF-8?q?=E6=AD=A2=E8=BD=AE=E8=AF=A2=E6=9F=A5V2X=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt | 4 ++++ .../mogo/eagle/core/function/api/biz/IMoGoFuncBizProvider.kt | 2 ++ 2 files changed, 6 insertions(+) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt index 30e29c0fbb..ed27524c68 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt @@ -107,6 +107,10 @@ class FuncBizProvider : IMoGoFuncBizProvider { OverViewDataManager.getAllV2XEventsByLineId(MoGoAiCloudClientConfig.getInstance().sn) } + override fun stopQueryV2XEvents() { + OverViewDataManager.stopQueryV2XEvents() + } + override fun queryV2XEvents() { if ((AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode) && !FunctionBuildConfig.isNewV2NData) || AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IMoGoFuncBizProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IMoGoFuncBizProvider.kt index def198adbf..6c12d57465 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IMoGoFuncBizProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IMoGoFuncBizProvider.kt @@ -73,6 +73,8 @@ interface IMoGoFuncBizProvider : IMoGoFunctionServerProvider { fun getAllV2XEvents() + fun stopQueryV2XEvents() + fun queryV2XEvents() From d62dd4ffab620e80ecc43a917bc758cc7d252ac4 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 19 Apr 2023 17:59:35 +0800 Subject: [PATCH 26/27] =?UTF-8?q?[2.15.0]=E6=96=B0=E5=A2=9E=E6=B8=85?= =?UTF-8?q?=E9=99=A4=E9=AB=98=E5=BE=B7=E5=9C=B0=E5=9B=BEV2X=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6Marker=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/eagle/core/function/view/OverMapView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt index 924183d58e..f559cdd075 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt @@ -466,7 +466,7 @@ class OverMapView @JvmOverloads constructor( return bitmap } - private fun clearV2XMarkers() { + fun clearV2XMarkers() { if (currMarkerList != null) { for (marker in currMarkerList!!) { marker.destroy() From 90d845ba2fcaf570eacd023d0025b7ff383df1e2 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 19 Apr 2023 18:33:28 +0800 Subject: [PATCH 27/27] [2.15.0] update log --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 55c8dff742..8fee8706d7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -63,7 +63,7 @@ bytex.ASM_API=ASM7 #SERVICE_BIZ_VERSION=1.2.4 ################ 外部依赖引用 ################ # loglib -LOGLIB_VERSION=1.5.26 +LOGLIB_VERSION=1.5.27 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION MOGO_NETWORK_VERSION=1.4.6.7