增加质检结果展示页面

app/src/main/java/com/navinfo/omqs/http/NetworkService.kt

@@ -1,6 +1,6 @@
 package com.navinfo.omqs.http
 
-import com.navinfo.collect.library.data.entity.OfflineMapCityBean
+import com.navinfo.omqs.bean.OfflineMapCityBean
 
 
 /**

app/src/main/java/com/navinfo/omqs/http/NetworkServiceImpl.kt

@@ -1,6 +1,6 @@
 package com.navinfo.omqs.http
 
-import com.navinfo.collect.library.data.entity.OfflineMapCityBean
+import com.navinfo.omqs.bean.OfflineMapCityBean
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import javax.inject.Inject

app/src/main/java/com/navinfo/omqs/http/RetrofitNetworkServiceAPI.kt

@@ -1,6 +1,6 @@
 package com.navinfo.omqs.http
 
-import com.navinfo.collect.library.data.entity.OfflineMapCityBean
+import com.navinfo.omqs.bean.OfflineMapCityBean
 import okhttp3.ResponseBody
 import retrofit2.Response
 import retrofit2.http.GET

app/src/main/java/com/navinfo/omqs/http/offlinemapdownload/OfflineMapDownloadManager.kt

@@ -2,16 +2,19 @@ package com.navinfo.omqs.http.offlinemapdownload
 
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.Observer
-import com.navinfo.collect.library.data.entity.OfflineMapCityBean
+import com.navinfo.collect.library.map.NIMapController
+import com.navinfo.omqs.db.RoomAppDatabase
+import com.navinfo.omqs.bean.OfflineMapCityBean
 import com.navinfo.omqs.http.RetrofitNetworkServiceAPI
-import com.navinfo.omqs.tools.RealmCoroutineScope
 import java.util.concurrent.ConcurrentHashMap
 
 /**
  * 管理离线地图下载
  */
 class OfflineMapDownloadManager(
-    val netApi: RetrofitNetworkServiceAPI, val realmManager: RealmCoroutineScope
+    val netApi: RetrofitNetworkServiceAPI,
+    val roomDatabase: RoomAppDatabase,
+    val mapController: NIMapController
 ) {
     /**
      * 最多同时下载数量

app/src/main/java/com/navinfo/omqs/http/offlinemapdownload/OfflineMapDownloadScope.kt

@@ -4,8 +4,8 @@ import android.util.Log
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
-import com.navinfo.collect.library.data.entity.OfflineMapCityBean
 import com.navinfo.omqs.Constant
+import com.navinfo.omqs.bean.OfflineMapCityBean
 import kotlinx.coroutines.*
 import java.io.File
 import java.io.IOException
@@ -32,8 +32,8 @@ class OfflineMapDownloadScope(
     /**
      * 管理观察者，同时只有一个就行了
      */
-//    private var observer: Observer<OfflineMapCityBean>? = null
-    private var lifecycleOwner: LifecycleOwner? = null
+    private val observer = Observer<Any> {}
+//    private var lifecycleOwner: LifecycleOwner? = null
 
     /**
      *通知UI更新
@@ -89,10 +89,10 @@ class OfflineMapDownloadScope(
         if (cityBean.status != status || status == OfflineMapCityBean.LOADING) {
             cityBean.status = status
             downloadData.postValue(cityBean)
-
-            downloadManager.realmManager.launch {
-                downloadManager.realmManager.insertOrUpdate(cityBean)
+            launch(Dispatchers.IO) {
+                downloadManager.roomDatabase.getOfflineMapDao().update(cityBean)
             }
+
         }
     }
 
@@ -101,7 +101,7 @@ class OfflineMapDownloadScope(
      */
     fun observer(owner: LifecycleOwner, ob: Observer<OfflineMapCityBean>) {
         removeObserver()
-        this.lifecycleOwner = owner
+//        this.lifecycleOwner = owner
         downloadData.observe(owner, ob)
     }
 
@@ -156,6 +156,9 @@ class OfflineMapDownloadScope(
                     fileTemp.renameTo(File("${Constant.OFFLINE_MAP_PATH}${cityBean.fileName}"))
                 Log.e("jingo", "文件下载完成 修改文件 $res")
                 change(OfflineMapCityBean.DONE)
+                withContext(Dispatchers.Main) {
+                    downloadManager.mapController.layerManagerHandler.loadBaseMap()
+                }
             } else {
                 change(OfflineMapCityBean.PAUSE)
             }
@@ -168,9 +171,10 @@ class OfflineMapDownloadScope(
     }
 
     fun removeObserver() {
-        lifecycleOwner?.let {
-            downloadData.removeObservers(it)
-            null
-        }
+        downloadData.observeForever(observer)
+//        lifecycleOwner?.let {
+        downloadData.removeObserver(observer)
+//            null
+//        }
     }
 }