From 8a636d1e5c5c274c3ba1b19bd5ba45cfc2927015 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 7 Dec 2023 17:03:09 +0800 Subject: [PATCH 1/5] [6.2.4] [fix] [set value] --- .../src/main/java/com/mogo/och/data/bean/BusRoutesResult.java | 2 +- .../driver/src/main/java/com/mogo/och/bus/model/OrderModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusRoutesResult.java b/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusRoutesResult.java index 59b6a1cc87..3e9a4cffc5 100644 --- a/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusRoutesResult.java +++ b/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusRoutesResult.java @@ -57,7 +57,7 @@ public class BusRoutesResult { } public void setSite(List site) { - this.sites = sites; + this.sites = site; } public long getTaskTime() { diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java index 6ecc30ac08..b43791e1c5 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java @@ -700,7 +700,7 @@ public class OrderModel { beanPre.setLeaving(false); sites.set(currentIndex -1,beanPre); } - busRoutesResult.setSite(sites); + //busRoutesResult.setSite(sites); pushCacheTransferData(busRoutesResult); From 03eab8ba7f5ed0ee24c51a6a4f0cb1f31188aa0c Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 7 Dec 2023 19:30:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[6.2.4]=20[charter]=20[=E8=BF=98=E8=BD=A6?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=90=8E=E9=80=80=E5=87=BA=E8=87=AA=E9=A9=BE?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt index a5dee16a6a..afa4cbcab6 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt @@ -632,6 +632,7 @@ class DriverM1Model { if (data != null && data.code == 0){ mOrderCallback?.updateReturnCarStatus(true) queryCurrentServiceStatus() + CallerAutoPilotControlManager.cancelAutoPilot() } } From 31ec814578f6e9caff0fd0861ce281c2077e507a Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 11 Dec 2023 16:24:12 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[6.2.4]=E5=BD=95=E5=8C=85=E6=88=AA=E5=9B=BE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B5=B7=E5=A7=8B=E7=82=B9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/biz/InitiativeBadCaseWindow.kt | 4 ++-- .../badcase/biz/PassiveBadCaseWindow.kt | 4 ++-- .../badcase/util/RecordBitmapUtils.kt | 5 +++-- .../autopilot/CallerAutoPilotStatusListenerManager.kt | 8 ++++++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt index 7371773efb..b9d63b1296 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt @@ -665,9 +665,9 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList else->"自驾状态:未知" } val speed = "当前车速:${BadCaseConfig.currentSpeed}" + val site = "起点:${CallerAutoPilotStatusListenerManager.getLineStartName()};终点:${CallerAutoPilotStatusListenerManager.getLineEndName()}" - - val outBitmap = RecordBitmapUtils.drawTextOnBitmap(bitmap,time,lineId,state,speed, + val outBitmap = RecordBitmapUtils.drawTextOnBitmap(bitmap,time,lineId,state,speed,site, BadCaseConfig.gpsStatus,BadCaseConfig.tracingStatus,BadCaseConfig.socketStatus ,BadCaseConfig.newFMInfoMsg,BadCaseConfig.newReportEntity) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt index 007c329b0f..b13cb793d2 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt @@ -632,9 +632,9 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene else->"自驾状态:未知" } val speed = "当前车速:${BadCaseConfig.currentSpeed}" + val site = "起点:${CallerAutoPilotStatusListenerManager.getLineStartName()};终点:${CallerAutoPilotStatusListenerManager.getLineEndName()}" - - val outBitmap = RecordBitmapUtils.drawTextOnBitmap(bitmap,time,lineId,state,speed, + val outBitmap = RecordBitmapUtils.drawTextOnBitmap(bitmap,time,lineId,state,speed,site, BadCaseConfig.gpsStatus,BadCaseConfig.tracingStatus,BadCaseConfig.socketStatus ,BadCaseConfig.newFMInfoMsg,BadCaseConfig.newReportEntity) //图片保存本地 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/util/RecordBitmapUtils.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/util/RecordBitmapUtils.kt index 4bba14ca95..9020546532 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/util/RecordBitmapUtils.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/util/RecordBitmapUtils.kt @@ -76,8 +76,8 @@ object RecordBitmapUtils { /** * 在指定Bitmap中绘制文字 */ - fun drawTextOnBitmap(bitmap: Bitmap, time: String,lineId: String,state: String,currentSpeed: String - ,gpsStatus: String?,tracingStatus: String?,socketStatus: String? + fun drawTextOnBitmap(bitmap: Bitmap, time: String,lineId: String,state: String,currentSpeed: String, + site: String,gpsStatus: String?,tracingStatus: String?,socketStatus: String? ,fm: FMInfoMsg?,report: ReportEntity? ): Bitmap? { val mutableBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, true) @@ -90,6 +90,7 @@ object RecordBitmapUtils { canvas.drawText(lineId,100f,200f,paint) canvas.drawText(state,100f,300f,paint) canvas.drawText(currentSpeed,100f,400f,paint) + canvas.drawText(site,100f,500f,paint) gpsStatus?.let { canvas.drawText(it,1000f,100f,paint) diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt index 5ede15519a..6ac2ab06b3 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt @@ -83,6 +83,14 @@ object CallerAutoPilotStatusListenerManager : CallerBase Date: Mon, 11 Dec 2023 16:45:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[6.2.4]=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=87=E9=9B=86=E9=A6=96=E6=AC=A1=E5=BD=95=E5=8C=85=E6=9C=AA?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=88=86=E7=B1=BB=EF=BC=8C=E5=9C=A8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8=E4=B8=AD=E9=87=8D=E6=96=B0=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E5=88=86=E7=B1=BB=E6=A8=A1=E7=89=88=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/biz/BadCaseManagerView.kt | 14 +++++++++++++- .../badcase/biz/adapter/BagManagerListAdapter.kt | 8 +++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt index ae9c652dfa..14cd988e10 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt @@ -185,7 +185,7 @@ class BadCaseManagerView @JvmOverloads constructor( } override fun uploadBI(bagInfoEntity: BagInfoEntity) { - //展示上报弹窗 + //展示主动上报弹窗 val initiativeBadCaseWindow = InitiativeBadCaseWindow(context as Activity) initiativeBadCaseWindow.setClickListener(object: InitiativeBadCaseWindow.ClickListener{ override fun closeWindow() { @@ -195,6 +195,18 @@ class BadCaseManagerView @JvmOverloads constructor( initiativeBadCaseWindow.showReportBIWindow(bagInfoEntity) } + override fun upLoadAiData(bagInfoEntity: BagInfoEntity) { + //展示AI数据采集上报弹窗 + val aiDataCollectWindow = AIDataCollectWindow(context as Activity) + aiDataCollectWindow.setClickListener(object : + AIDataCollectWindow.ClickListener { + override fun closeWindow() { + aiDataCollectWindow.hideFloatWindow() + } + }) + aiDataCollectWindow.showFloatWindow() + } + override fun editDescription(key: Long, description: BagDescriptionEntity) { //编辑Bag包描述信息 isNameModify = true diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt index 8c8d421184..be12285f4e 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt @@ -134,7 +134,11 @@ class BagManagerListAdapter: RecyclerView.Adapter() { holder.tvBagReportStatus.setBackgroundResource(R.drawable.bag_report_button_bg) holder.tvBagReportStatus.isClickable = true holder.tvBagReportStatus.setOnClickListener { - bagClickListener?.uploadBI(bagInfoEntity) + if(!aiDataSet.isNullOrEmpty() && aiDataSet!!.contains(bagInfoEntity.key.toString())){ + bagClickListener?.upLoadAiData(bagInfoEntity) + }else{ + bagClickListener?.uploadBI(bagInfoEntity) + } } holder.ivMapScreen.setOnClickListener { bagInfoEntity.description?.let { @@ -242,6 +246,8 @@ class BagManagerListAdapter: RecyclerView.Adapter() { fun onClick(bagInfoEntity: BagInfoEntity, isChecked: Boolean) //上报BI平台 fun uploadBI(bagInfoEntity: BagInfoEntity) + //AI数据采集上报 + fun upLoadAiData(bagInfoEntity: BagInfoEntity) //编辑Bag包描述信息 fun editDescription(key: Long,description: BagDescriptionEntity) //听录音 From 8a5e722cc37e6e1dda9ef5395866ebf1a0886334 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 11 Dec 2023 18:44:11 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[6.2.4]=E5=BD=95=E5=8C=85=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/BadCaseManager.kt | 23 +++++++++++++++++++ .../biz/adapter/BagManagerListAdapter.kt | 3 --- .../badcase/consts/BadCaseConfig.kt | 15 ++++++++++++ 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt index 4c3ffe9e2e..f2d2c83040 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt @@ -38,6 +38,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA import com.mogo.eagle.core.utilcode.mogo.toast.TipToast import com.mogo.eagle.core.utilcode.util.* +import com.mogo.eagle.core.utilcode.util.FileUtils.millis2String import com.mogo.tts.base.SpeechUtils import com.zhjt.mogo_core_function_devatools.badcase.biz.* import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig @@ -69,6 +70,28 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis // 云socket连接状态 MogoStatusManager.getInstance() .registerStatusChangedListener(TAG, StatusDescriptor.CLOUD_SOCKET, this) + checkDelete() + } + + /** + * 检查删除录包记录在本地的信息 + */ + private fun checkDelete(){ + //获取当天时间 + val currentDay = millis2String(System.currentTimeMillis(), TimeUtils.getMdFormat()) + //和上次启动时间做对比,如果不是一天，则判断主动、采集和录包失败列表数量，数量过多的时候进行清除 + if(BadCaseConfig.getStartTime() != currentDay){ + if(BadCaseConfig.getInitiativeRecordSet().size > 190){ + BadCaseConfig.getInitiativeRecordSet().clear() + } + if(BadCaseConfig.getAiDataSet().size > 190){ + BadCaseConfig.getAiDataSet().clear() + } + if(BadCaseConfig.getRecordFailSet().size >190){ + BadCaseConfig.getRecordFailSet().clear() + } + BadCaseConfig.setStartTime(currentDay) + } } /** diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt index be12285f4e..2f20730b5c 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt @@ -12,11 +12,8 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.data.deva.badcase.BagDescriptionEntity import com.mogo.eagle.core.data.deva.badcase.BagInfoEntity -import com.mogo.eagle.core.utilcode.util.FileUtils.millis2String -import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.zhjt.mogo_core_function_devatools.R -import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig import com.zhjt.mogo_core_function_devatools.badcase.util.RecordBitmapUtils import java.text.DecimalFormat diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseConfig.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseConfig.kt index ec26cca0c7..b5868dbb3d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseConfig.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseConfig.kt @@ -61,6 +61,21 @@ object BadCaseConfig { private const val resourceInitiative = "RESOURCE_INITIATIVE" //录包来源为主动录包 private const val resourceAiData = "RESOURCE_AI_DATA" //录包来源为AI数据采集 private const val recordFail = "RECORD_FAIL" //录包失败 + private const val startTime = "RECORD_START_TIME" //启动时间 + + /** + * 获取上一次启动日期 + */ + fun getStartTime(): String{ + return SPUtils.getInstance().getString(startTime,"") + } + + /** + * 记录启动日期 + */ + fun setStartTime(startDay: String){ + SPUtils.getInstance().put(startTime,startDay) + } /** * 获取主动录包集合