From b19f481b371ddd7ecd8b4a6c063b6b967a40571f Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Fri, 17 Feb 2023 06:54:29 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[2.14.0]fix=E7=BA=A2=E7=BB=BF=E7=81=AFOBU?= =?UTF-8?q?=E6=A0=87=E8=AF=86Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/call/obu/CallerObuTrafficLightListenerManager.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuTrafficLightListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuTrafficLightListenerManager.kt index a53d5b350e..70662d49e5 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuTrafficLightListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuTrafficLightListenerManager.kt @@ -22,7 +22,6 @@ object CallerObuTrafficLightListenerManager { if (M_OBU_TRAFFIC_LIGHT_LISTENER.containsKey(tag)) { return } - listener.onObuTrafficLight(mLight) M_OBU_TRAFFIC_LIGHT_LISTENER[tag] = listener } From 3e9a8f5bf2a94face0a7629d3fd43f52e84a80fb Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Fri, 17 Feb 2023 06:59:07 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[2.14.0]fix=E7=82=B9=E5=87=BB=E5=A4=9A?= =?UTF-8?q?=E6=AC=A1=E4=B8=8A=E6=8A=A5=E5=90=8E=E4=B8=8A=E6=8A=A5=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/biz/InitiativeBadCaseWindow.kt | 1 + 1 file changed, 1 insertion(+) 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 c28171471a..2baf361247 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 @@ -155,6 +155,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList TipToast.shortTip("请选择至少一个Case") return@setOnClickListener } + uploadReason.clear() if(rbOne.isChecked){ uploadReason.append("严重画龙 ") } From 4b7ccffdcebb9a6d37bf004b53986f9a10cf79ec Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Fri, 17 Feb 2023 07:05:17 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[2.14.0]fix=E5=BD=95=E5=8C=85=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9Bag=E5=8C=85?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E5=85=89=E6=A0=87=E8=B7=B3=E8=B7=83=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/biz/BadCaseManagerView.kt | 10 ++++++++-- 1 file changed, 8 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 31d0b57875..ffd635067f 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 @@ -59,6 +59,8 @@ class BadCaseManagerView @JvmOverloads constructor( private val audioSavePath = "/mnt/sdcard/mogo/" + private var isNameModify = false + init { LayoutInflater.from(context).inflate(R.layout.layout_badcase_manager, this, true) initView() @@ -187,6 +189,7 @@ class BadCaseManagerView @JvmOverloads constructor( override fun editDescription(key: Long, description: BagDescriptionEntity) { //编辑Bag包描述信息 + isNameModify = true bagManagerEntity.reqType = 5 bagManagerEntity.keyReq = key bagManagerEntity.descReq = description @@ -382,10 +385,13 @@ class BadCaseManagerView @JvmOverloads constructor( it.hasAudio = bagManager.descReq.hasAudio it.audioUrl = bagManager.descReq.audioUrl } - //更新List - bagManagerListAdapter?.setData(bagManagerEntity.bagsInfoResp) } } + if(!isNameModify){ + //更新List + bagManagerListAdapter?.setData(bagManagerEntity.bagsInfoResp) + } + isNameModify = false } } From c7e65d8c45309ed1111591e6f73ee4ce66e71b3b Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Fri, 17 Feb 2023 07:21:55 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[2.14.0]fix=E4=B8=80=E5=A4=A9=E5=86=85?= =?UTF-8?q?=E7=9A=84bag=E5=85=A8=E9=83=A8=E5=88=A0=E9=99=A4=E5=90=8E?= =?UTF-8?q?=E8=BF=98=E4=BC=9A=E6=98=BE=E7=A4=BA=E5=BD=93=E5=A4=A9=E6=97=A5?= =?UTF-8?q?=E6=9C=9FBug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/biz/BadCaseManagerView.kt | 27 +++++++++++++++++-- 1 file changed, 25 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 ffd635067f..5984fb2881 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 @@ -361,10 +361,9 @@ class BadCaseManagerView @JvmOverloads constructor( val deleteBagInfo = iterator.next() if(deleteBagInfo.key == bagManager.keyReq){ iterator.remove() -// bagManagerEntity.bagsInfoResp.remove(deleteBagInfo) bagManagerList.remove(deleteBagInfo) //更新列表 - bagManagerListAdapter?.setData(bagManagerEntity.bagsInfoResp) +// bagManagerListAdapter?.setData(bagManagerEntity.bagsInfoResp) if(bagManagerList.size>0){ //继续执行删除命令 bagManagerEntity.reqType = 4 @@ -373,6 +372,30 @@ class BadCaseManagerView @JvmOverloads constructor( } } } + //遍历列表，如当天Bag全部删除，同时把日期标题也删除更新列表 + val titleIterator = bagManagerEntity.bagsInfoResp.iterator() + while(titleIterator.hasNext()){ + val titleBagInfo = titleIterator.next() + if(titleBagInfo.itemType == 1){ + val bagIterator = bagManagerEntity.bagsInfoResp.iterator() + var hasBag = false + while(bagIterator.hasNext()){ + val bagBagInfo = bagIterator.next() + if(bagBagInfo.itemType == 0){ + bagBagInfo.timestamp?.let { + if(it.contains(titleBagInfo.timestamp.toString())){ + hasBag = true + } + } + } + } + if(!hasBag){ + bagIterator.remove() + } + } + } + //更新列表 + bagManagerListAdapter?.setData(bagManagerEntity.bagsInfoResp) } //修改bag附加信息 else if(bagManager.reqType == 5){ From 76f47c6da8660b30cab7e3c71425398a81fb5c3c Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Fri, 17 Feb 2023 07:35:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[2.14.0]=E9=81=BF=E5=85=8DBag=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=87=BA=E7=8E=B0=E9=87=8D=E5=A4=8Dkey=E7=9A=84bag?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/biz/BadCaseManagerView.kt | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 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 5984fb2881..8150cf6c1b 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 @@ -280,6 +280,7 @@ class BadCaseManagerView @JvmOverloads constructor( clBagHaveDataLayout.visibility = View.VISIBLE clBagNoDataLayout.visibility = View.GONE if(bagManager.bagsInfoRespCount>0){ + bagManagerEntity.bagsInfoResp.clear() for(bagInfo in bagManager.bagsInfoRespList){ bagInfo?.let { it.timestamp?.let { time -> @@ -291,6 +292,7 @@ class BadCaseManagerView @JvmOverloads constructor( bagInfoEntity.bagPath = it.bagPath bagInfoEntity.mergeStat = it.mergeStat bagInfoEntity.uploadStat = it.uploadStat + bagInfoEntity.itemType = 0 bagInfoEntity.description = descriptionEntity for(subBag in it.subBagsList){ val subBagEntity = SubBagEntity(subBag.key,subBag.host,subBag.size) @@ -299,7 +301,7 @@ class BadCaseManagerView @JvmOverloads constructor( val month = time.substring(4,6) val day = time.substring(6,8) - val time = "${month}月${day}日" + val timeStr = "${month}月${day}日" var containTime = false for(bag in bagManagerEntity.bagsInfoResp){ if(bag.timeStr == time){ @@ -308,13 +310,21 @@ class BadCaseManagerView @JvmOverloads constructor( } if(!containTime || bagManagerEntity.bagsInfoResp.size ==0){ //增加时间的 - val bagInfoEntity = BagInfoEntity() - bagInfoEntity.itemType = 1 - bagInfoEntity.timeStr = time + val bagInfoTimeEntity = BagInfoEntity() + bagInfoTimeEntity.itemType = 1 + bagInfoTimeEntity.timeStr = timeStr + bagInfoTimeEntity.timestamp = time.substring(0,8) + bagManagerEntity.bagsInfoResp.add(bagInfoTimeEntity) + } + var containKey = false + for(bagInfoContain in bagManagerEntity.bagsInfoResp){ + if(bagInfoContain.key == bagInfoEntity.key){ + containKey = true + } + } + if(!containKey){ bagManagerEntity.bagsInfoResp.add(bagInfoEntity) } - - bagManagerEntity.bagsInfoResp.add(bagInfoEntity) } } }