From 689ea857371c6e20377ff6daa873956d9a6e3756 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 14 Feb 2023 18:41:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[2.14.0]=E4=BF=AE=E5=A4=8D=E5=BD=95?= =?UTF-8?q?=E5=8C=85=E5=B7=A5=E5=85=B7=E4=B8=89=E6=9C=9FBug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/biz/BadCaseManagerView.kt | 84 +++---------------- .../badcase/biz/BagUploadDialog.java | 4 + 2 files changed, 15 insertions(+), 73 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 79e5aaa59e..da77d8f0f6 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 @@ -73,6 +73,8 @@ internal class BadCaseManagerView @JvmOverloads constructor( tvSelectAll.setOnClickListener { if(bagManagerEntity.bagsInfoResp.size>0){ selectedBagSize = 0 + selectedBagNum = 0 + bagManagerList.clear() for(selectBagInfo in bagManagerEntity.bagsInfoResp){ if(selectBagInfo.itemType == 0){ selectBagInfo.selectStatus = true @@ -213,79 +215,6 @@ internal class BadCaseManagerView @JvmOverloads constructor( // DownloadManager.getInstance().download("CarPad/mogopadlog/X20202111230C01YYW/2023-01-30/Audio_1675049657187_BadCase.wav", // "/mnt/sdcard/mogo/","test13.wav") -// val descriptionEntityOne = BagDescriptionEntity("包信息描述1",false, -// "CarPad/mogopadlog/X20202111230C01YYW/2023-01-30/Audio_1675049657187_BadCase.wav",false) -// val bagInfoEntityOne = BagInfoEntity() -// bagInfoEntityOne.key = 12341 -// bagInfoEntityOne.totalSize = 1*1024*1024*1000 -// bagInfoEntityOne.timestamp = "20230208125414" -// bagInfoEntityOne.bagPath = "" -// bagInfoEntityOne.mergeStat = false -// bagInfoEntityOne.uploadStat = false -// bagInfoEntityOne.description = descriptionEntityOne -// -// val descriptionEntityTwo = BagDescriptionEntity("包信息描述2",true, -// "CarPad/mogopadlog/X20202111230C01YYW/2023-01-30/Audio_1675049657187_BadCase.wav",true) -// val bagInfoEntityTwo = BagInfoEntity() -// bagInfoEntityTwo.key = 12342 -// bagInfoEntityTwo.totalSize = 2*1024*1024*1000 -// bagInfoEntityTwo.timestamp = "20230208125414" -// bagInfoEntityTwo.bagPath = "" -// bagInfoEntityTwo.mergeStat = false -// bagInfoEntityTwo.uploadStat = false -// bagInfoEntityTwo.description = descriptionEntityTwo -// -// val descriptionEntityThree = BagDescriptionEntity("包信息描述3",true, -// "CarPad/mogopadlog/X20202111230C01YYW/2023-01-30/Audio_1675049657187_BadCase.wav",true) -// val bagInfoEntityThree = BagInfoEntity() -// bagInfoEntityThree.key = 12343 -// bagInfoEntityThree.totalSize = 1*1027*1000 -// bagInfoEntityThree.timestamp = "20230208125414" -// bagInfoEntityThree.bagPath = "" -// bagInfoEntityThree.mergeStat = false -// bagInfoEntityThree.uploadStat = false -// bagInfoEntityThree.description = descriptionEntityThree -// -// val descriptionEntityFour = BagDescriptionEntity("包信息描述4",true, -// "CarPad/mogopadlog/X20202111230C01YYW/2023-01-30/Audio_1675049657187_BadCase.wav",true) -// val bagInfoEntityFour = BagInfoEntity() -// bagInfoEntityFour.key = 12344 -// bagInfoEntityFour.totalSize = 10*1024*1024*1000L -// bagInfoEntityFour.timestamp = "20230208125414" -// bagInfoEntityFour.bagPath = "" -// bagInfoEntityFour.mergeStat = false -// bagInfoEntityFour.uploadStat = false -// bagInfoEntityFour.description = descriptionEntityFour -// -// val list: MutableList = ArrayList() -// list.add(bagInfoEntityOne) -// list.add(bagInfoEntityTwo) -// list.add(bagInfoEntityThree) -// list.add(bagInfoEntityFour) -// for(entity in list){ -// entity.timestamp?.let { -// val month = it.substring(4,6) -// val day = it.substring(6,8) -// val time = "${month}月${day}日" -// var containTime = false -// for(bag in bagManagerEntity.bagsInfoResp){ -// if(bag.timeStr == time){ -// containTime = true -// } -// } -// if(!containTime || bagManagerEntity.bagsInfoResp.size ==0){ -// //增加时间的 -// val bagInfoEntity = BagInfoEntity() -// bagInfoEntity.itemType = 1 -// bagInfoEntity.timeStr = time -// bagManagerEntity.bagsInfoResp.add(bagInfoEntity) -// } -// bagManagerEntity.bagsInfoResp.add(entity) -// } -// } -// -// bagManagerListAdapter?.setData(bagManagerEntity.bagsInfoResp) - } fun setOnClickListener(clickListener: ClickListener) { @@ -303,6 +232,9 @@ internal class BadCaseManagerView @JvmOverloads constructor( if(bagManager.reqType == 1){ //遍历各个主机的硬盘空间信息 if(bagManager.spaceInfoRespCount>0){ + spaceTotal = 0 + spaceUsed = 0 + spaceFree = 0 for(spaceInfo in bagManager.spaceInfoRespList){ spaceInfo.diskSpaceInfo?.let { spaceTotal += it.total @@ -388,6 +320,12 @@ internal class BadCaseManagerView @JvmOverloads constructor( } } } + //上传Cos执行完成 + if(bagManagerList.size == 0 && selectedBagNum != 0){ + ToastUtils.showShort("上传命令完成") + bagUploadDialog?.uploadCompleted() + tvCancelSelect.performClick() + } } //删除Bag else if(bagManager.reqType == 4){ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BagUploadDialog.java b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BagUploadDialog.java index 95154416e3..00dd1145b0 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BagUploadDialog.java +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BagUploadDialog.java @@ -109,6 +109,10 @@ public class BagUploadDialog extends Dialog { viewUploadProgress.setProgress((totalNum-remainNum)*100/totalNum); } + public void uploadCompleted(){ + dismiss(); + } + interface BagUploadListener{ //取消上传 void cancelUpload(); From dc318d17329ab3cef3a1b9cf8dcfe233623bc35b Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 15 Feb 2023 01:13:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[2.14.0]=E5=BD=95=E5=8C=85=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E4=BF=AE=E5=A4=8DBug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/adapter/BagManagerListAdapter.kt | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) 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 a5bc9e11d0..0dbf9915b2 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 @@ -60,31 +60,36 @@ class BagManagerListAdapter: RecyclerView.Adapter() { bagClickListener?.onClick(bagInfoEntity,isChecked) } - holder.etBagNameEdit.addTextChangedListener(object:TextWatcher{ + val textWatcher: TextWatcher = object : TextWatcher { override fun beforeTextChanged( - s: CharSequence?, - start: Int, - count: Int, - after: Int + charSequence: CharSequence, + i: Int, + i1: Int, + i2: Int ) { - } - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { + override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {} + override fun afterTextChanged(editable: Editable) { bagInfoEntity.description?.let { desc-> - val descriptionStr = s.toString() + val descriptionStr = editable.toString() if(desc.description != descriptionStr){ desc.description = descriptionStr bagClickListener?.editDescription(bagInfoEntity.key,desc) } } } + } + holder.etBagNameEdit.onFocusChangeListener = + View.OnFocusChangeListener { p0, hasFocus -> + val edit = p0 as EditText + if(hasFocus){ + edit.addTextChangedListener(textWatcher) + }else{ + edit.removeTextChangedListener(textWatcher) + } + } - }) bagInfoEntity.description?.let { des-> if(des.reportBI){ From b1bcb53f749accc9f7155dc6448b0674b2805791 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 15 Feb 2023 01:26:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[2.14.0]=E5=A2=9E=E5=8A=A0=E5=BD=95?= =?UTF-8?q?=E5=8C=85=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/biz/BadCaseManagerView.kt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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 da77d8f0f6..801708f121 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 @@ -6,6 +6,7 @@ import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Handler import android.util.AttributeSet +import android.util.Log import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout @@ -228,6 +229,24 @@ internal class BadCaseManagerView @JvmOverloads constructor( override fun onBagManagerResult(bagManager: BagManagerOuterClass.BagManager) { super.onBagManagerResult(bagManager) UiThreadHandler.post { + Log.i(TAG,"onBagManagerResult Start") + Log.i(TAG,"keyReq="+bagManager.keyReq) + Log.i(TAG,"reqType="+bagManager.reqType) + Log.i(TAG,"descReq description="+bagManager.descReq.description + +" audioUrl="+bagManager.descReq.audioUrl + +" reportBI="+bagManager.descReq.reportBI + +" hasAudio="+bagManager.descReq.hasAudio) + for(logBag in bagManager.bagsInfoRespList){ + Log.i(TAG,"bagPath="+logBag.bagPath) + Log.i(TAG,"timestamp="+logBag.timestamp) + Log.i(TAG,"description="+logBag.description) + Log.i(TAG,"key="+logBag.key) + Log.i(TAG,"mergeStat="+logBag.mergeStat) + Log.i(TAG,"totalSize="+logBag.totalSize) + Log.i(TAG,"uploadStat="+logBag.uploadStat) + } + Log.i(TAG,"onBagManagerResult End") + //获取空间使用信息 if(bagManager.reqType == 1){ //遍历各个主机的硬盘空间信息