From 7e65e5f476457a453bb1a54a0ba1f8c50d412d5f Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 6 Dec 2023 18:37:55 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.4]Bag=E5=8C=85=E4=B8=8A=E4=BC=A0=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=8F=AF=E5=86=8D=E6=9F=A5=E7=9C=8B=E6=88=AA?= =?UTF-8?q?=E5=9B=BE=EF=BC=8C=E6=8C=89=E9=92=AE=E7=BD=AE=E7=81=B0=EF=BC=8C?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=88=90=E5=8A=9F=E5=90=8E=EF=BC=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=BD=93=E5=89=8DBag=E5=8C=85=E6=88=AA=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/biz/InitiativeBadCaseWindow.kt | 8 +++-- .../badcase/biz/PassiveBadCaseWindow.kt | 6 ++++ .../biz/adapter/BagManagerListAdapter.kt | 32 ++++++++++-------- .../badcase/util/RecordBitmapUtils.kt | 25 +++++++++++++- .../res/drawable-xhdpi/icon_bag_audio.png | Bin 1658 -> 2746 bytes .../main/res/drawable-xhdpi/icon_bag_edit.png | Bin 0 -> 2538 bytes .../drawable-xhdpi/icon_bag_look_screen.png | Bin 0 -> 2396 bytes .../src/main/res/drawable/icon_bag_edit.png | Bin 926 -> 0 bytes .../src/main/res/layout/item_bag_manager.xml | 3 +- 9 files changed, 55 insertions(+), 19 deletions(-) create mode 100644 core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bag_edit.png create mode 100644 core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bag_look_screen.png delete mode 100644 core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_bag_edit.png 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 9c9681fc45..46d5f93714 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 @@ -119,6 +119,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList private var recordFileName: String?=null //录制文件包名 private var receiveTime: String?= null private var uploadStamp: String = System.currentTimeMillis().toString() + private var screenSavePath: String ?= null //截图保存路径 private var bagManagerEntity: BagManagerEntity = BagManagerEntity() @@ -241,7 +242,6 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList clickListener?.closeWindow() } - mWindowParams = WindowManager.LayoutParams() mWindowManager = mActivity.windowManager mWindowParams?.let { @@ -460,6 +460,10 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList bagManagerEntity.descReq = descReqEntity CallerAutoPilotControlManager.sendBagManagerCmd(bagManagerEntity) } + //删除截图 + screenSavePath?.let { + RecordBitmapUtils.deleteReportedImage(it) + } val loc = getChassisLocationWGS84() BadCaseAnalyticsManager.bagRecordUpload(recordKey.toString(),recordFileName?:"",uploadStamp, "100",AppConfigInfo.plateNumber,BadCaseConfig.totalDuration.toString(),MoGoAiCloudClientConfig.getInstance().sn, @@ -677,7 +681,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList }else{ RecordBitmapUtils.bitmap2Path(bitmap,path) } - + screenSavePath = path //遍历是否有非当日的文件并删除 RecordBitmapUtils.deleteExpiredFile(currentDay) } 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 de94745d87..b7404370b4 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 @@ -99,6 +99,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene private lateinit var rvPassiveList : RecyclerView private var badReasonListAdapter: BadReasonListAdapter?= null + private var screenSavePath: String ?= null //截图保存路径 private var mInViewX = 0f private var mInViewY = 0f @@ -457,6 +458,10 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene bagManagerEntity.descReq = descReqEntity CallerAutoPilotControlManager.sendBagManagerCmd(bagManagerEntity) } + //删除截图 + screenSavePath?.let { + RecordBitmapUtils.deleteReportedImage(it) + } //被动上报埋点统计 val loc = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() BadCaseAnalyticsManager.bagRecordUpload(recordKey?:"",recordFileName?:"",receiveTime?:System.currentTimeMillis().toString(), @@ -644,6 +649,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene }else{ RecordBitmapUtils.bitmap2Path(bitmap,path) } + screenSavePath = path //遍历是否有非当日的文件并删除 RecordBitmapUtils.deleteExpiredFile(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 67d912e1e8..72d4174393 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 @@ -14,8 +14,10 @@ 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 @@ -101,12 +103,18 @@ class BagManagerListAdapter: RecyclerView.Adapter() { holder.tvBagReportStatus.text = "录包失败" holder.tvBagReportStatus.setBackgroundResource(R.drawable.bag_reported_button_bg) holder.tvBagReportStatus.isClickable = false + //已上报的Bag不支持再查看,图标置为灰色，并且不可点击 + holder.ivMapScreen.alpha = 0.5f + holder.ivMapScreen.isClickable = false }else{ if(des.reportBI){ //已上报 holder.tvBagReportStatus.text = "已上报" holder.tvBagReportStatus.setBackgroundResource(R.drawable.bag_reported_button_bg) holder.tvBagReportStatus.isClickable = false + //已上报的Bag不支持再查看,图标置为灰色，并且不可点击 + holder.ivMapScreen.alpha = 0.5f + holder.ivMapScreen.isClickable = false }else{ //未上报 holder.tvBagReportStatus.text = "上报" @@ -115,6 +123,16 @@ class BagManagerListAdapter: RecyclerView.Adapter() { holder.tvBagReportStatus.setOnClickListener { bagClickListener?.uploadBI(bagInfoEntity) } + holder.ivMapScreen.setOnClickListener { + bagInfoEntity.description?.let { + //查找是否有截图文件 + if(RecordBitmapUtils.checkHasImage(bagInfoEntity.key)){ + bagClickListener?.lookMapScreen(bagInfoEntity.key) + }else{ + ToastUtils.showShort("该截图录制失败或已删除") + } + } + } } } if(des.description.isEmpty()){ @@ -124,12 +142,6 @@ class BagManagerListAdapter: RecyclerView.Adapter() { } } - holder.ivMapScreen.setOnClickListener { - bagInfoEntity.description?.let { - bagClickListener?.lookMapScreen(bagInfoEntity.key) - } - } - //录包来源：自动 or 人工 if(BadCaseConfig.bagResourceList.contains(bagInfoEntity.key)){ //在该列表中找到Bag包的Key则代表该Bag为人工录包 @@ -175,14 +187,6 @@ class BagManagerListAdapter: RecyclerView.Adapter() { } } - //只有当天的Bag才显示查看截图按钮 - bagInfoEntity.timestamp.let {day -> - val currentDay = millis2String(System.currentTimeMillis(), TimeUtils.getMdFormatTwo()) - if(day.contains(currentDay)){ - holder.ivMapScreen.visibility = View.VISIBLE - } - } - } } } 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 5ee8056017..eab089942a 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 @@ -10,6 +10,8 @@ import com.mogo.eagle.core.data.deva.report.ReportEntity import com.mogo.eagle.core.data.msgbox.FMInfoMsg import com.mogo.eagle.core.data.msgbox.MsgFmData import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager +import com.mogo.eagle.core.utilcode.util.FileUtils.millis2String +import com.mogo.eagle.core.utilcode.util.TimeUtils import com.zhjt.mogo_core_function_devatools.badcase.biz.InitiativeBadCaseWindow import java.io.File import java.io.FileOutputStream @@ -33,7 +35,7 @@ object RecordBitmapUtils { } /** - * 删除过期文件 + * 删除过期文件夹 */ fun deleteExpiredFile(currentDay: String){ val checkFileName = Environment.getExternalStorageDirectory().absolutePath + File.separator+ "MapScreen" @@ -50,6 +52,27 @@ object RecordBitmapUtils { } } + fun deleteReportedImage(path: String){ + val screenFile = File(path) + if(screenFile.exists()){ + screenFile.delete() + } + } + + fun checkHasImage(recordKey: Long): Boolean{ + var checkResult = false + val currentDay = millis2String(System.currentTimeMillis(), TimeUtils.getMdFormat()) + val fileDir: String = Environment.getExternalStorageDirectory().absolutePath + File.separator+ + "MapScreen" + File.separator+ currentDay + File.separator + val fileName = "$recordKey.png" + val path = fileDir + fileName + val file = File(path) + if(file.exists()){ + checkResult = true + } + return checkResult + } + /** * 在指定Bitmap中绘制文字 */ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bag_audio.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bag_audio.png index 2959045ff30d8eae9d56d7b4a4279a7cf5a9ba42..7a03289e1f47fea8f2f4593c28c6cf71c5e61ed7 100644 GIT binary patch delta 2645 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 ASO5S3 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_bag_manager.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_bag_manager.xml index 3d02585ffa..60129b5acd 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_bag_manager.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_bag_manager.xml @@ -100,9 +100,8 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toLeftOf="@id/ivBagAudio" - android:src="@drawable/icon_bad_case_audio_select" + android:src="@drawable/icon_bag_look_screen" android:layout_marginEnd="@dimen/dp_25" - android:visibility="invisible" />