From 2b4b2645a66587e999934bd107ef6a32d5753172 Mon Sep 17 00:00:00 2001
From: squallzhjch <zhangjingchao@navinfo.com>
Date: Thu, 27 Jul 2023 11:16:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../omqs/http/taskdownload/TaskDownloadManager.kt    |  6 ++++++
 .../omqs/http/taskdownload/TaskDownloadScope.kt      | 12 ++++++++----
 .../navinfo/omqs/ui/activity/map/MainViewModel.kt    |  2 +-
 .../omqs/ui/fragment/tasklist/TaskListAdapter.kt     |  4 ++++
 .../main/java/com/navinfo/omqs/ui/widget/SignUtil.kt | 11 +++++++++++
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadManager.kt b/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadManager.kt
index e3d31ba4..0c90394a 100644
--- a/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadManager.kt
+++ b/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadManager.kt
@@ -83,6 +83,12 @@ class TaskDownloadManager constructor(
      * 只有等待中的任务和正在下载中的任务才可以进行暂停操作
      */
     fun pause(id: Int) {
+        if (scopeMap.containsKey(id)) {
+            val downloadScope = scopeMap[id]
+            downloadScope?.let {
+                downloadScope.pause()
+            }
+        }
         if (taskScopeMap.containsKey(id)) {
             val downloadScope = taskScopeMap[id]
             downloadScope?.let {
diff --git a/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt b/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt
index f628ed7d..16f873a4 100644
--- a/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt
+++ b/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt
@@ -60,7 +60,11 @@ class TaskDownloadScope(
     fun pause() {
         downloadJob?.cancel("pause")
         launch {
-            change(FileDownloadStatus.PAUSE)
+            if (taskBean.fileSize == 0L) {
+                change(FileDownloadStatus.NONE)
+            } else {
+                change(FileDownloadStatus.PAUSE)
+            }
         }
 
     }
@@ -123,7 +127,7 @@ class TaskDownloadScope(
     /**
      * 导入数据
      */
-    private suspend fun importData(file: File? = null, taskId: Int?=0) {
+    private suspend fun importData(file: File? = null, taskId: Int? = 0) {
         try {
             Log.e("jingo", "importData SSS")
             change(FileDownloadStatus.IMPORTING)
@@ -135,7 +139,7 @@ class TaskDownloadScope(
                     fileNew
                 )
             if (taskId != null) {
-                importOMDBHelper.importOmdbZipFile(importOMDBHelper.omdbFile,taskId).collect {
+                importOMDBHelper.importOmdbZipFile(importOMDBHelper.omdbFile, taskId).collect {
                     Log.e("jingo", "数据安装 $it")
                     if (it == "finish") {
                         change(FileDownloadStatus.DONE)
@@ -183,7 +187,7 @@ class TaskDownloadScope(
                 startPosition = 0
             }
             if (fileTemp.length() > 0 && taskBean.fileSize > 0 && fileTemp.length() == taskBean.fileSize) {
-                importData(fileTemp,taskBean.id)
+                importData(fileTemp, taskBean.id)
                 return
             }
 
diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
index bd112775..88fd2b3e 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
@@ -449,7 +449,7 @@ class MainViewModel @Inject constructor(
             )
 
             if(itemList.size == 1){
-
+                SignUtil.getSignNameText(itemList[0])
             }
         }
     }
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 9d450b60..9f017d33 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
@@ -306,7 +306,11 @@ class TaskListAdapter(
             binding.taskProgressText.text =
                 "$progress%"
             binding.taskDownloadBtn.setProgress(progress)
+        } else {
+            binding.taskDownloadBtn.setProgress(0)
+            binding.taskProgressText.text = ""
         }
+
         when (taskBean.status) {
             FileDownloadStatus.NONE -> {
                 if (binding.taskProgressText.visibility == View.VISIBLE) binding.taskProgressText.visibility =
diff --git a/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt
index 3be3da98..7be5686c 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt
@@ -80,6 +80,8 @@ class SignUtil {
                 2008 -> "种别"
                 //道路方向
                 2010 -> "方向"
+                //车道边界类型
+                2013 -> "车道边界类型"
                 //常规线限速
                 2019 -> "线限速"
                 //车道数
@@ -404,7 +406,16 @@ class SignUtil {
             return stringBuffer.toString()
         }
 
+        /**
+         * 获取车道边界线详细信息
+         */
+        fun getLaneBoundaryInfo(data:RenderEntity){
 
+        }
+
+        /**
+         * 获取道路名列表
+         */
         fun getRoadNameList(data: RenderEntity): MutableList<RoadNameBean> {
             val list = mutableListOf<RoadNameBean>()
             if (data.code == 2011) {