From c7e65d8c45309ed1111591e6f73ee4ce66e71b3b Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Fri, 17 Feb 2023 07:21:55 +0800
Subject: [PATCH] =?UTF-8?q?[2.14.0]fix=E4=B8=80=E5=A4=A9=E5=86=85=E7=9A=84?=
 =?UTF-8?q?bag=E5=85=A8=E9=83=A8=E5=88=A0=E9=99=A4=E5=90=8E=E8=BF=98?=
 =?UTF-8?q?=E4=BC=9A=E6=98=BE=E7=A4=BA=E5=BD=93=E5=A4=A9=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?Bug?=
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){