yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_robotaxi-d_231206_6.2.4' into dev_sweeper-d_231206_6.2.4

Browse Source
This commit is contained in:
xuxinchao
2023-12-11 18:44:59 +08:00
parent 44d4b7de98 8a5e722cc3
commit 0b5418eb99
11 changed files with 76 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
View File

@@ -632,6 +632,7 @@ class DriverM1Model {
if (data != null && data.code == 0){
mOrderCallback?.updateReturnCarStatus(true)
queryCurrentServiceStatus()
CallerAutoPilotControlManager.cancelAutoPilot()
}
}

2
OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusRoutesResult.java
View File

@@ -57,7 +57,7 @@ public class BusRoutesResult {
}
public void setSite(List<BusStationBean> site) {
this.sites = sites;
this.sites = site;
}
public long getTaskTime() {

2
OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java
View File

@@ -700,7 +700,7 @@ public class OrderModel {
beanPre.setLeaving(false);
sites.set(currentIndex -1,beanPre);
}
busRoutesResult.setSite(sites);
//busRoutesResult.setSite(sites);
pushCacheTransferData(busRoutesResult);

23
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt
View File

@@ -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)
}
}
/**

14
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt
View File

@@ -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

4
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt
View File

@@ -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)

4
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt
View File

@@ -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)
//图片保存本地

11
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt
View File

@@ -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
@@ -134,7 +131,11 @@ class BagManagerListAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder>() {
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 +243,8 @@ class BagManagerListAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder>() {
fun onClick(bagInfoEntity: BagInfoEntity, isChecked: Boolean)
//上报BI平台
fun uploadBI(bagInfoEntity: BagInfoEntity)
//AI数据采集上报
fun upLoadAiData(bagInfoEntity: BagInfoEntity)
//编辑Bag包描述信息
fun editDescription(key: Long,description: BagDescriptionEntity)
//听录音

15
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseConfig.kt
View File

@@ -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)
}
/**
* 获取主动录包集合

5
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/util/RecordBitmapUtils.kt
View File

@@ -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)

8
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt
View File

@@ -83,6 +83,14 @@ object CallerAutoPilotStatusListenerManager : CallerBase<IMoGoAutopilotStatusLis
return lineId ?: 0L
}
fun getLineStartName(): String?{
return mAutopilotStatusInfo.autopilotControlParameters?.startName
}
fun getLineEndName(): String?{
return mAutopilotStatusInfo.autopilotControlParameters?.endName
}
fun getDockerVersion():String?{
return mAutopilotStatusInfo.dockVersion
}