From ecf2821f7a6cfd96eeca16598982d2312dba7db8 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 27 Jan 2025 18:42:54 +0800 Subject: [PATCH] =?UTF-8?q?[6.10.0]=E6=8E=A5=E7=AE=A1=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=B7=A5=E5=85=B7=E4=BC=98=E5=8C=96=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/BadCaseManager.kt | 4 ++++ .../badcase/util/RecordBitmapUtils.kt | 6 ++++-- .../workorder/TakeOverReasonWindow.kt | 18 ++++++---------- .../workorder/TakeOverSceneWindow.kt | 21 ++++++++++++++----- 4 files changed, 30 insertions(+), 19 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 ca769c1b31..9cb2badf9e 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 @@ -156,6 +156,10 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis BadCaseConfig.setStartTime(currentDay) //删除前一天的接管记录 CallerTakeOverManager.deleteAllRecord(context) + //遍历是否有非当日的文件并删除 + RecordBitmapUtils.deleteExpiredFile(currentDay,"FrontCamera") + RecordBitmapUtils.deleteExpiredFile(currentDay,"RearCamera") + RecordBitmapUtils.deleteExpiredFile(currentDay,"MapScreen") } } 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 b65884d61d..a4864f5089 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 @@ -36,9 +36,11 @@ object RecordBitmapUtils { /** * 删除过期文件夹 + * @param currentDay 要删除的文件日期 + * @param deleteFile 要删除的文件目录 */ - fun deleteExpiredFile(currentDay: String){ - val checkFileName = Environment.getExternalStorageDirectory().absolutePath + File.separator+ "MapScreen" + fun deleteExpiredFile(currentDay: String,deleteFile: String){ + val checkFileName = Environment.getExternalStorageDirectory().absolutePath + File.separator+ deleteFile val checkFileFolder = File(checkFileName) if(checkFileFolder.exists()){ checkFileFolder.listFiles()?.forEach {dir-> diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt index 10f50ff625..d0dea26197 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt @@ -454,28 +454,22 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene //展示前向摄像头 val frontCameraPath: String = ((Environment.getExternalStorageDirectory() .absolutePath + File.separator) + - "FrontCamera" + File.separator + millis2String( - System.currentTimeMillis(), - getMdFormat() - ) + File.separator + mTakeOverRecordInfo.bagId) + ".png" + "FrontCamera" + File.separator + millis2String(System.currentTimeMillis(), getMdFormat()) + + File.separator + mTakeOverRecordInfo.bagId) + ".png" val frontCameraUri = Uri.parse(frontCameraPath) ivFrontCamera.setImageURI(frontCameraUri) //展示后向摄像头 val rearCameraPath: String = ((Environment.getExternalStorageDirectory() .absolutePath + File.separator) + - "RearCamera" + File.separator + millis2String( - System.currentTimeMillis(), - getMdFormat() - ) + File.separator + mTakeOverRecordInfo.bagId) + ".png" + "RearCamera" + File.separator + millis2String(System.currentTimeMillis(), getMdFormat()) + + File.separator + mTakeOverRecordInfo.bagId) + ".png" val rearCameraUri = Uri.parse(rearCameraPath) ivRearCamera.setImageURI(rearCameraUri) //展示高精地图截图 val mapScreenPath: String = ((Environment.getExternalStorageDirectory() .absolutePath + File.separator) + - "MapScreen" + File.separator + millis2String( - System.currentTimeMillis(), - getMdFormat() - ) + File.separator + mTakeOverRecordInfo.bagId) + ".png" + "MapScreen" + File.separator + millis2String(System.currentTimeMillis(), getMdFormat()) + + File.separator + mTakeOverRecordInfo.bagId) + ".png" val mapScreenUri = Uri.parse(mapScreenPath) ivMapScreen.setImageURI(mapScreenUri) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverSceneWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverSceneWindow.kt index c8e271919e..b4430a1172 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverSceneWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverSceneWindow.kt @@ -12,6 +12,7 @@ import android.view.WindowManager import android.widget.ImageView import androidx.viewpager.widget.ViewPager import com.mogo.eagle.core.utilcode.util.BarUtils +import com.mogo.eagle.core.utilcode.util.ToastUtils import com.zhjt.mogo_core_function_devatools.R import com.zhjt.mogo_core_function_devatools.workorder.adapter.TakeOverSceneAdapter @@ -33,6 +34,7 @@ class TakeOverSceneWindow constructor(activity: Activity) { private lateinit var ivScenePrevious: ImageView private lateinit var ivSceneNext: ImageView private val takeOverSceneAdapter = TakeOverSceneAdapter() + private var currentIndex = 0 init { initFloatWindow() @@ -62,7 +64,6 @@ class TakeOverSceneWindow constructor(activity: Activity) { } private fun initEvent(){ - var currentIndex = 0 vpSceneImage.adapter =takeOverSceneAdapter //关闭弹窗 ivSceneClose.setOnClickListener { @@ -70,13 +71,21 @@ class TakeOverSceneWindow constructor(activity: Activity) { } //前一个场景 ivScenePrevious.setOnClickListener { - currentIndex = (currentIndex-1).coerceAtLeast(0) - vpSceneImage.currentItem = currentIndex + if(currentIndex == 0){ + ToastUtils.showShort("没有上一个场景了") + }else{ + currentIndex = (currentIndex-1).coerceAtLeast(0) + vpSceneImage.currentItem = currentIndex + } } //后一个场景 ivSceneNext.setOnClickListener { - currentIndex = (currentIndex + 1).coerceAtMost(2) - vpSceneImage.currentItem = currentIndex + if(currentIndex < 2){ + currentIndex = (currentIndex + 1).coerceAtMost(2) + vpSceneImage.currentItem = currentIndex + }else{ + ToastUtils.showShort("没有下一个场景了") + } } } @@ -90,6 +99,8 @@ class TakeOverSceneWindow constructor(activity: Activity) { mWindowParams!!.y = metrics.heightPixels - BarUtils.getStatusBarHeight() mWindowManager!!.addView(mFloatLayout, mWindowParams) takeOverSceneAdapter.setSceneUri(frontCameraUri, rearCameraUri, mapScreenUri) + currentIndex = currentItem + vpSceneImage.currentItem = currentItem } }