From 65d254249f7e73ac43516fd61a7e123fc5b5f2ff Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 12 Nov 2024 16:03:49 +0800 Subject: [PATCH 01/31] =?UTF-8?q?[6.7.3]=20[fix]=20[=E4=B9=98=E5=AE=A2?= =?UTF-8?q?=E5=B1=8F=E5=B9=BF=E5=91=8A=E4=BF=AE=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/common/module/wigets/media/MediaPlayerFragment.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerFragment.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerFragment.kt index 0c3ba2dc4f..e4f2d06745 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerFragment.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerFragment.kt @@ -62,9 +62,9 @@ class MediaPlayerFragment : arrayListOf.addAll(list) UiThreadHandler.post { if (isNewData) { - imageVideoRotationView.setNewMediaData(arrayListOf) + imageVideoRotationView?.setNewMediaData(arrayListOf) } else { - imageVideoRotationView.setMediaData(arrayListOf) + imageVideoRotationView?.setMediaData(arrayListOf) } } } From 04ce74a69c73ee9b985c2bd64141965b1bfaa0b6 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 12 Nov 2024 19:20:17 +0800 Subject: [PATCH 02/31] [6.7.3] [fix] [mogo dir create] --- .../main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt index 590ba5a8ab..a765107464 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt @@ -12,6 +12,7 @@ import com.mogo.commons.env.Project import com.mogo.commons.env.ProjectUtils import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils +import com.mogo.eagle.core.utilcode.util.FileUtils import com.mogo.och.weaknet.repository.db.bean.ContrailDataBean import com.mogo.och.weaknet.repository.db.bean.EventDataBean import com.mogo.och.weaknet.repository.db.bean.LineDataBean @@ -82,6 +83,8 @@ abstract class MyDataBase : RoomDatabase() { } } + FileUtils.createOrExistsDir(ROOT_PATH) + return Room.databaseBuilder( AbsMogoApplication.getApp()!!.applicationContext, MyDataBase::class.java, ROOT_PATH+roomName ) From d26c761e681191cef7ffc0b4f8d0e4d5c6870a9b Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 13 Nov 2024 10:37:13 +0800 Subject: [PATCH 03/31] =?UTF-8?q?[6.7.3]=20[fix]=20[offline=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=88=A4=E7=A9=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/offline/model/OrderModel.java | 18 ++++++++++++------ .../och/offline/util/BusTrajectoryManager.java | 15 +++++---------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java index 7f04703625..ca3026abb2 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java @@ -1085,12 +1085,18 @@ public class OrderModel { parameters.vehicleType = VEHICLE_TYPE; if (parameters.autoPilotLine == null) { parameters.autoPilotLine = new AutopilotControlParameters.AutoPilotLine( - busRoutesResult.getLineId(), busRoutesResult.getName(), - busRoutesResult.csvFileUrl, busRoutesResult.csvFileMd5, - busRoutesResult.txtFileUrl, busRoutesResult.txtFileMd5, - busRoutesResult.contrailSaveTime, busRoutesResult.carModel, - busRoutesResult.csvFileUrlDPQP, busRoutesResult.csvFileMd5DPQP, - busRoutesResult.txtFileUrlDPQP, busRoutesResult.txtFileMd5DPQP, + busRoutesResult.getLineId(), + busRoutesResult.getName(), + busRoutesResult.csvFileUrl==null?"":busRoutesResult.csvFileUrl, + busRoutesResult.csvFileMd5==null?"":busRoutesResult.csvFileMd5, + busRoutesResult.txtFileUrl==null?"":busRoutesResult.txtFileUrl, + busRoutesResult.txtFileMd5==null?"":busRoutesResult.txtFileMd5, + busRoutesResult.contrailSaveTime, + busRoutesResult.carModel, + busRoutesResult.csvFileUrlDPQP, + busRoutesResult.csvFileMd5DPQP, + busRoutesResult.txtFileUrlDPQP, + busRoutesResult.txtFileMd5DPQP, busRoutesResult.contrailSaveTimeDPQP); } diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/BusTrajectoryManager.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/BusTrajectoryManager.java index 4370689618..39005ec077 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/BusTrajectoryManager.java +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/BusTrajectoryManager.java @@ -129,17 +129,12 @@ public class BusTrajectoryManager { } else { mAutoPilotLine.setLineId(routesResult.getLineId()); mAutoPilotLine.setLineName(routesResult.getName()); - mAutoPilotLine.setTrajUrl(routesResult.csvFileUrl); - mAutoPilotLine.setTrajMd5(routesResult.csvFileMd5); - mAutoPilotLine.setStopUrl(routesResult.txtFileUrl); - mAutoPilotLine.setStopMd5(routesResult.txtFileMd5); + mAutoPilotLine.setTrajUrl(routesResult.csvFileUrl==null?"":routesResult.csvFileUrl); + mAutoPilotLine.setTrajMd5(routesResult.csvFileMd5==null?"":routesResult.csvFileMd5); + mAutoPilotLine.setStopUrl(routesResult.txtFileUrl==null?"":routesResult.txtFileUrl); + mAutoPilotLine.setStopMd5(routesResult.txtFileMd5==null?"":routesResult.txtFileMd5); mAutoPilotLine.setTimestamp(routesResult.contrailSaveTime); - mAutoPilotLine.setVehicleModel(routesResult.carModel); - mAutoPilotLine.setTrajUrl_dpqp(routesResult.csvFileUrlDPQP); - mAutoPilotLine.setTrajMd5_dpqp(routesResult.csvFileMd5DPQP); - mAutoPilotLine.setStopUrl_dpqp(routesResult.txtFileUrlDPQP); - mAutoPilotLine.setStopMd5_dpqp(routesResult.txtFileMd5DPQP); - mAutoPilotLine.setTimestamp_dpqp(routesResult.contrailSaveTimeDPQP); + mAutoPilotLine.setVehicleModel(routesResult.carModel==null?"":routesResult.carModel); } } } From 0f4eb095466e0b21604b1cc72c2b99b9db0af7aa Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 13 Nov 2024 10:53:30 +0800 Subject: [PATCH 04/31] =?UTF-8?q?[6.7.3]=20[fix]=20[offline=20UI=E5=B1=95?= =?UTF-8?q?=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../driver/src/main/res/layout/offline_base_fragment.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OCH/offline/driver/src/main/res/layout/offline_base_fragment.xml b/OCH/offline/driver/src/main/res/layout/offline_base_fragment.xml index 34c7b6a068..64b4c69814 100644 --- a/OCH/offline/driver/src/main/res/layout/offline_base_fragment.xml +++ b/OCH/offline/driver/src/main/res/layout/offline_base_fragment.xml @@ -72,11 +72,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_71" - app:layout_constraintEnd_toEndOf="@+id/viewLimitingVelocity" + app:layout_constraintEnd_toEndOf="parent" app:layout_goneMarginEnd="40dp" app:layout_goneMarginTop="@dimen/dp_236" android:visibility="invisible" - app:layout_constraintTop_toBottomOf="@+id/viewLimitingVelocity"/> + app:layout_constraintTop_toBottomOf="@+id/ivCameraIcon"/> Date: Wed, 13 Nov 2024 11:21:58 +0800 Subject: [PATCH 05/31] =?UTF-8?q?[6.7.3]=20[fix]=20[=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/shuttle_weak_base_fragment.xml | 2 +- OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml | 2 +- .../src/main/res/layout/unmanned_taxi_base_fragment.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml index c06ce1320a..ca6121f7c8 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml @@ -7,7 +7,7 @@ diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml index 0122d3af7d..a71da62b6f 100644 --- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml +++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml @@ -7,7 +7,7 @@ diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml index da0470911f..85d7e6d4f1 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml @@ -8,7 +8,7 @@ From 74546bf626ad541578eb934cc3a5920eb276fa14 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 13 Nov 2024 16:31:15 +0800 Subject: [PATCH 06/31] =?UTF-8?q?[6.7.3]=20[fix]=20[=E8=87=AA=E9=A9=BE?= =?UTF-8?q?=E4=B8=AD=E5=90=AF=E5=8A=A8=E8=87=AA=E9=A9=BE=E7=9A=84=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E6=83=85=E5=86=B5=E3=80=81=E6=97=A5=E5=BF=97=E7=BB=A7?= =?UTF-8?q?=E7=BB=AD=E4=B8=8A=E6=8A=A5=20UI=E4=BF=AE=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/module/wigets/autopilot/AutopilotStateModel.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt index 80a50bbcdc..10ddb920c9 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt @@ -159,7 +159,11 @@ class AutopilotStateModel : ViewModel(), IOchAutopilotStatusListener, ILineCall override fun startAutopilotFailure(startFailedCode: String?, startFailedMessage: String?) { OchChainLogManager.writeChainLog("自驾信息","底盘强制失败原因：${startFailedCode}_${startFailedMessage}") - startAutopilotFail() + if(OchAutoPilotStatusListenerManager.autopilotState == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ + autopilotStateChange() + }else { + startAutopilotFail() + } } private fun startAutopilotFail(){ From e22821e7c8ec05fdb1e3339fd0ceb62053a2f175 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 14 Nov 2024 11:09:03 +0800 Subject: [PATCH 07/31] =?UTF-8?q?[6.7.3]=20[fix]=20[taxi=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=87=8D=E8=AF=95=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt index fc0bc0cee0..6f7aec6b0c 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt @@ -58,6 +58,7 @@ import com.mogo.och.common.module.map.AmapNaviToDestinationModel import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil.coordinateConverterWgsToGcjLocations import com.mogo.och.common.module.utils.OCHThreadPoolManager +import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.data.bean.LineInfo import com.mogo.och.data.taxi.QueryCarOrderByNoRespBean @@ -637,6 +638,9 @@ object TaxiTaskModel { ToastUtils.showShort("到站接口请求出现异常,请稍后重试") DebugView.printErrorMsg("[上报ArriveSite] 到站接口请求出现异常,请稍后重试") } + RxUtils.createSubscribe { + submitArriveSite(siteId, isArriveAtEndSite,isArrivedNearestStation) + } } override fun onFail(code: Int, msg: String?) { @@ -644,6 +648,11 @@ object TaxiTaskModel { DebugView.printErrorMsg("[上报ArriveSite] failed, code=$code, msg=$msg") d(TAG, "code=$code msg=$msg") ToastUtils.showShort("到站接口请求出现异常,请稍后重试,code=$code msg=$msg") + if(msg?.contains("驾舱操作过快，请稍后重试")==true){ + RxUtils.createSubscribe { + submitArriveSite(siteId, isArriveAtEndSite,isArrivedNearestStation) + } + } } }) } From 8016638ac6de0f9aaa59d2052b9720146fb82c0d Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 14 Nov 2024 11:24:08 +0800 Subject: [PATCH 08/31] =?UTF-8?q?[6.7.3]=20[fix]=20[=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E7=89=88=E6=9C=AC=E4=B8=8D=E5=85=BC=E5=AE=B9=20?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E9=87=8D=E5=BB=BA=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt index a765107464..06a27df739 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt @@ -90,6 +90,7 @@ abstract class MyDataBase : RoomDatabase() { ) .addMigrations(Migration1_2(1,2)) .addMigrations(Migration2_3(2,3)) + .fallbackToDestructiveMigration() .build() } val ROOT_PATH = Environment.getExternalStorageDirectory().absolutePath + File.separator + "Mogo" + File.separator + "APP_cache" + File.separator //程序外部存储跟目录 From 341303fe8c6ad38a276edcbec00664beefae3e13 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Thu, 14 Nov 2024 17:37:51 +0800 Subject: [PATCH 09/31] =?UTF-8?q?[6.7.2]=201=E3=80=81=E4=BF=AE=E5=A4=8DB2?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=9B=A0=E7=89=A9=E7=90=86=E8=BE=B9=E6=A1=86?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=A1=B6=E9=83=A8Logo=E9=81=AE=E7=9B=96?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shuttle_p_m2_status_bar_logo.png | Bin 2951 -> 3327 bytes .../layout/shuttle_p_m2_view_status_bar.xml | 86 +++++++++--------- .../shuttle_p_m2_status_bar_logo.png | Bin 0 -> 5990 bytes .../shuttle_p_m2_status_bar_logo.png | Bin 5788 -> 0 bytes .../shuttle_p_m2_status_bar_logo.png | Bin 0 -> 5088 bytes .../shuttle_p_m2_status_bar_logo.png | Bin 5028 -> 0 bytes 6 files changed, 44 insertions(+), 42 deletions(-) create mode 100644 skin/DeQing-skin/src/main/res/drawable-nodpi/shuttle_p_m2_status_bar_logo.png delete mode 100644 skin/DeQing-skin/src/main/res/drawable-xhdpi/shuttle_p_m2_status_bar_logo.png create mode 100644 skin/YiXin-skin/src/main/res/drawable-nodpi/shuttle_p_m2_status_bar_logo.png delete mode 100644 skin/YiXin-skin/src/main/res/drawable-xhdpi/shuttle_p_m2_status_bar_logo.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png b/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png index 1f6ea692f5bdbd20cf828b70212faf6277caa267..71d8a4bdaa430962b20ca839ec7adf6cac3dcaa0 100644 GIT binary patch delta 3290 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 Y0mI~HS3fZm3jhEB07*qoM6N<$f`A$(1^@s6 delta 2911 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 + android:layout_height="@dimen/dp_60" + tools:ignore="MissingDefaultResource" + tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"> + android:layout_marginStart="@dimen/dp_40" + app:layout_constraintBottom_toBottomOf="@+id/iv_logon" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@+id/iv_logon" + app:wifi_size="@dimen/dp_18" /> + android:layout_marginStart="@dimen/dp_32" + android:src="@drawable/shuttle_p_m2_blue_tooth_open" + app:layout_constraintBottom_toBottomOf="@+id/iv_logon" + app:layout_constraintStart_toEndOf="@+id/wifiStateView" + app:layout_constraintTop_toTopOf="@+id/iv_logon" /> + android:layout_marginStart="@dimen/dp_40" + android:src="@drawable/driver_connect_statis" + app:layout_constraintBottom_toBottomOf="@+id/iv_logon" + app:layout_constraintStart_toEndOf="@+id/blueToothView" + app:layout_constraintTop_toTopOf="@+id/iv_logon" /> + android:maxHeight="@dimen/dp_8" + android:minHeight="@dimen/dp_8" + android:progressDrawable="@drawable/shuttle_p_m2_power_seekbar_style" + app:layout_constraintBottom_toBottomOf="@+id/iv_logon" + app:layout_constraintRight_toLeftOf="@+id/tv_power_cos" + app:layout_constraintTop_toTopOf="@+id/iv_logon" /> + android:layout_height="wrap_content" + android:layout_marginRight="@dimen/dp_40" + android:textColor="@color/shuttle_p_m2_power_tv_color" + android:textSize="@dimen/dp_18" + app:layout_constraintBottom_toBottomOf="@+id/iv_logon" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="@+id/iv_logon" /> + android:src="@drawable/shuttle_p_m2_status_bar_logo" + app:isUseSkin="true" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> - - \ No newline at end of file + diff --git a/skin/DeQing-skin/src/main/res/drawable-nodpi/shuttle_p_m2_status_bar_logo.png b/skin/DeQing-skin/src/main/res/drawable-nodpi/shuttle_p_m2_status_bar_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..4253937d1ccfea751cc0b24775bf08a4d370861a GIT binary patch literal 5990 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 az+VATUXIfRdv+550000 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 literal 0 HcmV?d00001 diff --git a/skin/YiXin-skin/src/main/res/drawable-xhdpi/shuttle_p_m2_status_bar_logo.png b/skin/YiXin-skin/src/main/res/drawable-xhdpi/shuttle_p_m2_status_bar_logo.png deleted file mode 100644 index 6029163ee7d75da12efd9c4a392722080fc6c63e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5028 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 Date: Thu, 14 Nov 2024 18:54:38 +0800 Subject: [PATCH 10/31] =?UTF-8?q?[6.7.3]=20[fix]=20[event=20=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E6=8E=A5=E5=8F=A3=E6=8C=89=E7=85=A7=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/weaknet/model/EventModel.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt index 7827658f17..5faf76a06d 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt @@ -55,6 +55,9 @@ object EventModel : EventDb.EventCallback { private fun updateEvent(){ + if(isUpdating.get()){ + return + } isUpdating.set(true) createDefault.onNext(isUpdating.get()) ThreadUtils.getSinglePool().submit { From 7b942cde7440bf545459aacc2bfc3b0cf3107f02 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 14 Nov 2024 18:58:18 +0800 Subject: [PATCH 11/31] =?UTF-8?q?[6.7.3]=20[fix]=20[writeversion=20?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=90=8E=20?= =?UTF-8?q?=E5=86=8D=E5=86=99=E5=85=A5=E4=B8=8A=E6=8A=A5=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/weaknet/model/EventModel.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt index 5faf76a06d..ae731df66f 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt @@ -75,6 +75,7 @@ object EventModel : EventDb.EventCallback { override fun onSuccess(data: BaseData?) { waitUpdateEvent.forEach { it.updateStatus = EventDataBean.updated + it.writeVersion = System.currentTimeMillis() } OchChainLogManager.writeChainLogDb("上报event成功","$transformDb2Net ${Thread.currentThread().name}") EventDb.saveUpdateSuccess(waitUpdateEvent) From 56315a27e2e8d73eb68fbe68f531be8b5dd00a73 Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 14 Nov 2024 19:42:56 +0800 Subject: [PATCH 12/31] =?UTF-8?q?[6.7.3][=E8=BF=90=E8=90=A5=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF]=20=E4=BF=AE=E6=AD=A3=E7=BB=BF=E6=B3=A2=E9=80=9A?= =?UTF-8?q?=E8=A1=8C=E5=BC=80=E5=85=B3=E7=8A=B6=E6=80=81=E6=A0=87=E8=AE=B0?= =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 3d5ed6d25d..f6e84b1335 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 @@ -521,7 +521,7 @@ internal object V2NIdentifyDrawer: IEventDismissListener { } private fun drawGreenWave(crossSpeed: V2nCrossSpeed) { - if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nTotalSwitch) { + if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nTotalSwitch && FunctionBuildConfig.v2nGreenWave) { handler.removeMessages(MSG_WHAT_DRAW_GREEN_WAVE) handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_GREEN_WAVE, crossSpeed)) } @@ -587,4 +587,4 @@ internal object V2NIdentifyDrawer: IEventDismissListener { // val targetIds = event.exts.split(",") // } } -} \ No newline at end of file +} From a8259b75100afcba107f21416d6205bf1b10f386 Mon Sep 17 00:00:00 2001 From: donghongyu-pc Date: Thu, 14 Nov 2024 19:49:21 +0800 Subject: [PATCH 13/31] =?UTF-8?q?[6.7.3]=201=E3=80=81=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B9=98=E5=AE=A2=E5=B1=8F=E5=B9=95=E7=9A=84=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=A0=8F=E9=AB=98=E5=BA=A6=EF=BC=8C=E9=98=B2=E6=AD=A2=E8=A2=AB?= =?UTF-8?q?=E9=81=AE=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt | 2 +- .../src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt index d758473488..2d4be3d1d2 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt @@ -53,7 +53,7 @@ class M2StatusBarView @JvmOverloads constructor( super.onAttachedToWindow() post { val params: ViewGroup.LayoutParams = getLayoutParams() - params.height = AutoSizeUtils.dp2px(context,40f) + params.height = AutoSizeUtils.dp2px(context,60f) layoutParams = params } //添加view控制 diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml b/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml index 892b867bf3..8d106b4337 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml +++ b/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml @@ -74,9 +74,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/dp_7" - android:maxWidth="@dimen/dp_281" - android:maxHeight="@dimen/dp_32" - android:scaleType="fitXY" android:src="@drawable/shuttle_p_m2_status_bar_logo" app:isUseSkin="true" app:layout_constraintBottom_toBottomOf="parent" From 412452d5ac761641e10d973d79fc45be6b30a323 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 15 Nov 2024 10:33:56 +0800 Subject: [PATCH 14/31] =?UTF-8?q?[6.7.3]=20[fix]=20[=E6=B7=BB=E5=8A=A0=20m?= =?UTF-8?q?sgId=E5=92=8Cupdate=5Ftime]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/weaknet/model/EventModel.kt | 3 ++- .../och/weaknet/repository/db/MyDataBase.kt | 20 ++++++++++++++++++- .../repository/db/bean/EventDataBean.kt | 8 +++++++- .../repository/db/repository/EventDb.kt | 5 +++++ 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt index ae731df66f..daa2818b82 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt @@ -56,6 +56,7 @@ object EventModel : EventDb.EventCallback { private fun updateEvent(){ if(isUpdating.get()){ + OchChainLogManager.writeChainLogDb("上报event","正在上传 等待下一次轮训 ${Thread.currentThread().name}") return } isUpdating.set(true) @@ -75,7 +76,7 @@ object EventModel : EventDb.EventCallback { override fun onSuccess(data: BaseData?) { waitUpdateEvent.forEach { it.updateStatus = EventDataBean.updated - it.writeVersion = System.currentTimeMillis() + it.upDateTime = System.currentTimeMillis() } OchChainLogManager.writeChainLogDb("上报event成功","$transformDb2Net ${Thread.currentThread().name}") EventDb.saveUpdateSuccess(waitUpdateEvent) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt index 06a27df739..3d6e448dc8 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt @@ -31,7 +31,7 @@ import java.io.File //entities指定该数据库有哪些表，多张表就逗号分隔 //version指定数据库版本号，升级时需要用到 //数据库继承自RoomDatabase -@Database(entities = [ContrailDataBean::class, LineDataBean::class, SiteDataBean::class, TaskDataBean::class, TaskSiteDataBean::class, EventDataBean::class], version = 3) +@Database(entities = [ContrailDataBean::class, LineDataBean::class, SiteDataBean::class, TaskDataBean::class, TaskSiteDataBean::class, EventDataBean::class], version = 4) abstract class MyDataBase : RoomDatabase() { override fun getOpenHelper(): SupportSQLiteOpenHelper { @@ -90,6 +90,8 @@ abstract class MyDataBase : RoomDatabase() { ) .addMigrations(Migration1_2(1,2)) .addMigrations(Migration2_3(2,3)) + .addMigrations(Migration3_4(3,4)) + .addMigrations(Migration2_4(2,4)) .fallbackToDestructiveMigration() .build() } @@ -115,4 +117,20 @@ abstract class MyDataBase : RoomDatabase() { database.execSQL("ALTER TABLE ${TaskSiteDataBean.usedTaskDataTable} ADD COLUMN videoList TEXT"); } } + + class Migration3_4(val startVersion:Int,val endVersion:Int): Migration(startVersion,endVersion) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE ${EventDataBean.evnetDataTable} ADD COLUMN msg_id TEXT") + database.execSQL("ALTER TABLE ${EventDataBean.evnetDataTable} ADD COLUMN update_time INTEGER") + } + } + + class Migration2_4(val startVersion:Int,val endVersion:Int): Migration(startVersion,endVersion) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE ${SiteDataBean.siteDataTable} ADD COLUMN videoList TEXT"); + database.execSQL("ALTER TABLE ${TaskSiteDataBean.usedTaskDataTable} ADD COLUMN videoList TEXT"); + database.execSQL("ALTER TABLE ${EventDataBean.evnetDataTable} ADD COLUMN msg_id TEXT") + database.execSQL("ALTER TABLE ${EventDataBean.evnetDataTable} ADD COLUMN update_time INTEGER") + } + } } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/EventDataBean.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/EventDataBean.kt index 9481b8222c..427697e63c 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/EventDataBean.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/EventDataBean.kt @@ -80,7 +80,13 @@ data class EventDataBean( val eventSaveTime: Long = System.currentTimeMillis(), @ColumnInfo(name = "update_status", typeAffinity = ColumnInfo.INTEGER) - var updateStatus:Int = 0 + var updateStatus:Int = 0, + + @ColumnInfo(name = "msg_id", typeAffinity = ColumnInfo.TEXT) + var msgId:String = "", + + @ColumnInfo(name = "update_time", typeAffinity = ColumnInfo.INTEGER) + var upDateTime:Long = 0L, ) { companion object { diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/EventDb.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/EventDb.kt index a689f5d744..c375fe910a 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/EventDb.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/EventDb.kt @@ -1,6 +1,7 @@ package com.mogo.och.weaknet.repository.db.repository import com.mogo.och.common.module.biz.login.LoginStatusManager +import com.mogo.och.common.module.manager.cache.OchSPManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.utils.DateTimeUtil @@ -40,6 +41,7 @@ object EventDb: IDbRepository { event.driverId = LoginStatusManager.getLoginInfo()?.driverId?:-1 event.siteId = 0L event.seq = 0 + event.msgId = "${OchSPManager.getSn()}_${DateTimeUtil.getCurrentTimeStamp()}" BizLoopManager.runInIoThread { eventDataDao?.insert(event) eventCallback?.notifySyn() @@ -65,6 +67,7 @@ object EventDb: IDbRepository { event.siteId = siteId event.driverId = LoginStatusManager.getLoginInfo()?.driverId?:-1 event.seq = seq + event.msgId = "${OchSPManager.getSn()}_${DateTimeUtil.getCurrentTimeStamp()}" BizLoopManager.runInIoThread { eventDataDao?.insert(event) eventCallback?.notifySyn() @@ -90,6 +93,7 @@ object EventDb: IDbRepository { event.driverId = LoginStatusManager.getLoginInfo()?.driverId?:-1L event.siteId = siteId event.seq = seq + event.msgId = "${OchSPManager.getSn()}_${DateTimeUtil.getCurrentTimeStamp()}" BizLoopManager.runInIoThread { eventDataDao?.insert(event) eventCallback?.notifySyn() @@ -108,6 +112,7 @@ object EventDb: IDbRepository { event.driverId = LoginStatusManager.getLoginInfo()?.driverId?:-1L event.siteId = 0L event.seq = 0 + event.msgId = "${OchSPManager.getSn()}_${DateTimeUtil.getCurrentTimeStamp()}" BizLoopManager.runInIoThread { eventDataDao?.insert(event) eventCallback?.notifySyn() From ac73ef625bd9a6a21bbd851bf3acbfe89079f9ce Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 15 Nov 2024 10:38:08 +0800 Subject: [PATCH 15/31] =?UTF-8?q?[6.7.3]=20[fix]=20[media=20sn=20=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/common/module/wigets/media/MediaDataSourceManager.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaDataSourceManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaDataSourceManager.kt index 24d297a733..62e247f538 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaDataSourceManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaDataSourceManager.kt @@ -14,6 +14,7 @@ import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.NetworkUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler +import com.mogo.och.common.module.biz.lansocket.LoginLanPassengerSocket import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.network.OchCommonSubscribeImpl @@ -188,7 +189,7 @@ object MediaDataSourceManager { private fun getMediaDataFromMis(callback: OchCommonServiceCallback) { MediaPlayLogger.printInfoLog("getMediaDataFromMis：准备发送请求，driverSn=$driverSn") mNetworkService - ?.queryMediaDataFromMis(sn = driverSn, screenType = "2",) + ?.queryMediaDataFromMis(sn = LoginLanPassengerSocket.driverSn, screenType = "2",) ?.transformTry() ?.subscribe(OchCommonSubscribeImpl(context, callback, "getMediaDataFromMis")) } From 4d89031d225feea5342eb2b20be8b8392b45c5cc Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 15 Nov 2024 11:07:07 +0800 Subject: [PATCH 16/31] =?UTF-8?q?[6.7.3]=20[fix]=20[=E5=89=8D=E5=8F=B0?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=98=AF=E5=90=A6=E6=9C=89=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1=E3=80=81loading=20=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E5=A4=84=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../4.json | 601 ++++++++++++++++++ .../com/mogo/och/weaknet/model/OrderModel.kt | 4 + .../och/weaknet/repository/IRepository.kt | 4 + .../weaknet/repository/RepositoryManager.kt | 4 + .../repository/impl/WeaknetRepository.kt | 8 + .../och/weaknet/ui/bizswitch/SwitchBizView.kt | 14 +- .../weaknet/ui/bizswitch/SwtichBizeModel.kt | 6 + .../src/main/res/values/strings.xml | 1 + 8 files changed, 641 insertions(+), 1 deletion(-) create mode 100644 OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.repository.db.MyDataBase/4.json diff --git a/OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.repository.db.MyDataBase/4.json b/OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.repository.db.MyDataBase/4.json new file mode 100644 index 0000000000..1b4e1be442 --- /dev/null +++ b/OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.repository.db.MyDataBase/4.json @@ -0,0 +1,601 @@ +{ + "formatVersion": 1, + "database": { + "version": 4, + "identityHash": "ab78007616874d2ef2c8ce5b4fb27869", + "entities": [ + { + "tableName": "contrail_data_table", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `line_id` INTEGER, `csv_file_url` TEXT, `csv_file_md5` TEXT, `txt_file_url` TEXT, `txt_file_md5` TEXT, `contrail_save_time` INTEGER, `md5` TEXT)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "lineId", + "columnName": "line_id", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "csvFileUrl", + "columnName": "csv_file_url", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "csvFileMd5", + "columnName": "csv_file_md5", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "txtFileUrl", + "columnName": "txt_file_url", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "txtFileMd5", + "columnName": "txt_file_md5", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "contrailSaveTime", + "columnName": "contrail_save_time", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "md5", + "columnName": "md5", + "affinity": "TEXT", + "notNull": false + } + ], + "primaryKey": { + "columnNames": [ + "id" + ], + "autoGenerate": true + }, + "indices": [ + { + "name": "index_contrail_data_table_line_id", + "unique": false, + "columnNames": [ + "line_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_contrail_data_table_line_id` ON `${TABLE_NAME}` (`line_id`)" + }, + { + "name": "index_contrail_data_table_md5", + "unique": false, + "columnNames": [ + "md5" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_contrail_data_table_md5` ON `${TABLE_NAME}` (`md5`)" + } + ], + "foreignKeys": [] + }, + { + "tableName": "line_data_table", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `line_id` INTEGER, `line_name` TEXT, `end_station_name` TEXT, `line_get_time` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "lineId", + "columnName": "line_id", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "lineName", + "columnName": "line_name", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "endStationName", + "columnName": "end_station_name", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "linegetTime", + "columnName": "line_get_time", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "columnNames": [ + "id" + ], + "autoGenerate": true + }, + "indices": [ + { + "name": "index_line_data_table_line_id", + "unique": false, + "columnNames": [ + "line_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_line_data_table_line_id` ON `${TABLE_NAME}` (`line_id`)" + } + ], + "foreignKeys": [] + }, + { + "tableName": "site_data_table", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `site_id` INTEGER, `line_id` INTEGER, `name` TEXT, `name_kr` TEXT, `seq` INTEGER, `gcj_lon` REAL, `gcj_lat` REAL, `lon` REAL, `lat` REAL, `introduction` TEXT, `is_play_tts` INTEGER, `md5` TEXT, `videoList` TEXT)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "siteId", + "columnName": "site_id", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "lineId", + "columnName": "line_id", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "nameKr", + "columnName": "name_kr", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "seq", + "columnName": "seq", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "gcjLon", + "columnName": "gcj_lon", + "affinity": "REAL", + "notNull": false + }, + { + "fieldPath": "gcjLat", + "columnName": "gcj_lat", + "affinity": "REAL", + "notNull": false + }, + { + "fieldPath": "lon", + "columnName": "lon", + "affinity": "REAL", + "notNull": false + }, + { + "fieldPath": "lat", + "columnName": "lat", + "affinity": "REAL", + "notNull": false + }, + { + "fieldPath": "introduction", + "columnName": "introduction", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "isPlayTts", + "columnName": "is_play_tts", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "md5", + "columnName": "md5", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "videoListDB", + "columnName": "videoList", + "affinity": "TEXT", + "notNull": false + } + ], + "primaryKey": { + "columnNames": [ + "id" + ], + "autoGenerate": true + }, + "indices": [ + { + "name": "index_site_data_table_site_id", + "unique": false, + "columnNames": [ + "site_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_site_data_table_site_id` ON `${TABLE_NAME}` (`site_id`)" + }, + { + "name": "index_site_data_table_line_id", + "unique": false, + "columnNames": [ + "line_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_site_data_table_line_id` ON `${TABLE_NAME}` (`line_id`)" + } + ], + "foreignKeys": [] + }, + { + "tableName": "task_data_table", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `task_id` INTEGER, `line_id` INTEGER, `task_data` INTEGER, `task_start_time` INTEGER, `start_time` INTEGER, `end_time` INTEGER, `task_get_time` INTEGER NOT NULL, `status` INTEGER)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "taskId", + "columnName": "task_id", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "lineId", + "columnName": "line_id", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "taskDate", + "columnName": "task_data", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "taskStartTime", + "columnName": "task_start_time", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "startTime", + "columnName": "start_time", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "endtime", + "columnName": "end_time", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "taskgetTime", + "columnName": "task_get_time", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "status", + "columnName": "status", + "affinity": "INTEGER", + "notNull": false + } + ], + "primaryKey": { + "columnNames": [ + "id" + ], + "autoGenerate": true + }, + "indices": [ + { + "name": "index_task_data_table_task_id", + "unique": false, + "columnNames": [ + "task_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_task_data_table_task_id` ON `${TABLE_NAME}` (`task_id`)" + }, + { + "name": "index_task_data_table_line_id", + "unique": false, + "columnNames": [ + "line_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_task_data_table_line_id` ON `${TABLE_NAME}` (`line_id`)" + } + ], + "foreignKeys": [] + }, + { + "tableName": "used_task_data_table", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `task_id` INTEGER, `line_id` INTEGER, `site_id` INTEGER, `line_name` TEXT, `name` TEXT, `name_kr` TEXT, `seq` INTEGER, `gcj_lon` REAL, `gcj_lat` REAL, `lon` REAL, `lat` REAL, `driving_status` INTEGER, `leaving` INTEGER, `arrived_time` INTEGER, `leave_time` INTEGER, `introduction` TEXT, `is_play_tts` INTEGER, `event_save_time` INTEGER NOT NULL, `videoList` TEXT)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "taskId", + "columnName": "task_id", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "lineId", + "columnName": "line_id", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "siteId", + "columnName": "site_id", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "lineName", + "columnName": "line_name", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "nameKr", + "columnName": "name_kr", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "seq", + "columnName": "seq", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "gcjLon", + "columnName": "gcj_lon", + "affinity": "REAL", + "notNull": false + }, + { + "fieldPath": "gcjLat", + "columnName": "gcj_lat", + "affinity": "REAL", + "notNull": false + }, + { + "fieldPath": "lon", + "columnName": "lon", + "affinity": "REAL", + "notNull": false + }, + { + "fieldPath": "lat", + "columnName": "lat", + "affinity": "REAL", + "notNull": false + }, + { + "fieldPath": "drivingStatus", + "columnName": "driving_status", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "leaving", + "columnName": "leaving", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "arrivedTime", + "columnName": "arrived_time", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "leaveTime", + "columnName": "leave_time", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "introduction", + "columnName": "introduction", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "isPlayTts", + "columnName": "is_play_tts", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "eventSaveTime", + "columnName": "event_save_time", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "videoList", + "columnName": "videoList", + "affinity": "TEXT", + "notNull": false + } + ], + "primaryKey": { + "columnNames": [ + "id" + ], + "autoGenerate": true + }, + "indices": [], + "foreignKeys": [] + }, + { + "tableName": "event_data_table", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `event_type` TEXT, `lineId` INTEGER, `lineName` TEXT, `task_id` INTEGER, `task_start_time` INTEGER, `business_time` INTEGER, `write_version` INTEGER, `site_id` INTEGER, `seq` INTEGER, `driver_id` INTEGER, `event_save_time` INTEGER NOT NULL, `update_status` INTEGER NOT NULL, `msg_id` TEXT NOT NULL, `update_time` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "eventType", + "columnName": "event_type", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "lineId", + "columnName": "lineId", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "lineName", + "columnName": "lineName", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "taskId", + "columnName": "task_id", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "taskStartTime", + "columnName": "task_start_time", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "businessTime", + "columnName": "business_time", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "writeVersion", + "columnName": "write_version", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "siteId", + "columnName": "site_id", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "seq", + "columnName": "seq", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "driverId", + "columnName": "driver_id", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "eventSaveTime", + "columnName": "event_save_time", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "updateStatus", + "columnName": "update_status", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "msgId", + "columnName": "msg_id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "upDateTime", + "columnName": "update_time", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "columnNames": [ + "id" + ], + "autoGenerate": true + }, + "indices": [ + { + "name": "index_event_data_table_event_save_time", + "unique": false, + "columnNames": [ + "event_save_time" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_event_data_table_event_save_time` ON `${TABLE_NAME}` (`event_save_time`)" + } + ], + "foreignKeys": [] + } + ], + "views": [], + "setupQueries": [ + "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", + "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ab78007616874d2ef2c8ce5b4fb27869')" + ] + } +} \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt index acc8b5caac..b78c7fff71 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt @@ -457,6 +457,10 @@ object OrderModel { ToastUtils.showShort(ResourcesUtils.getString(R.string.shuttle_logout_error)) return@execute } + if(RepositoryManager.haveRunningTask()){ + ToastUtils.showShort(ResourcesUtils.getString(R.string.shuttle_logout_error_running)) + return@execute + } MapMakerManager.removeAllMapMarkerByOwner(TAG) BusTrajectoryManager.getInstance().stopTrajReqLoop(); LoginStatusManager.loginOut() diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/IRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/IRepository.kt index 63c45f2f9d..575f7f61df 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/IRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/IRepository.kt @@ -32,6 +32,10 @@ interface IRepository { fun reportCabinEvent(context: Context?, data: ShuttleEventRequest?, callback: OchCommonServiceCallback?) + fun haveRunningTask(): Boolean{ + return false + } + fun release() } \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt index 73f1a9439a..4f79fda2f0 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt @@ -96,6 +96,10 @@ object RepositoryManager { repository?.queryWriteoffCount(context,taskId,siteId,callback) } + fun haveRunningTask():Boolean{ + return repository?.haveRunningTask()?:false + } + fun haveDataWaitSyn(): Boolean { if(ProjectUtils.isSaas()&&AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) { diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/WeaknetRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/WeaknetRepository.kt index 6536b6d70f..9d8daaabdb 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/WeaknetRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/WeaknetRepository.kt @@ -337,6 +337,14 @@ class WeaknetRepository : IRepository { weakNetInterface?.reportCabinEvent(context,data,callback) } + override fun haveRunningTask(): Boolean { + if(LineModel.currentTask==null){ + return false + }else{ + return true + } + } + override fun release() { weakNetInterface = null CallerLogger.d(TAG,"重置 weakNetInterface") diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwitchBizView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwitchBizView.kt index 4c0bda28a9..6731c0d998 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwitchBizView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwitchBizView.kt @@ -7,10 +7,13 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.utils.ResourcesUtils +import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.wigets.WindowRelativeLayout import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.repository.db.bean.LineDataBean +import io.reactivex.disposables.Disposable import kotlinx.android.synthetic.main.shuttle_weak_switch_biz.view.loading_biz import kotlinx.android.synthetic.main.shuttle_weak_switch_biz.view.swtichLine import kotlinx.android.synthetic.main.shuttle_weak_switch_biz.view.swtichTask @@ -34,6 +37,8 @@ class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallbac private var viewModel: SwtichBizeModel?=null + private var queryTimeout: Disposable? = null + init { LayoutInflater.from(context).inflate(R.layout.shuttle_weak_switch_biz, this, true) @@ -57,9 +62,14 @@ class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallbac // 展示loading页面 override fun showLoadingView(){ startLoading = System.currentTimeMillis() + CallerLogger.d(TAG,"开始展示 lading 时间：${startLoading}") loading_biz.visibility = VISIBLE swtichLine.visibility = GONE swtichTask.visibility = GONE + queryTimeout = RxUtils.createSubscribe(10_1000) { + OchChainLogManager.writeChainLog("Loading超时","loading 展示了10s") + viewModel?.queryRuningTask() + } } @@ -78,8 +88,8 @@ class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallbac // 展示选择任务页面 override fun showSwitchTaskInfo() { + RxUtils.disposeSubscribe(queryTimeout) val endLoading = System.currentTimeMillis() - val dex = (100-(endLoading - startLoading)).takeIf { it>=0 }?:0 CallerLogger.d(TAG,"展示任务 lading 展示了 ${dex}毫秒") @@ -93,6 +103,7 @@ class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallbac // 展示选择线路页面 override fun showSwtichLineView() { + RxUtils.disposeSubscribe(queryTimeout) val endLoading = System.currentTimeMillis() val dex = (100-(endLoading - startLoading)).takeIf { it>=0 }?:0 CallerLogger.d(TAG,"展示线路 lading 展示了 ${dex}毫秒") @@ -106,6 +117,7 @@ class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallbac } // 展示正在进行的任务 override fun loadRunningTask() { + RxUtils.disposeSubscribe(queryTimeout) val endLoading = System.currentTimeMillis() val dex = (100-(endLoading - startLoading)).takeIf { it>=0 }?:0 CallerLogger.d(TAG,"展示运行中任务 lading 展示了 ${dex}毫秒") diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwtichBizeModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwtichBizeModel.kt index 3b8eff028a..aec2d1be72 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwtichBizeModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwtichBizeModel.kt @@ -36,6 +36,12 @@ class SwtichBizeModel : ViewModel(), IBusLinesCallback { } } + fun queryRuningTask(){ + ThreadUtils.getIoPool().execute { + OrderModel.queryBusRoutes() + } + } + fun loadingSwitchTask(lineInfo: LineDataBean) { d(LineModel.TAG, "loadingSwitchTask 查询线路的任务线路信息:${lineInfo}") viewCallback?.showSwitchTaskByLineInfo(lineInfo) diff --git a/OCH/shuttle/driver_weaknet/src/main/res/values/strings.xml b/OCH/shuttle/driver_weaknet/src/main/res/values/strings.xml index 0d9eb141fa..f72f9d99eb 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/values/strings.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/values/strings.xml @@ -47,6 +47,7 @@ 取消 请在网络良好的区域完成任务信息同步后退出 + 请结束任务后再退出登录 暂无任务 核销%1$d人 From 3f88018245008a623eb36f6901abf54f373c02df Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Fri, 15 Nov 2024 12:02:12 +0800 Subject: [PATCH 17/31] [6.8.0]fix IndexOutOfBoundsException --- .../workorder/adapter/TakeOverListAdapter.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/TakeOverListAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/TakeOverListAdapter.kt index 46b76449c1..a2f26adcfd 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/TakeOverListAdapter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/TakeOverListAdapter.kt @@ -45,11 +45,13 @@ class TakeOverListAdapter(private val context: Context): RecyclerView.Adapter Date: Fri, 15 Nov 2024 12:14:24 +0800 Subject: [PATCH 18/31] =?UTF-8?q?[6.7.3]=20[fix]=20[=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E5=8F=98=E6=9B=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../4.json | 10 +++++----- .../och/weaknet/repository/db/bean/EventDataBean.kt | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.repository.db.MyDataBase/4.json b/OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.repository.db.MyDataBase/4.json index 1b4e1be442..83d629ad24 100644 --- a/OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.repository.db.MyDataBase/4.json +++ b/OCH/shuttle/driver_weaknet/schemas/com.mogo.och.weaknet.repository.db.MyDataBase/4.json @@ -2,7 +2,7 @@ "formatVersion": 1, "database": { "version": 4, - "identityHash": "ab78007616874d2ef2c8ce5b4fb27869", + "identityHash": "1d1bd5c3b1770e4bc24252f26791f036", "entities": [ { "tableName": "contrail_data_table", @@ -479,7 +479,7 @@ }, { "tableName": "event_data_table", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `event_type` TEXT, `lineId` INTEGER, `lineName` TEXT, `task_id` INTEGER, `task_start_time` INTEGER, `business_time` INTEGER, `write_version` INTEGER, `site_id` INTEGER, `seq` INTEGER, `driver_id` INTEGER, `event_save_time` INTEGER NOT NULL, `update_status` INTEGER NOT NULL, `msg_id` TEXT NOT NULL, `update_time` INTEGER NOT NULL)", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `event_type` TEXT, `lineId` INTEGER, `lineName` TEXT, `task_id` INTEGER, `task_start_time` INTEGER, `business_time` INTEGER, `write_version` INTEGER, `site_id` INTEGER, `seq` INTEGER, `driver_id` INTEGER, `event_save_time` INTEGER NOT NULL, `update_status` INTEGER NOT NULL, `msg_id` TEXT, `update_time` INTEGER)", "fields": [ { "fieldPath": "id", @@ -563,13 +563,13 @@ "fieldPath": "msgId", "columnName": "msg_id", "affinity": "TEXT", - "notNull": true + "notNull": false }, { "fieldPath": "upDateTime", "columnName": "update_time", "affinity": "INTEGER", - "notNull": true + "notNull": false } ], "primaryKey": { @@ -595,7 +595,7 @@ "views": [], "setupQueries": [ "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ab78007616874d2ef2c8ce5b4fb27869')" + "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1d1bd5c3b1770e4bc24252f26791f036')" ] } } \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/EventDataBean.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/EventDataBean.kt index 427697e63c..bfd343051b 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/EventDataBean.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/EventDataBean.kt @@ -83,10 +83,10 @@ data class EventDataBean( var updateStatus:Int = 0, @ColumnInfo(name = "msg_id", typeAffinity = ColumnInfo.TEXT) - var msgId:String = "", + var msgId:String? = "", @ColumnInfo(name = "update_time", typeAffinity = ColumnInfo.INTEGER) - var upDateTime:Long = 0L, + var upDateTime:Long? = 0L, ) { companion object { From 260a881d86ade5000814b1767592a95feee14eca Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 15 Nov 2024 12:14:45 +0800 Subject: [PATCH 19/31] =?UTF-8?q?[6.7.3]=20[fix]=20[=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E8=AE=BE=E7=BD=AE=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/module/wigets/autopilot/AutopilotStateModel.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt index 10ddb920c9..22cc906d09 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt @@ -154,7 +154,11 @@ class AutopilotStateModel : ViewModel(), IOchAutopilotStatusListener, ILineCall override fun startAutopilotTimeOut() { OchChainLogManager.writeChainLog("自驾信息","启动自驾超时失败") - startAutopilotFail() + if(OchAutoPilotStatusListenerManager.autopilotState == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ + autopilotStateChange() + }else { + startAutopilotFail() + } } override fun startAutopilotFailure(startFailedCode: String?, startFailedMessage: String?) { From 4fccb7743cdec9fccba9d0170f4651db2b6fa390 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 13 Nov 2024 11:21:58 +0800 Subject: [PATCH 20/31] =?UTF-8?q?[6.7.3]=20[fix]=20[=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/shuttle_weak_base_fragment.xml | 2 +- OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml | 2 +- .../src/main/res/layout/unmanned_taxi_base_fragment.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml index c06ce1320a..ca6121f7c8 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml @@ -7,7 +7,7 @@ diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml index 0122d3af7d..a71da62b6f 100644 --- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml +++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml @@ -7,7 +7,7 @@ diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml index da0470911f..85d7e6d4f1 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml @@ -8,7 +8,7 @@ From 124f3642cbe86cd1c96beedad6f8e1f95bf74293 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 15 Nov 2024 14:41:04 +0800 Subject: [PATCH 21/31] =?UTF-8?q?[6.7.3]=20[fix]=20[msgid+null=20=E5=A4=84?= =?UTF-8?q?=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weaknet/bean/request/ShuttleEventRequest.kt | 5 +++-- .../weaknet/bean/response/BusRoutesResponse.kt | 15 ++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt index 0e10757b59..c68457ddab 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt @@ -17,7 +17,7 @@ data class ShuttleEventRequest(val requestId: String, val sn: String, val busine var tempEvent: Event?=null waitUpdateEvent.forEach { tempEvent = Event(it.eventType, - EventData(it.taskId,it.businessTime,it.writeVersion,it.siteId,it.seq,it.driverId) + EventData(it.taskId,it.businessTime,it.writeVersion,it.siteId,it.seq,it.driverId,it.msgId) ) eventList4Request.add(tempEvent!!) } @@ -35,5 +35,6 @@ data class EventData( var writeVersion: Long?, var siteId: Long?, var seq: Int?, - var driverId:Long? + var driverId:Long?, + var msgId:String? ) \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt index 59ac0563bc..3ca25f85b0 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt @@ -54,11 +54,16 @@ class BusRoutesResponse : BaseData() { temp?.seq = (taskAndsite.seq ?: 0) temp?.siteId = if (taskAndsite.siteId == null) 0 else taskAndsite.siteId!!.toInt() if(!taskAndsite.videoList.isNullOrEmpty()){ - val list = GsonUtils.fromJson>( - taskAndsite.videoList, - object : TypeToken?>() {}.type - ) - temp?.videoList = list.toMutableList() + try { + val list = GsonUtils.fromJson>( + taskAndsite.videoList, + object : TypeToken?>() {}.type + ) + temp?.videoList = list.toMutableList() + }catch (e:Exception){ + temp?.videoList = null + } + } result.add(temp!!) // 正在进行中的任务 From e66b8ec900f9719b057820d7fc738f198e222406 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 15 Nov 2024 15:52:15 +0800 Subject: [PATCH 22/31] =?UTF-8?q?[6.7.3]=20[fix]=20[add=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=A4=9A=E4=BD=99=E6=93=8D=E4=BD=9C]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/weaknet/ui/writeoff/WriteOffView.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/writeoff/WriteOffView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/writeoff/WriteOffView.kt index 22d3e2efa5..665c35d960 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/writeoff/WriteOffView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/writeoff/WriteOffView.kt @@ -6,11 +6,10 @@ import androidx.appcompat.widget.AppCompatTextView import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.commons.AbsMogoApplication -import com.mogo.commons.env.ProjectUtils -import com.mogo.eagle.core.data.config.FunctionBuildConfig -import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.repository.RepositoryManager +import com.mogo.och.weaknet.ui.taskrunning.TaskRunningAdapter class WriteOffView : AppCompatTextView, WriteOffViewModel.IwriteOffViewCallback { @@ -41,11 +40,9 @@ class WriteOffView : AppCompatTextView, WriteOffViewModel.IwriteOffViewCallback private fun startListenerWriteOff(){ viewModel?.setWriteOffCallback(this) - visibility = VISIBLE } private fun stopListenerWriteOff(){ viewModel?.setWriteOffCallback(null) - visibility = GONE if(RepositoryManager.supportWriteOff()) { val showText = AbsMogoApplication.getApp().getString(R.string.shuttle_write_off_count, 0) From f5a229c1f3a58f12ee1069a1d8e9441dd36587b7 Mon Sep 17 00:00:00 2001 From: donghongyu-pc Date: Fri, 15 Nov 2024 16:13:51 +0800 Subject: [PATCH 23/31] =?UTF-8?q?[6.7.2]=201=E3=80=81=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E7=9A=84Pad=E5=B1=8F=E5=B9=95?= =?UTF-8?q?=E9=80=82=E9=85=8D=E5=8F=B3=E4=B8=8B=E8=A7=92=E5=B0=8F=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E6=98=BE=E7=A4=BA=E8=B4=B4=E8=BE=B9=20=E6=97=A7?= =?UTF-8?q?=E6=AC=BE=EF=BC=9ALenovo=20TB-J706F=20=20=20=201600*2560=20?= =?UTF-8?q?=E6=96=B0=E6=AC=BE=EF=BC=9ATB138FC=20=20=20=201536*2560?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/map/MapContainerLayout.kt | 10 ++++++++++ .../src/main/res/layout/view_map_container.xml | 12 ++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt index 6d508bcc45..e24cc16dc4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt @@ -12,6 +12,8 @@ import android.view.LayoutInflater import android.view.View import android.view.animation.AccelerateDecelerateInterpolator import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.view.marginBottom +import androidx.core.view.marginEnd import androidx.core.view.marginStart import androidx.core.view.marginTop import com.mogo.eagle.core.data.config.FunctionBuildConfig @@ -44,6 +46,8 @@ class MapContainerLayout @JvmOverloads constructor( private var mapMaxHeight = 0 private var maxMarginStart = 0 private var maxMarginTop = 0 + private var maxMarginEnd = 0 + private var maxMarginBottom = 0 private var zoomInAnimator: ValueAnimator? = null private var zoomOutAnimator: ValueAnimator? = null @@ -102,6 +106,8 @@ class MapContainerLayout @JvmOverloads constructor( mapMinHeight = overMapView.height maxMarginStart = overMapView.marginStart maxMarginTop = overMapView.marginTop + maxMarginEnd = overMapView.marginEnd + maxMarginBottom = overMapView.marginBottom } override fun onAttachedToWindow() { @@ -164,6 +170,8 @@ class MapContainerLayout @JvmOverloads constructor( layoutParams.height = evaluator.evaluate(it.animatedFraction, mapMinHeight, mapMaxHeight) layoutParams.leftMargin = evaluator.evaluate(it.animatedFraction, maxMarginStart, 0) layoutParams.topMargin = evaluator.evaluate(it.animatedFraction, maxMarginTop, 0) + layoutParams.rightMargin = evaluator.evaluate(it.animatedFraction, maxMarginEnd, 0) + layoutParams.bottomMargin = evaluator.evaluate(it.animatedFraction, maxMarginBottom, 0) } } zoomInAnimator?.interpolator = AccelerateDecelerateInterpolator() @@ -181,6 +189,8 @@ class MapContainerLayout @JvmOverloads constructor( layoutParams.height = evaluator.evaluate(it.animatedFraction, mapMaxHeight, mapMinHeight) layoutParams.leftMargin = evaluator.evaluate(it.animatedFraction, 0, maxMarginStart) layoutParams.topMargin = evaluator.evaluate(it.animatedFraction, 0, maxMarginTop) + layoutParams.rightMargin = evaluator.evaluate(it.animatedFraction, 0, maxMarginEnd) + layoutParams.bottomMargin = evaluator.evaluate(it.animatedFraction, 0, maxMarginBottom) } } zoomOutAnimator?.interpolator = AccelerateDecelerateInterpolator() diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml index 71e98b3e88..7551ca0d15 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml @@ -23,21 +23,21 @@ android:id="@+id/overMapView" android:layout_width="270dp" android:layout_height="270dp" - android:layout_marginStart="1530dp" - android:layout_marginTop="1204dp" + android:layout_marginEnd="40dp" + android:layout_marginBottom="40dp" + android:focusable="false" + android:focusableInTouchMode="false" app:bottomPadding="160" app:compassDrawable="@drawable/taxt_u_p_map_car_light" app:endPointDrawable="@drawable/taxi_overmap_endpoint" app:globalPathColor="#39BA90" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" app:leftPadding="70" app:mapStyleExtraPath="over_view_style_extra.data" app:mapStylePath="over_view_style.data" app:resetDrawable="@null" app:rightPadding="70" - android:focusable="false" - android:focusableInTouchMode="false" app:roadRangeDrawable="@drawable/taxi_overmap_road_range" app:roadTrajectoryDrawable="@drawable/taxi_orvermap_road_trajectory" app:startPointDrawable="@drawable/taxi_overmap_startpoint" From f5ae2824798c78b7718147854069aa44969195ee Mon Sep 17 00:00:00 2001 From: donghongyu-pc Date: Fri, 15 Nov 2024 16:13:51 +0800 Subject: [PATCH 24/31] =?UTF-8?q?[6.7.2]=201=E3=80=81=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E7=9A=84Pad=E5=B1=8F=E5=B9=95?= =?UTF-8?q?=E9=80=82=E9=85=8D=E5=8F=B3=E4=B8=8B=E8=A7=92=E5=B0=8F=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E6=98=BE=E7=A4=BA=E8=B4=B4=E8=BE=B9=20=E6=97=A7?= =?UTF-8?q?=E6=AC=BE=EF=BC=9ALenovo=20TB-J706F=20=20=20=201600*2560=20?= =?UTF-8?q?=E6=96=B0=E6=AC=BE=EF=BC=9ATB138FC=20=20=20=201536*2560?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/map/MapContainerLayout.kt | 10 ++++++++++ .../src/main/res/layout/view_map_container.xml | 12 ++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt index 6d508bcc45..e24cc16dc4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt @@ -12,6 +12,8 @@ import android.view.LayoutInflater import android.view.View import android.view.animation.AccelerateDecelerateInterpolator import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.view.marginBottom +import androidx.core.view.marginEnd import androidx.core.view.marginStart import androidx.core.view.marginTop import com.mogo.eagle.core.data.config.FunctionBuildConfig @@ -44,6 +46,8 @@ class MapContainerLayout @JvmOverloads constructor( private var mapMaxHeight = 0 private var maxMarginStart = 0 private var maxMarginTop = 0 + private var maxMarginEnd = 0 + private var maxMarginBottom = 0 private var zoomInAnimator: ValueAnimator? = null private var zoomOutAnimator: ValueAnimator? = null @@ -102,6 +106,8 @@ class MapContainerLayout @JvmOverloads constructor( mapMinHeight = overMapView.height maxMarginStart = overMapView.marginStart maxMarginTop = overMapView.marginTop + maxMarginEnd = overMapView.marginEnd + maxMarginBottom = overMapView.marginBottom } override fun onAttachedToWindow() { @@ -164,6 +170,8 @@ class MapContainerLayout @JvmOverloads constructor( layoutParams.height = evaluator.evaluate(it.animatedFraction, mapMinHeight, mapMaxHeight) layoutParams.leftMargin = evaluator.evaluate(it.animatedFraction, maxMarginStart, 0) layoutParams.topMargin = evaluator.evaluate(it.animatedFraction, maxMarginTop, 0) + layoutParams.rightMargin = evaluator.evaluate(it.animatedFraction, maxMarginEnd, 0) + layoutParams.bottomMargin = evaluator.evaluate(it.animatedFraction, maxMarginBottom, 0) } } zoomInAnimator?.interpolator = AccelerateDecelerateInterpolator() @@ -181,6 +189,8 @@ class MapContainerLayout @JvmOverloads constructor( layoutParams.height = evaluator.evaluate(it.animatedFraction, mapMaxHeight, mapMinHeight) layoutParams.leftMargin = evaluator.evaluate(it.animatedFraction, 0, maxMarginStart) layoutParams.topMargin = evaluator.evaluate(it.animatedFraction, 0, maxMarginTop) + layoutParams.rightMargin = evaluator.evaluate(it.animatedFraction, 0, maxMarginEnd) + layoutParams.bottomMargin = evaluator.evaluate(it.animatedFraction, 0, maxMarginBottom) } } zoomOutAnimator?.interpolator = AccelerateDecelerateInterpolator() diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml index 71e98b3e88..7551ca0d15 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml @@ -23,21 +23,21 @@ android:id="@+id/overMapView" android:layout_width="270dp" android:layout_height="270dp" - android:layout_marginStart="1530dp" - android:layout_marginTop="1204dp" + android:layout_marginEnd="40dp" + android:layout_marginBottom="40dp" + android:focusable="false" + android:focusableInTouchMode="false" app:bottomPadding="160" app:compassDrawable="@drawable/taxt_u_p_map_car_light" app:endPointDrawable="@drawable/taxi_overmap_endpoint" app:globalPathColor="#39BA90" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" app:leftPadding="70" app:mapStyleExtraPath="over_view_style_extra.data" app:mapStylePath="over_view_style.data" app:resetDrawable="@null" app:rightPadding="70" - android:focusable="false" - android:focusableInTouchMode="false" app:roadRangeDrawable="@drawable/taxi_overmap_road_range" app:roadTrajectoryDrawable="@drawable/taxi_orvermap_road_trajectory" app:startPointDrawable="@drawable/taxi_overmap_startpoint" From 1bd92600c3232d923f610248af44752fef33816e Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 15 Nov 2024 16:27:25 +0800 Subject: [PATCH 25/31] =?UTF-8?q?[6.7.3]=20[fix]=20[=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=20=E4=BF=9D=E7=95=99=E6=AD=A3?= =?UTF-8?q?=E5=9C=A8=E6=89=A7=E8=A1=8C=E5=92=8C=E5=B7=B2=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weaknet/repository/db/repository/TaskDb.kt | 9 ++++++++- .../hmi/ui/setting/DebugSettingView.kt | 18 ++++++++++++++++++ .../src/main/res/layout/view_debug_setting.xml | 13 ++++++++++++- 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt index c3e4d98a37..c56453a56f 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt @@ -56,8 +56,15 @@ object TaskDb : IDbRepository { taskDataDao.insert(*needAddDatas.toTypedArray()) } if (needMinusDatas.isNotEmpty()) { + val needSaveTask = mutableListOf() // 删除任务 - taskDataDao.delete(*needMinusDatas.toTypedArray()) + needMinusDatas.forEach { + if(it.status==TaskDataBean.useing||it.status==TaskDataBean.used){ + needSaveTask.add(it) + } + } + val failneedMinusDatas = needMinusDatas-needSaveTask + taskDataDao.delete(*failneedMinusDatas.toTypedArray()) } } } 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 e4c3bc988c..909a5e1e78 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 @@ -9,6 +9,8 @@ import android.content.Intent import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Build +import android.os.Environment +import android.os.Environment.* import android.os.Process import android.text.Html import android.text.TextUtils @@ -115,6 +117,7 @@ import com.mogo.eagle.core.utilcode.util.AppUtils import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.eagle.core.utilcode.util.CommonUtils import com.mogo.eagle.core.utilcode.util.DeviceUtils +import com.mogo.eagle.core.utilcode.util.FileUtils import com.mogo.eagle.core.utilcode.util.KeyboardUtils import com.mogo.eagle.core.utilcode.util.NetworkUtils import com.mogo.eagle.core.utilcode.util.ParseVersionUtils @@ -140,6 +143,7 @@ import kotlinx.android.synthetic.main.view_debug_setting.view.btChangeEnv import kotlinx.android.synthetic.main.view_debug_setting.view.btnAppReboot import kotlinx.android.synthetic.main.view_debug_setting.view.btnBrakeThreshold import kotlinx.android.synthetic.main.view_debug_setting.view.btnConnectServerIp +import kotlinx.android.synthetic.main.view_debug_setting.view.btnDeleteDB import kotlinx.android.synthetic.main.view_debug_setting.view.btnDisconnectIpc import kotlinx.android.synthetic.main.view_debug_setting.view.btnDrawFusion import kotlinx.android.synthetic.main.view_debug_setting.view.btnHdVisualAdjust @@ -315,6 +319,8 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import mogo.telematics.pad.MessagePad import mogo_msg.MogoReportMsg +import java.io.File +import java.io.File.* import java.text.SimpleDateFormat import java.util.Date import java.util.Timer @@ -1375,6 +1381,18 @@ internal class DebugSettingView @JvmOverloads constructor( CallerAutoPilotControlManager.connectSpecifiedServer(ip) } } + btnDeleteDB.setOnClickListener { + try{ + val ROOT_PATH = getExternalStorageDirectory().absolutePath + separator + "Mogo" + separator + "APP_cache" + separator + val dbDir = File(ROOT_PATH) + if(dbDir.exists()&&dbDir.isDirectory){ + FileUtils.deleteFilesInDir(dbDir) + } + }catch (e:Exception){ + + } + + } //是否开启异常上报 tbReportWarning.isChecked = FunctionBuildConfig.isReportWarning 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 e7453824c8..cf29f61bc1 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 @@ -1328,12 +1328,23 @@ +