From ff13e5d8937bed60c6f7623481b87e3b4a33a15b Mon Sep 17 00:00:00 2001 From: renwj Date: Tue, 7 Mar 2023 17:25:38 +0800 Subject: [PATCH 1/8] =?UTF-8?q?[dev=5Fopt=5F2.15.0]=20=E5=B0=86patch?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E4=BE=9D=E8=B5=96=E6=94=BE=E5=88=B0?= =?UTF-8?q?app=E6=A8=A1=E5=9D=97=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 1 + core/function-impl/mogo-core-function-hmi/build.gradle | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index a74eef3605..931e1f7b01 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -356,6 +356,7 @@ dependencies { implementation project(':core:function-impl:mogo-core-function-hmi') implementation project(':core:function-impl:mogo-core-function-map') implementation project(':core:function-impl:mogo-core-function-chat') + implementation project(':core:function-impl:mogo-core-function-patch') implementation project(':foudations:mogo-commons') implementation project(':core:mogo-core-function-call') implementation project(':core:mogo-core-utils') diff --git a/core/function-impl/mogo-core-function-hmi/build.gradle b/core/function-impl/mogo-core-function-hmi/build.gradle index 1746d759e5..e0be61dbc9 100644 --- a/core/function-impl/mogo-core-function-hmi/build.gradle +++ b/core/function-impl/mogo-core-function-hmi/build.gradle @@ -71,7 +71,6 @@ dependencies { implementation rootProject.ext.dependencies.cicle_indicator implementation rootProject.ext.dependencies.koomnative implementation rootProject.ext.dependencies.koomxhook - implementation project(':core:function-impl:mogo-core-function-patch') api project(':test:crashreport-apmbyte') compileOnly project(':core:function-impl:mogo-core-function-datacenter') implementation project(':foudations:mogo-commons') From 883984c994936c9df3a24e337351b956ffe70ac9 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 7 Mar 2023 15:43:27 +0800 Subject: [PATCH 2/8] [2.15.0] thread opt --- .../passenger/model/BusPassengerModel.java | 3 +- .../mogo/och/bus/presenter/BusPresenter.java | 1 - .../sweeper/presenter/SweeperPresenter.java | 1 - .../passenger/model/TaxiPassengerModel.java | 7 ++- .../com/mogo/och/taxi/model/TaxiModel.java | 3 +- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 3 -- .../datacenter/v2x/TrafficLightDispatcher.kt | 2 + .../report/IPCReportManager.kt | 45 ++++++++++--------- .../hmi/ui/setting/DebugSettingView.kt | 1 + .../function/hmi/ui/widget/SpeedPanelView.kt | 1 + .../business/SpeedLimitDataManager.java | 2 +- 11 files changed, 34 insertions(+), 35 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index 3167458fd6..88edf004fb 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -95,7 +95,7 @@ public class BusPassengerModel { List mStations = new ArrayList<>(); private int mNextStationIndex = 0;// 要到达站的index - private List mTwoStationsRouts = new ArrayList<>(); + private final List mTwoStationsRouts = new ArrayList<>(); private int mPreRouteIndex = 0; private int mWipePreIndex = 0; @@ -352,7 +352,6 @@ public class BusPassengerModel { @Override public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { - if (autopilotStatusInfo == null) return; int state = autopilotStatusInfo.getState(); if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { //2022.7.20 自动驾驶更换成带档位的 diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java index bedbb415d9..6336e5ccd8 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java @@ -169,7 +169,6 @@ public class BusPresenter extends Presenter @Override public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { - if (autopilotStatusInfo == null) return; int state = autopilotStatusInfo.getState(); // CallerLogger.INSTANCE.d(M_BUS + TAG, "onStateChange: " + state + "currentAutopilotStatus = " + currentAutopilotStatus); switch (state) { diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java index 8ce4713150..81aaf528eb 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java @@ -168,7 +168,6 @@ public class SweeperPresenter extends Presenter @Override public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { - if (autopilotStatusInfo == null) return; int state = autopilotStatusInfo.getState(); // CallerLogger.INSTANCE.d(M_BUS + TAG, "onStateChange: " + state + "currentAutopilotStatus = " + currentAutopilotStatus); switch (state) { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java index bfef8a0271..daaf6b231c 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java @@ -117,8 +117,8 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback private IOCHTaxiPassengerADASStatusCallback mADASStatusCallback; //Model->Presenter：自动驾驶状态相关 private IOCHTaxiPassengerAutopilotPlanningCallback mAutopilotPlanningCallback; //Model->Presenter：自动驾驶线路规划 - private Map mOrderStatusCallbackMap = new ConcurrentHashMap<>(); - private Map mControllerStatusCallbackMap = new ConcurrentHashMap<>(); + private final Map mOrderStatusCallbackMap = new ConcurrentHashMap<>(); + private final Map mControllerStatusCallbackMap = new ConcurrentHashMap<>(); private ITaxiPassengerVeloctityCallback mVeloctityCallback;//道路限速返回 @@ -130,7 +130,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback private double mLongitude, mLatitude; private MogoLocation mLocation = null; - private List mLocationsModels = new ArrayList<>(); + private final List mLocationsModels = new ArrayList<>(); private TaxiPassengerModel() { } @@ -517,7 +517,6 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback @Override public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { - if (autopilotStatusInfo == null) return; int state = autopilotStatusInfo.getState(); // CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "state = %s", state ); if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index 8fd06b5aa6..b1830b62e1 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -129,7 +129,7 @@ public class TaxiModel { private volatile boolean isRestartAutopilot = false; - private List mRoutePoints = new ArrayList<>(); + private final List mRoutePoints = new ArrayList<>(); private int mPreRouteIndex = 0; private double mLongitude, mLatitude; @@ -1160,7 +1160,6 @@ public class TaxiModel { @Override public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { - if (autopilotStatusInfo == null) return; int state = autopilotStatusInfo.getState(); if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { if (state != mPrevAPStatus && mADASStatusCallback != null){ diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index dfcd3dd961..85b14a2962 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -134,8 +134,6 @@ class MoGoAdasListenerImpl : OnAdasListener { if (gnssInfo != null) { if (1 == FunctionBuildConfig.gpsProvider) { - // 同步给MAP地图 - //CallerMapUIServiceManager.getMapUIController()?.syncLocation2Map(gnssInfo) // 同步更新经纬度和系统时间至 AutoPilotStatusListener CallerAutoPilotStatusListenerManager.updateAutoPilotLatLon( gnssInfo.satelliteTime, @@ -146,7 +144,6 @@ class MoGoAdasListenerImpl : OnAdasListener { } } - /** * 老底盘信息,透传底盘状态，pb参考底盘 * TODO 目前由于M1车型不会在新底盘PB添加新的字段 所以临时保留 diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt index 521aa5c3a4..4112baf491 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt @@ -50,9 +50,11 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight private var mContext: Context? = null //是否有AI获取红绿灯灯态 + @Volatile private var hasAiLightStatus: Boolean = false //obu数据 + @Volatile private var hasObuLightStatus: Boolean = false fun initServer(context: Context) { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kt index d9a7997639..d338f02da8 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kt @@ -10,6 +10,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils +import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.TimeUtils import mogo_msg.MogoReportMsg @@ -69,29 +70,30 @@ class IPCReportManager : IMoGoAutopilotStatusListener { *工控机监控节点上报 */ override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) { - guardianInfo?.let{ - if(it.resultList.contains(RESULT_AUTOPILOT_DISABLE) - || it.resultList.contains(RESULT_AUTOPILOT_SYSTEM_UNSTARTED) - || it.resultList.contains(RESULT_REMOTEPILOT_DISABLE) - || it.resultList.contains(RESULT_AUTOPILOT_INFERIOR) - || it.resultList.contains(RESULT_SHOW_WARNING) - || it.resultList.contains(RESULT_REMOTEPILOT_INFERIOR)){ - val reportEntity = ReportEntity(TimeUtils.millis2String(System.currentTimeMillis()), - it.src,it.level,it.msg,it.code,it.resultList,it.actionsList) - CallerMsgBoxManager.saveMsgBox(MsgBoxBean(MsgBoxType.REPORT, reportEntity)) - } + ThreadUtils.runOnUiThread { + guardianInfo?.let{ + if(it.resultList.contains(RESULT_AUTOPILOT_DISABLE) + || it.resultList.contains(RESULT_AUTOPILOT_SYSTEM_UNSTARTED) + || it.resultList.contains(RESULT_REMOTEPILOT_DISABLE) + || it.resultList.contains(RESULT_AUTOPILOT_INFERIOR) + || it.resultList.contains(RESULT_SHOW_WARNING) + || it.resultList.contains(RESULT_REMOTEPILOT_INFERIOR)){ + val reportEntity = ReportEntity(TimeUtils.millis2String(System.currentTimeMillis()), + it.src,it.level,it.msg,it.code,it.resultList,it.actionsList) + CallerMsgBoxManager.saveMsgBox(MsgBoxBean(MsgBoxType.REPORT, reportEntity)) + } - if (reportList.size > 49) { - reportList.removeLast() - } - reportList.add( - 0, - ReportEntity( - TimeUtils.millis2String(System.currentTimeMillis()), - it.src, it.level, it.msg, it.code, it.resultList, it.actionsList + if (reportList.size > 49) { + reportList.removeLast() + } + reportList.add( + 0, + ReportEntity( + TimeUtils.millis2String(System.currentTimeMillis()), + it.src, it.level, it.msg, it.code, it.resultList, it.actionsList + ) ) - ) - reportListFloatWindow?.refreshData(reportList) + reportListFloatWindow?.refreshData(reportList) // //Error 弹窗并有提示音 // if(it.resultList.contains(RESULT_AUTOPILOT_DISABLE) @@ -128,6 +130,7 @@ class IPCReportManager : IMoGoAutopilotStatusListener { // } // } // } + } } } 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 d855300e60..fac708c747 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 @@ -117,6 +117,7 @@ internal class DebugSettingView @JvmOverloads constructor( private var logInfoView: LogInfoView? = null private var logViewAttach = false + @Volatile private var mAutoPilotStatusInfo: AutopilotStatusInfo? = null private var mGnssInfo: MogoLocation? = null diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt index b7f531c972..325c33de50 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt @@ -27,6 +27,7 @@ class SpeedPanelView @JvmOverloads constructor( var mContext: Context var mSpeedChartView: SpeedChartView + @Volatile var mLatLng: MogoLocation? = null init { diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/SpeedLimitDataManager.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/SpeedLimitDataManager.java index 60c7d0eba3..7d77a80af3 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/SpeedLimitDataManager.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/SpeedLimitDataManager.java @@ -23,7 +23,7 @@ public class SpeedLimitDataManager implements IMoGoChassisLocationGCJ02Listener private final static String TAG = "SpeedLimitDataManager"; private static volatile SpeedLimitDataManager instance; - private MogoLocation mLocation; + private volatile MogoLocation mLocation; private SpeedLimitDataManager() { } From 4431ed9bd73c89971006dd838cf18be1173f851b Mon Sep 17 00:00:00 2001 From: renwj Date: Mon, 6 Mar 2023 20:13:57 +0800 Subject: [PATCH 3/8] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E5=B0=86armeabi?= =?UTF-8?q?-v7a=E6=9E=B6=E6=9E=84=E7=9A=84so=E6=8E=92=E9=99=A4,=20?= =?UTF-8?q?=E5=87=8F=E5=B0=8F=E5=8C=85=E4=BD=93=E7=A7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle b/app/build.gradle index 931e1f7b01..c387582028 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -149,6 +149,7 @@ android { packagingOptions { exclude 'META-INF/proguard/coroutines.pro' exclude 'META-INF/*' + exclude "/lib/armeabi-v7a/*.so" } signingConfigs { From 2d5eebb00340c0d44e10bdf233067f550f861202 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 7 Mar 2023 16:25:58 +0800 Subject: [PATCH 4/8] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=BF=90=E8=90=A5=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/view_sop_setting.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml index 38db5038ad..cb84b6d654 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml @@ -217,8 +217,8 @@ android:scaleY="1.2" android:scaleX="1.2" app:layout_constraintTop_toBottomOf="@id/tbObuWeaknessTrafficSop" - app:layout_constraintLeft_toRightOf="@id/verticalGuideLine" - app:layout_constraintRight_toRightOf="parent" + app:layout_constraintRight_toLeftOf="@id/verticalGuideLine" + app:layout_constraintLeft_toLeftOf="parent" /> Date: Tue, 7 Mar 2023 19:07:37 +0800 Subject: [PATCH 5/8] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E4=B8=8B=E8=BD=BD=E9=80=9A=E7=9F=A5=E6=A0=8F=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E8=B0=83=E8=AF=95=E9=9D=A2=E6=9D=BF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=BD=A6=E4=BF=A1=E6=81=AF=E6=95=B0=E6=8D=AE=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../binding/BindingCarNetWorkManager.kt | 8 +++++++ .../upgrade/UpgradeManager.kt | 14 +---------- .../hmi/ui/setting/DebugSettingView.kt | 6 ++++- .../main/res/layout/view_debug_setting.xml | 23 +++++++++++++++++++ 4 files changed, 37 insertions(+), 14 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt index 9191619b4e..008fe69093 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt @@ -86,10 +86,18 @@ class BindingCarNetWorkManager private constructor() { SharedPrefsConstants.CAR_INFO, GsonUtils.toJson(info.getData()) ) + } else { + SharedPrefsMgr.getInstance(context).putString( + SharedPrefsConstants.CAR_INFO, "null") + e( + SceneConstant.M_BINDING + TAG, "getBindingCarInfo data = null " + ) } } override fun onError(e: Throwable) { + SharedPrefsMgr.getInstance(context).putString( + SharedPrefsConstants.CAR_INFO, e.message.toString()) e( SceneConstant.M_BINDING + TAG, "getBindingCarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message 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 c530d157a4..70321773e9 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 @@ -1,6 +1,5 @@ package com.zhjt.mogo_core_function_devatools.upgrade -import android.app.NotificationManager import android.content.Context import android.content.pm.PackageInstaller import com.mogo.eagle.core.data.constants.MogoServicePaths @@ -265,31 +264,20 @@ class UpgradeManager : IDownload { } /** - * 鹰眼app下载监听 liyz + * 鹰眼app下载监听 */ fun updateUpgradeProgress(context: Context) { - val builder = NotificationCompat.Builder(context) - // builder.setSmallIcon(R.mipmap.icon1001);//todo emArrow 更换图标，去除地图下载图标的依赖关系 - builder.setContentTitle("下载") - builder.setContentText("正在下载") - val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager CallerDevaToolsUpgradeListenerManager.addListener( TAG, object : IMogoDevaToolsUpgradeListener { override fun onStart(url: String?) {} override fun onPause(url: String?) {} override fun onProgress(url: String?, length: Int) { - builder.setProgress(100, length, false) - manager.notify(0x3, builder.build()) - //下载进度提示 - builder.setContentText("已下载$length%") updateStatusBarDownloadView(true, "download", length) } override fun onFinished(url: String?, localPath: String) { - builder.setContentText("已下载" + 100 + "%") UiThreadHandler.postDelayed({ - manager.cancel(0x3) updateStatusBarDownloadView(false, "download", 100) }, 1000) } 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 fac708c747..b00371609d 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 @@ -21,6 +21,7 @@ import chassis.Chassis import chassis.ChassisStatesOuterClass import com.mogo.cloud.passport.MoGoAiCloudClient import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.constants.SharedPrefsConstants import com.mogo.commons.debug.DebugConfig import com.mogo.commons.module.status.MogoStatusManager import com.mogo.eagle.core.data.app.AppConfigInfo @@ -207,7 +208,6 @@ internal class DebugSettingView @JvmOverloads constructor( CallerChassisGearStateListenerManager.addListener(TAG, this) CallerChassisSteeringStateListenerManager.addListener(TAG, this) CallerChassisThrottleStateListenerManager.addListener(TAG, this) - //添加 开发套件工具接口 监听 CallerDevaToolsListenerManager.addListener(TAG, this) //添加 底盘灯光数据 监听 @@ -258,6 +258,7 @@ internal class DebugSettingView @JvmOverloads constructor( CallerChassisLamplightListenerManager.removeListener(TAG) // 移除 obu获取信息 监听 CallerObuInfoListenerManager.removeListener(TAG) + // 移除 业务配置监听 CallerDevaToolsFuncConfigListenerManager.unRegisterDevaToolsFuncConfigListener( FuncBizConfig.FOUNDATION, @@ -360,6 +361,7 @@ internal class DebugSettingView @JvmOverloads constructor( swDevelopMode.visibility = View.GONE } } + /** * 开发者模式 */ @@ -1590,6 +1592,7 @@ internal class DebugSettingView @JvmOverloads constructor( tvAutopilotInfo.text = autopilotJson tvIpcInfo.text = autopilotJson tvIpcInfoKey.text = autopilotJson + tvCmdbCarInfoContent.text = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.CAR_INFO) tvCarInfo.text = "GPS时间：${(mGnssInfo?.satelliteTime?.times(1000))?.toLong()}\n" + @@ -2047,4 +2050,5 @@ internal class DebugSettingView @JvmOverloads constructor( override fun onObuDeviceId(obuDeviceId: String) { mObuDeviceId = obuDeviceId } + } \ No newline at end of file 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 c38a1baeb9..eb5078690b 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 @@ -206,6 +206,29 @@ android:layout_height="1dp" android:background="#F0F0F0" /> + + + + + + + Date: Tue, 7 Mar 2023 17:38:16 +0800 Subject: [PATCH 6/8] =?UTF-8?q?[opt3.0]HttpDNS=E6=8E=A5=E5=8F=A3=E6=89=A9?= =?UTF-8?q?=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/biz/dispatch/network/IDispatchAdasApiService.kt | 2 +- .../com/mogo/eagle/function/biz/v2x/road/ILineUploadApi.kt | 2 +- .../com/mogo/eagle/function/biz/v2x/road/LineUploadManager.kt | 3 ++- .../function/business/ai/net/AiCloudIdentifyNetWorkModel.kt | 3 ++- .../function/business/ai/net/IAiCloudIdentifyApiService.kt | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/IDispatchAdasApiService.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/IDispatchAdasApiService.kt index dbdc2e34c7..2e1ff638f6 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/IDispatchAdasApiService.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/IDispatchAdasApiService.kt @@ -14,7 +14,7 @@ interface IDispatchAdasApiService { * @return [BaseData] */ @FormUrlEncoded - @POST("eagle-eye-dns/eagle-eye-dns/dataService/autoDriver/receiveCarPreSetPath") + @POST("eagle-eye-dns/dataService/autoDriver/receiveCarPreSetPath") fun uploadAutopilotRoute(@FieldMap parameters: Map): Observable /** diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/ILineUploadApi.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/ILineUploadApi.kt index efe9aa66bf..c97a3e6078 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/ILineUploadApi.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/ILineUploadApi.kt @@ -10,7 +10,7 @@ import retrofit2.http.POST interface ILineUploadApi { @Headers("Content-type:application/json;charset=UTF-8" ) - @POST( "/yycp-data-center-service/carTrack/receiveCarTrack/" ) + @POST( "eagle-eye-dns/yycp-data-center-service/carTrack/receiveCarTrack/" ) fun uploadLineId(@Body lineId: LineUploadData): Observable } \ No newline at end of file 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 790ca44ab0..27780b4702 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 @@ -3,6 +3,7 @@ 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 @@ -54,7 +55,7 @@ class LineUploadManager private constructor(context: Context) : IMoGoAutopilotSt private fun uploadLine(lineId: Long) { val lineUploadData = LineUploadData(lineId, MoGoAiCloudClientConfig.getInstance().sn) - disposable = MoGoRetrofitFactory.getInstance(DATA_CENTER_HOST) + disposable = MoGoRetrofitFactory.getInstance(getEagleHost()) .create(ILineUploadApi::class.java) .uploadLineId(lineUploadData) .subscribeOn(Schedulers.io()) 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 8ad4ad3521..bde91cf45c 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 @@ -1,6 +1,7 @@ package com.mogo.eagle.core.function.business.ai.net import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.constants.HostConst import com.mogo.commons.debug.DebugConfig import com.mogo.eagle.core.data.BaseResponse import com.mogo.eagle.core.function.business.ai.AiCloudIdentifyDataManager.Companion.END_METRE @@ -27,7 +28,7 @@ class AiCloudIdentifyNetWorkModel { return host } - private fun getNetWorkApi(baseUrl: String = getHost()): IAiCloudIdentifyApiService { + private fun getNetWorkApi(baseUrl: String = HostConst.getEagleHost()): IAiCloudIdentifyApiService { 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 3ddaac5e43..2e8ec4357f 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,6 +8,6 @@ import retrofit2.http.POST interface IAiCloudIdentifyApiService { @Headers("Content-type:application/json;charset=UTF-8") - @POST("yycp-c-v2x-service/dataFusion/remoteDrivingSet") + @POST("eagle-eye-dns/yycp-c-v2x-service/dataFusion/remoteDrivingSet") suspend fun identifyRange(@Body map: MutableMap): BaseResponse } \ No newline at end of file From 0726d916c2627780619bde314f440d8579138f9f Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 7 Mar 2023 19:56:05 +0800 Subject: [PATCH 7/8] [2.15.0] remove down load util progress log --- .../eagle/core/utilcode/breakpoint/thread/DownloadTask.java | 2 -- 1 file changed, 2 deletions(-) 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 641f9ab505..5e2a0280ba 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 @@ -118,10 +118,8 @@ public class DownloadTask implements DownloadCallBack { public void progressCallBack(String url, int length) { finishedProgress += length; //每500毫秒发送刷新进度事件 - Log.d(DOWN_LOAD_TAG, "process:" + finishedProgress); if (System.currentTimeMillis() - curTime > 500 || finishedProgress == fileBean.getLength()) { int progress = (int) (finishedProgress * 1.0 / fileBean.getLength() * 100); - Log.d(DOWN_LOAD_TAG, "DownloadTask ----length = " + length + " ---progress = " + progress); fileBean.setFinished(finishedProgress); DownloadData downloadData = new DownloadData(); downloadData.setUrl(fileBean.getUrl()); From 05e319453b03366b1eb2219ae684e99f5dd59f85 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 8 Mar 2023 09:59:24 +0800 Subject: [PATCH 8/8] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96cmdb=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../binding/BindingCarNetWorkManager.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt index 008fe69093..a6b0fccc0f 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt @@ -87,8 +87,8 @@ class BindingCarNetWorkManager private constructor() { GsonUtils.toJson(info.getData()) ) } else { - SharedPrefsMgr.getInstance(context).putString( - SharedPrefsConstants.CAR_INFO, "null") +// SharedPrefsMgr.getInstance(context).putString( +// SharedPrefsConstants.CAR_INFO, "null") e( SceneConstant.M_BINDING + TAG, "getBindingCarInfo data = null " ) @@ -96,8 +96,8 @@ class BindingCarNetWorkManager private constructor() { } override fun onError(e: Throwable) { - SharedPrefsMgr.getInstance(context).putString( - SharedPrefsConstants.CAR_INFO, e.message.toString()) +// SharedPrefsMgr.getInstance(context).putString( +// SharedPrefsConstants.CAR_INFO, e.message.toString()) e( SceneConstant.M_BINDING + TAG, "getBindingCarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message