From 0fce93ecc987cb9043dc0db2483e468146e2bb84 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Mon, 9 Oct 2023 09:58:51 +0800
Subject: [PATCH 1/2] merge code

---
 app/src/main/res/menu/personal_center_menu.xml   | 2 +-
 collect-library/src/main/assets/editormarker.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/menu/personal_center_menu.xml b/app/src/main/res/menu/personal_center_menu.xml
index f25dfe24..a34b64cb 100644
--- a/app/src/main/res/menu/personal_center_menu.xml
+++ b/app/src/main/res/menu/personal_center_menu.xml
@@ -59,7 +59,7 @@
         <item
             android:id="@+id/personal_center_menu_version"
             android:icon="@drawable/ic_baseline_layers_24"
-            android:title="版本：23QE4_V1.5.5_20230927_A" />
+            android:title="版本：23QE4_V1.5.6_20230928_A" />
     </group>
     <group android:checkableBehavior="single">
         <item android:title="小标题">
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 6f995238..47974f40 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -2020,7 +2020,7 @@
 
         <!-- 箭头 -->
         <m v="OMDB_OBJECT_ARROW">
-            <area use="obj-area" stroke="#ffffff" repeat="false" src="@src" longEdge="n" hasDirect="true"></area>
+            <area use="obj-area" stroke="#00000000" repeat="false" src="@src" longEdge="n" hasDirect="true"></area>
         </m>
 
         <!-- 道路施工 -->

From 92ae4af99eab4873ab43bed9206a59e1849202c7 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Mon, 9 Oct 2023 14:18:31 +0800
Subject: [PATCH 2/2] merge code

---
 .../java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt  | 3 +++
 .../com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt   | 2 ++
 .../com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt     | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
index 1d1736b8..037b2e97 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
@@ -283,10 +283,13 @@ class LoginViewModel @Inject constructor(
                                     task.status = item.status
                                     task.currentSize = item.currentSize
                                     task.hadLinkDvoList = item.hadLinkDvoList
+                                    task.syncStatus = item.syncStatus
                                     //已上传后不在更新操作时间
                                     if (task.syncStatus != FileManager.Companion.FileUploadStatus.DONE) {
                                         //赋值时间，用于查询过滤
                                         task.operationTime = DateTimeUtil.getNowDate().time
+                                    }else{
+                                        continue
                                     }
                                 } else {
                                     for (hadLink in task.hadLinkDvoList) {
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt
index fc2024b3..d360771c 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt
@@ -220,6 +220,7 @@ class TaskListAdapter(
                 binding.taskUploadBtn.isEnabled = false
                 binding.taskUploadBtn.setProgress(0)
                 binding.taskUploadBtn.setBackgroundColor(binding.root.resources.getColor(R.color.gray_121))
+                Log.e("qj","${taskBean.id}===changeUploadTxtViews===已上传")
             }
 
             FileUploadStatus.ERROR -> {
@@ -234,6 +235,7 @@ class TaskListAdapter(
             FileUploadStatus.NONE -> {
                 binding.taskUploadBtn.setText("未上传")
                 binding.taskUploadBtn.setProgress(0)
+                Log.e("qj","${taskBean.id}===changeUploadTxtViews===未上传")
             }
 
             FileUploadStatus.WAITING -> {
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt
index 5b30d286..323c2a63 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt
@@ -200,10 +200,13 @@ class TaskViewModel @Inject constructor(
                                         task.status = item.status
                                         task.currentSize = item.currentSize
                                         task.hadLinkDvoList = item.hadLinkDvoList
+                                        task.syncStatus = item.syncStatus
                                         //已上传后不在更新操作时间
                                         if (task.syncStatus != FileManager.Companion.FileUploadStatus.DONE) {
                                             //赋值时间，用于查询过滤
                                             task.operationTime = DateTimeUtil.getNowDate().time
+                                        }else{//已上传数据不做更新
+                                            continue
                                         }
                                     } else {
                                         for (hadLink in task.hadLinkDvoList) {