Merge branch 'master' of https://gitlab.navinfo.com/qiji4215/OneMapQS

Conflicts: build.gradle
2023-04-06 10:50:47 +08:00
parent 32b6af86c3 82aa4ab2c0
commit 26982dffbf
46 changed files with 1275 additions and 301 deletions
--- a/app/src/main/java/com/navinfo/omqs/ui/MainActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/MainActivity.kt
@@ -0,0 +1,84 @@
+package com.navinfo.omqs.ui
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.core.view.WindowCompat
+import androidx.navigation.ui.AppBarConfiguration
+import com.github.k1rakishou.fsaf.FileChooser
+import com.github.k1rakishou.fsaf.callback.FSAFActivityCallbacks
+import com.navinfo.omqs.databinding.ActivityMainBinding
+import com.navinfo.omqs.ui.activity.PermissionsActivity
+
+class MainActivity : PermissionsActivity(), FSAFActivityCallbacks {
+
+    private lateinit var appBarConfiguration: AppBarConfiguration
+    private lateinit var binding: ActivityMainBinding
+    private val fileChooser by lazy { FileChooser(this@MainActivity) }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        super.onCreate(savedInstanceState)
+
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+//        val navController = findNavController(R.id.nav_host_fragment_content_main)
+//        appBarConfiguration = AppBarConfiguration(navController.graph)
+//        setupActionBarWithNavController(navController, appBarConfiguration)
+
+        fileChooser.setCallbacks(this@MainActivity)
+//        binding.fab.setOnClickListener { view ->
+//            Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+//                .setAnchorView(R.id.fab)
+//                .setAction("Action", null).show()
+//            // 开始数据导入功能
+//            fileChooser.openChooseFileDialog(object: FileChooserCallback() {
+//                override fun onCancel(reason: String) {
+//                }
+//
+//                override fun onResult(uri: Uri) {
+//                    val file = UriUtils.uri2File(uri)
+//                    Snackbar.make(view, "文件大小为：${file.length()}", Snackbar.LENGTH_LONG)
+//                        .show()
+//                }
+//            })
+//        }
+    }
+
+    override fun onPermissionsGranted() {
+    }
+
+    override fun onPermissionsDenied() {
+    }
+
+//    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+//        // Inflate the menu; this adds items to the action bar if it is present.
+//        menuInflater.inflate(R.menu.menu_main, menu)
+//        return true
+//    }
+
+//    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+//        // Handle action bar item clicks here. The action bar will
+//        // automatically handle clicks on the Home/Up button, so long
+//        // as you specify a parent activity in AndroidManifest.xml.
+//        return when (item.itemId) {
+//            R.id.action_settings -> true
+//            else -> super.onOptionsItemSelected(item)
+//        }
+//    }
+//
+//    override fun onSupportNavigateUp(): Boolean {
+//        val navController = findNavController(R.id.nav_host_fragment_content_main)
+//        return navController.navigateUp(appBarConfiguration)
+//                || super.onSupportNavigateUp()
+//    }
+
+    override fun fsafStartActivityForResult(intent: Intent, requestCode: Int) {
+        startActivityForResult(intent, requestCode)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        fileChooser.onActivityResult(requestCode, resultCode, data)
+    }
+}
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/PermissionsActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/PermissionsActivity.kt
@@ -16,9 +16,10 @@ open class PermissionsActivity : BaseActivity() {
        val permissionList = mutableListOf<String>()
        if (applicationInfo.targetSdkVersion >= Build.VERSION_CODES.TIRAMISU) {
            //文件读写
-            permissionList.add(Permission.READ_MEDIA_IMAGES)
-            permissionList.add(Permission.READ_MEDIA_AUDIO)
-            permissionList.add(Permission.READ_MEDIA_VIDEO)
+//            permissionList.add(Permission.READ_MEDIA_IMAGES)
+//            permissionList.add(Permission.READ_MEDIA_AUDIO)
+//            permissionList.add(Permission.READ_MEDIA_VIDEO)
+            permissionList.add(Permission.MANAGE_EXTERNAL_STORAGE)
        } else {
            //文件读写
            permissionList.add(Permission.WRITE_EXTERNAL_STORAGE)
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt
@@ -7,15 +7,19 @@ import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AlertDialog
 import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.Observer
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.ActivityLoginBinding
 import com.navinfo.omqs.ui.activity.PermissionsActivity
 import com.navinfo.omqs.ui.activity.map.MainActivity
+import dagger.hilt.android.AndroidEntryPoint

 /**
 * 登陆页面
 */
+
+@AndroidEntryPoint
 class LoginActivity : PermissionsActivity() {

    private lateinit var binding: ActivityLoginBinding
@@ -30,41 +34,52 @@ class LoginActivity : PermissionsActivity() {
        initView()
    }

-    private fun initView() {
-        //登录校验，初始化成功
-        viewModel.loginStatus.observe(this) {
-            when (it) {
-                LoginStatus.LOGIN_STATUS_NET_LOADING -> {
-                    loginDialog("验证用户信息...")
-                }
-                LoginStatus.LOGIN_STATUS_FOLDER_INIT -> {
-                    loginDialog("检查本地数据...")
-                }
-                LoginStatus.LOGIN_STATUS_FOLDER_FAILURE -> {
-                    Toast.makeText(this, "文件夹初始化失败", Toast.LENGTH_SHORT).show()
-                    loginDialog?.dismiss()
-                    loginDialog = null
-                }
-                LoginStatus.LOGIN_STATUS_NET_FAILURE -> {
-                    Toast.makeText(this, "网络访问失败", Toast.LENGTH_SHORT).show()
-                    loginDialog?.dismiss()
-                    loginDialog = null
-                }
-                LoginStatus.LOGIN_STATUS_SUCCESS -> {
-                    val intent = Intent(this@LoginActivity, MainActivity::class.java)
-                    startActivity(intent)
+    /**
+     * 观察登录状态，把Observer提出来是为了防止每次数据变化都会有新的observer创建
+     * 还有为了方便释放（需不需要手动释放？不清楚）不需要释放，当viewmodel观察到activity/fragment 的生命周期时会自动释放
+     * PS:不要在 observer 中修改 LiveData 的值的数据，会影响其他 observer
+     */
+    private val loginObserve = Observer<LoginStatus> {
+        when (it) {
+            LoginStatus.LOGIN_STATUS_NET_LOADING -> {
+                loginDialog("验证用户信息...")
+            }
+            LoginStatus.LOGIN_STATUS_FOLDER_INIT -> {
+                loginDialog("检查本地数据...")
+            }
+            LoginStatus.LOGIN_STATUS_FOLDER_FAILURE -> {
+                Toast.makeText(this, "文件夹初始化失败", Toast.LENGTH_SHORT).show()
+                loginDialog?.dismiss()
+                loginDialog = null
+            }
+            LoginStatus.LOGIN_STATUS_NET_FAILURE -> {
+                Toast.makeText(this, "网络访问失败", Toast.LENGTH_SHORT).show()
+                loginDialog?.dismiss()
+                loginDialog = null
+            }
+            LoginStatus.LOGIN_STATUS_SUCCESS -> {
+                val intent = Intent(this@LoginActivity, MainActivity::class.java)
+                startActivity(intent)
 //                    finish()
-                    loginDialog?.dismiss()
-                    loginDialog = null
-                }
-                LoginStatus.LOGIN_STATUS_CANCEL -> {
-                    loginDialog?.dismiss()
-                    loginDialog = null
-                }
+                loginDialog?.dismiss()
+                loginDialog = null
+            }
+            LoginStatus.LOGIN_STATUS_CANCEL -> {
+                loginDialog?.dismiss()
+                loginDialog = null
+            }
+            LoginStatus.LOGIN_STATUS_NET_OFFLINE_MAP -> {
+                loginDialog("检查离线地图...")
            }
        }
    }

+    private fun initView() {
+        //登录校验，初始化成功
+        viewModel.loginStatus.observe(this, loginObserve)
+
+    }
+
    /**
     * 登录dialog
     */
@@ -73,7 +88,7 @@ class LoginActivity : PermissionsActivity() {
            loginDialog = MaterialAlertDialogBuilder(
                this, com.google.android.material.R.style.MaterialAlertDialog_Material3
            ).setTitle("登录").setMessage(message).show()
-            loginDialog!!.setCanceledOnTouchOutside(true)
+            loginDialog!!.setCanceledOnTouchOutside(false)
            loginDialog!!.setOnCancelListener {
                viewModel.cancelLogin()
            }
@@ -84,13 +99,17 @@ class LoginActivity : PermissionsActivity() {

    //进应用根本不调用，待查
    override fun onPermissionsGranted() {
-        Log.e("jingo","调用了吗")
+        Log.e("jingo", "调用了吗")

    }

    override fun onPermissionsDenied() {
    }

+    override fun onDestroy() {
+        super.onDestroy()
+    }
+
    /**
     * 处理登录按钮
     */
--- 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
@@ -7,11 +7,15 @@ import android.widget.Toast
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.navinfo.omqs.Constant
 import com.navinfo.omqs.bean.LoginUserBean
+import com.navinfo.omqs.http.NetResult
+import com.navinfo.omqs.http.NetworkService
+import com.navinfo.omqs.tools.FileManager
+import com.navinfo.omqs.tools.RealmCoroutineScope
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.*
 import okio.IOException
-import java.io.File
+import javax.inject.Inject

 enum class LoginStatus {
    /**
@@ -19,6 +23,11 @@ enum class LoginStatus {
     */
    LOGIN_STATUS_NET_LOADING,

+    /**
+     * 访问离线地图列表
+     */
+    LOGIN_STATUS_NET_OFFLINE_MAP,
+
    /**
     * 初始化文件夹
     */
@@ -45,7 +54,10 @@ enum class LoginStatus {
    LOGIN_STATUS_CANCEL,
 }

-class LoginViewModel(
+@HiltViewModel
+class LoginViewModel @Inject constructor(
+    private val networkService: NetworkService,
+    private val realmManager: RealmCoroutineScope
 ) : ViewModel() {
    //用户信息
    val loginUser: MutableLiveData<LoginUserBean> = MutableLiveData()
@@ -65,7 +77,7 @@ class LoginViewModel(
     */
    fun onClick(view: View) {
        loginUser.value!!.username = "admin2"
-        loginUser.postValue(loginUser.value)
+        loginUser.value = loginUser.value
    }

    /**
@@ -81,7 +93,6 @@ class LoginViewModel(
        //不指定IO，会在主线程里运行
        jobLogin = viewModelScope.launch(Dispatchers.IO) {
            loginCheck(context, userName, password)
-            Log.e("jingo", "运行完了1？${Thread.currentThread().name}")
        }
    }

@@ -90,52 +101,68 @@ class LoginViewModel(
     */

    private suspend fun loginCheck(context: Context, userName: String, password: String) {
-        Log.e("jingo", "我在哪个线程里？${Thread.currentThread().name}")
        //上面调用了线程切换，这里不用调用，即使调用了还是在同一个线程中，除非自定义协程域？（待验证）
 //        withContext(Dispatchers.IO) {
-        Log.e("jingo", "delay之前？${Thread.currentThread().name}")
        //网络访问
        loginStatus.postValue(LoginStatus.LOGIN_STATUS_NET_LOADING)
-        //假装网络访问，等待3秒
-        delay(3000)
+        //假装网络访问，等待2秒
+        delay(1000)
        //文件夹初始化
        try {
            loginStatus.postValue(LoginStatus.LOGIN_STATUS_FOLDER_INIT)
-            createRootFolder(context)
+            createUserFolder(context)
+            // 初始化Realm
        } catch (e: IOException) {
            loginStatus.postValue(LoginStatus.LOGIN_STATUS_FOLDER_FAILURE)
        }
+
        //假装解压文件等
        delay(1000)
-        loginStatus.postValue(LoginStatus.LOGIN_STATUS_SUCCESS)
-        Log.e("jingo", "delay之后？${Thread.currentThread().name}")
+        loginStatus.postValue(LoginStatus.LOGIN_STATUS_NET_OFFLINE_MAP)
+        when (val result = networkService.getOfflineMapCityList()) {
+            is NetResult.Success -> {

-//        }
+                if (result.data != null) {
+                    for (cityBean in result.data) {
+                        FileManager.checkOfflineMapFileInfo(cityBean)
+                    }
+                    realmManager.launch {
+                        realmManager.insertOrUpdate(result.data)
+                    }
+                }
+            }
+            is NetResult.Error -> {
+                withContext(Dispatchers.Main) {
+                    Toast.makeText(context, "${result.exception.message}", Toast.LENGTH_SHORT)
+                        .show()
+                }
+            }
+            is NetResult.Failure -> {
+                withContext(Dispatchers.Main) {
+                    Toast.makeText(context, "${result.code}:${result.msg}", Toast.LENGTH_SHORT)
+                        .show()
+                }
+            }
+            NetResult.Loading -> {}
+        }
+        loginStatus.postValue(LoginStatus.LOGIN_STATUS_SUCCESS)
    }

-
+    /**
+     * 创建用户目录
+     */
    @Throws(IOException::class)
-    private fun createRootFolder(context: Context) {
-        // 在SD卡创建项目目录
-        val sdCardPath = context.getExternalFilesDir(null)
-        sdCardPath?.let {
-            Constant.ROOT_PATH = sdCardPath.absolutePath
-            Constant.MAP_PATH = Constant.ROOT_PATH + "/map/"
-            val file = File(Constant.MAP_PATH)
-            if (!file.exists()) {
-                file.mkdirs()
-            }
-        }
+    private fun createUserFolder(context: Context) {
+        // 在SD卡创建用户目录，解压资源等
    }

    /**
     * 取消登录
     */
    fun cancelLogin() {
-        Log.e("jingo", "取消了？${Thread.currentThread().name}")
        jobLogin?.let {
            it.cancel()
-            loginStatus.postValue(LoginStatus.LOGIN_STATUS_CANCEL)
+            loginStatus.value = LoginStatus.LOGIN_STATUS_CANCEL
        }
    }

@@ -143,6 +170,4 @@ class LoginViewModel(
        super.onCleared()
        cancelLogin()
    }
-
-
 }
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
@@ -11,6 +11,7 @@ import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.ActivityMainBinding
+import com.navinfo.omqs.http.offlinemapdownload.OfflineMapDownloadManager
 import com.navinfo.omqs.ui.activity.BaseActivity
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -27,6 +28,8 @@ class MainActivity : BaseActivity() {
    //注入地图控制器
    @Inject
    lateinit var mapController: NIMapController
+    @Inject
+    lateinit var offlineMapDownloadManager: OfflineMapDownloadManager

    override fun onCreate(savedInstanceState: Bundle?) {
        WindowCompat.setDecorFitsSystemWindows(window, false)
@@ -66,7 +69,6 @@ class MainActivity : BaseActivity() {
        super.onDestroy()
        mapController.mMapView.onDestroy()
        mapController.locationLayerHandler.stopLocation()
-        Log.e("jingo", "MainActivity 销毁")
    }

    override fun onResume() {
--- 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
@@ -25,7 +25,6 @@ class MainViewModel @Inject constructor(
    }

    override fun onCleared() {
-        Log.e("jingo","MainViewModel 被释放了")
        super.onCleared()
    }
 }
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapAdapter.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapAdapter.kt
@@ -3,6 +3,7 @@ package com.navinfo.omqs.ui.fragment.offlinemap
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.viewpager2.adapter.FragmentStateAdapter
+import dagger.hilt.EntryPoint

 /**
 * 离线地图主页面，viewpage适配器
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapCityListAdapter.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapCityListAdapter.kt
@@ -1,33 +1,134 @@
 package com.navinfo.omqs.ui.fragment.offlinemap

-import androidx.databinding.ViewDataBinding
+import android.content.Context
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.Observer
+import com.navinfo.collect.library.data.entity.OfflineMapCityBean
 import com.navinfo.omqs.R
-import com.navinfo.omqs.BR
-import com.navinfo.omqs.bean.OfflineMapCityBean
 import com.navinfo.omqs.databinding.AdapterOfflineMapCityBinding
+import com.navinfo.omqs.http.offlinemapdownload.OfflineMapDownloadManager
 import com.navinfo.omqs.ui.other.BaseRecyclerViewAdapter
 import com.navinfo.omqs.ui.other.BaseViewHolder
 import javax.inject.Inject

 /**
 * 离线地图城市列表 RecyclerView 适配器
+ *
+ * 在 RecycleView 的 ViewHolder 中监听 ViewModel 的 LiveData，然后此时传递的 lifecycleOwner 是对应的 Fragment。由于 ViewHolder 的生命周期是比 Fragment 短的，所以当 ViewHolder 销毁时，由于 Fragment 的 Lifecycle 还没有结束，此时 ViewHolder 会发生内存泄露（监听的 LiveData 没有解绑）
+ *   这种场景下有两种解决办法：
+ *使用 LiveData 的 observeForever 然后在 ViewHolder 销毁前手动调用 removeObserver
+ *使用 LifecycleRegistry 给 ViewHolder 分发生命周期(这里使用了这个)
 */
+class OfflineMapCityListAdapter @Inject constructor(
+    private val downloadManager: OfflineMapDownloadManager, private val context: Context
+) : BaseRecyclerViewAdapter<OfflineMapCityBean>() {

-class OfflineMapCityListAdapter @Inject constructor() :
-    BaseRecyclerViewAdapter<OfflineMapCityBean>() {
-    override fun onBindViewHolder(holder: BaseViewHolder, position: Int) {
-        var binding: ViewDataBinding = holder.dataBinding
-        //立刻刷新UI，解决闪烁
-//        binding.executePendingBindings()
-        binding.setVariable(BR.cityBean, data[position])
-        (binding as AdapterOfflineMapCityBinding).offlineMapDownloadBtn.setOnClickListener {

+    private val downloadBtnClick = View.OnClickListener() {
+        if (it.tag != null) {
+            val cityBean = data[it.tag as Int]
+            when (cityBean.status) {
+                OfflineMapCityBean.NONE, OfflineMapCityBean.UPDATE, OfflineMapCityBean.PAUSE, OfflineMapCityBean.ERROR -> {
+                    Log.e("jingo", "开始下载 ${cityBean.status}")
+                    downloadManager.start(cityBean.id)
+                }
+                OfflineMapCityBean.LOADING, OfflineMapCityBean.WAITING -> {
+                    Log.e("jingo", "暂停 ${cityBean.status}")
+                    downloadManager.pause(cityBean.id)
+                }
+                else -> {
+                    Log.e("jingo", "暂停 ${cityBean.status}")
+                }
+            }
        }
+    }

+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder {
+        val viewBinding =
+            AdapterOfflineMapCityBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return BaseViewHolder(viewBinding)
+    }
+
+    override fun onViewRecycled(holder: BaseViewHolder) {
+        super.onViewRecycled(holder)
+        //页面滑动时会用holder重构页面，但是对进度条的监听回调会一直返回，扰乱UI，所以当当前holder去重构的时候，移除监听
+        downloadManager.removeObserver(holder.tag)
+    }
+
+    override fun onBindViewHolder(holder: BaseViewHolder, position: Int) {
+        val binding: AdapterOfflineMapCityBinding =
+            holder.viewBinding as AdapterOfflineMapCityBinding
+        //牺牲性能立刻刷新UI，解决闪烁 这里不用
+//        binding.executePendingBindings()
+        val cityBean = data[position]
+        //tag 方便onclick里拿到数据
+        holder.tag = cityBean.id
+        changeViews(binding, cityBean)
+        downloadManager.addTask(cityBean)
+        downloadManager.observer(cityBean.id, holder, DownloadObserver(cityBean.id, binding))
+        binding.offlineMapDownloadBtn.tag = position
+        binding.offlineMapDownloadBtn.setOnClickListener(downloadBtnClick)
+        binding.offlineMapCityName.text = cityBean.name
+        binding.offlineMapCitySize.text = cityBean.getFileSizeText()
+    }
+
+    inner class DownloadObserver(val id: String, val binding: AdapterOfflineMapCityBinding) :
+        Observer<OfflineMapCityBean> {
+        override fun onChanged(t: OfflineMapCityBean?) {
+            if (id == t?.id)
+                changeViews(binding, t)
+        }
+    }
+
+
+    private fun changeViews(binding: AdapterOfflineMapCityBinding, cityBean: OfflineMapCityBean) {
+        binding.offlineMapProgress.progress =
+            (cityBean.currentSize * 100 / cityBean.fileSize).toInt()
+        when (cityBean.status) {
+            OfflineMapCityBean.NONE -> {
+                if (binding.offlineMapProgress.visibility == View.VISIBLE) binding.offlineMapProgress.visibility =
+                    View.INVISIBLE
+                binding.offlineMapDownloadBtn.text = "下载"
+            }
+            OfflineMapCityBean.WAITING -> {
+                if (binding.offlineMapProgress.visibility != View.VISIBLE) binding.offlineMapProgress.visibility =
+                    View.VISIBLE
+                binding.offlineMapDownloadBtn.text = "等待中"
+            }
+            OfflineMapCityBean.LOADING -> {
+                if (binding.offlineMapProgress.visibility != View.VISIBLE) binding.offlineMapProgress.visibility =
+                    View.VISIBLE
+                binding.offlineMapDownloadBtn.text = "暂停"
+            }
+            OfflineMapCityBean.PAUSE -> {
+                if (binding.offlineMapProgress.visibility != View.VISIBLE) binding.offlineMapProgress.visibility =
+                    View.VISIBLE
+                binding.offlineMapDownloadBtn.text = "继续"
+            }
+            OfflineMapCityBean.ERROR -> {
+                if (binding.offlineMapProgress.visibility != View.VISIBLE) binding.offlineMapProgress.visibility =
+                    View.VISIBLE
+                binding.offlineMapDownloadBtn.text = "重试"
+            }
+            OfflineMapCityBean.DONE -> {
+                if (binding.offlineMapProgress.visibility == View.VISIBLE) binding.offlineMapProgress.visibility =
+                    View.INVISIBLE
+                binding.offlineMapDownloadBtn.text = "已完成"
+            }
+            OfflineMapCityBean.UPDATE -> {
+                if (binding.offlineMapProgress.visibility == View.VISIBLE) binding.offlineMapProgress.visibility =
+                    View.INVISIBLE
+                binding.offlineMapDownloadBtn.text = "更新"
+            }
+        }
    }

    override fun getItemViewType(position: Int): Int {
        return R.layout.adapter_offline_map_city
    }
+}
+

-}
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapCityListFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapCityListFragment.kt
@@ -10,17 +10,28 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.navinfo.omqs.databinding.FragmentOfflineMapCityListBinding
+import com.navinfo.omqs.http.RetrofitNetworkServiceAPI
+import com.navinfo.omqs.http.offlinemapdownload.OfflineMapDownloadManager
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject

 /**
 * 离线地图城市列表
 */
@AndroidEntryPoint
 class OfflineMapCityListFragment : Fragment() {
+    @Inject
+    lateinit var downloadManager: OfflineMapDownloadManager
    private var _binding: FragmentOfflineMapCityListBinding? = null
    private val viewModel by viewModels<OfflineMapCityListViewModel>()
    private val binding get() = _binding!!
-    private val adapter: OfflineMapCityListAdapter by lazy { OfflineMapCityListAdapter() }
+    private val adapter: OfflineMapCityListAdapter by lazy {
+        OfflineMapCityListAdapter(
+            downloadManager,
+            requireContext()
+        )
+    }
+
    override fun onCreateView(
        inflater: LayoutInflater, container: ViewGroup?,
        savedInstanceState: Bundle?
@@ -33,8 +44,10 @@ class OfflineMapCityListFragment : Fragment() {
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)
        val layoutManager = LinearLayoutManager(context)
-        _binding!!.offlineMapCityListRecyclerview.layoutManager = layoutManager
-        _binding!!.offlineMapCityListRecyclerview.adapter = adapter
+        //// 设置 RecyclerView 的固定大小，避免在滚动时重新计算视图大小和布局，提高性能
+        binding.offlineMapCityListRecyclerview.setHasFixedSize(true)
+        binding.offlineMapCityListRecyclerview.layoutManager = layoutManager
+        binding.offlineMapCityListRecyclerview.adapter = adapter
        viewModel.cityListLiveData.observe(viewLifecycleOwner) {
            adapter.refreshData(it)
        }
@@ -44,6 +57,5 @@ class OfflineMapCityListFragment : Fragment() {
    override fun onDestroyView() {
        super.onDestroyView()
        _binding = null
-        Log.e("jingo","OfflineMapCityListFragment onDestroyView")
    }
 }
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapCityListViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapCityListViewModel.kt
@@ -1,16 +1,18 @@
 package com.navinfo.omqs.ui.fragment.offlinemap

-import android.app.Application
 import android.content.Context
-import android.widget.Toast
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.navinfo.omqs.http.NetResult
-import com.navinfo.omqs.http.NetworkService
-import com.navinfo.omqs.bean.OfflineMapCityBean
+import com.navinfo.collect.library.data.entity.OfflineMapCityBean
+import com.navinfo.omqs.tools.FileManager
+import com.navinfo.omqs.tools.RealmCoroutineScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import io.realm.Realm
+import io.realm.Sort
+import io.realm.kotlin.where
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import javax.inject.Inject

@@ -19,8 +21,7 @@ import javax.inject.Inject
 */
@HiltViewModel
 class OfflineMapCityListViewModel @Inject constructor(
-    private val networkService: NetworkService,
-    @ApplicationContext val context: Context
+    @ApplicationContext val context: Context,
 ) : ViewModel() {

    val cityListLiveData = MutableLiveData<List<OfflineMapCityBean>>()
@@ -29,21 +30,15 @@ class OfflineMapCityListViewModel @Inject constructor(
     * 去获取离线地图列表
     */
    fun getCityList() {
-        viewModelScope.launch {
-            when (val result = networkService.getOfflineMapCityList()) {
-                is NetResult.Success -> {
-                    cityListLiveData.postValue(result.data!!)
-                }
-                is NetResult.Error -> {
-                    Toast.makeText(context, "${result.exception.message}", Toast.LENGTH_SHORT)
-                        .show()
-                }
-                is NetResult.Failure -> {
-                    Toast.makeText(context, "${result.code}:${result.msg}", Toast.LENGTH_SHORT)
-                        .show()
-                }
-                NetResult.Loading -> {}
+        viewModelScope.launch(Dispatchers.IO) {
+            val realm = Realm.getDefaultInstance()
+            val objects = realm.where<OfflineMapCityBean>().findAll().sort("id", Sort.ASCENDING)
+            val list = realm.copyFromRealm(objects)
+            realm.close()
+            for (item in list) {
+                FileManager.checkOfflineMapFileInfo(item)
            }
+            cityListLiveData.postValue(list)
        }
    }
 }
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapFragment.kt
@@ -61,6 +61,5 @@ class OfflineMapFragment : Fragment() {
    override fun onDestroyView() {
        super.onDestroyView()
        _binding = null
-        Log.e("jingo","OfflineMapFragment onDestroyView")
    }
 }
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapStateListFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapStateListFragment.kt
@@ -33,6 +33,5 @@ class OfflineMapStateListFragment : Fragment() {
    override fun onDestroyView() {
        super.onDestroyView()
        _binding = null
-        Log.e("jingo","OfflineMapStateListFragment onDestroyView")
    }
 }
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapViewHolder.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapViewHolder.kt
@@ -0,0 +1,10 @@
+package com.navinfo.omqs.ui.fragment.offlinemap
+
+import com.navinfo.omqs.databinding.AdapterOfflineMapCityBinding
+import com.navinfo.omqs.ui.other.BaseViewHolder
+
+class OfflineMapViewHolder(dataBinding: AdapterOfflineMapCityBinding) : BaseViewHolder(dataBinding) {
+    init{
+        dataBinding.offlineMapDownloadBtn
+    }
+}
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
@@ -1,22 +1,30 @@
 package com.navinfo.omqs.ui.fragment.personalcenter

+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
+import com.blankj.utilcode.util.UriUtils
+import com.github.k1rakishou.fsaf.FileChooser
+import com.github.k1rakishou.fsaf.callback.FSAFActivityCallbacks
+import com.github.k1rakishou.fsaf.callback.FileChooserCallback
 import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.FragmentPersonalCenterBinding

 /**
 * 个人中心
 */
-class PersonalCenterFragment : Fragment() {
+class PersonalCenterFragment : Fragment(), FSAFActivityCallbacks {

    private var _binding: FragmentPersonalCenterBinding? = null
    private val binding get() = _binding!!
+    private val fileChooser by lazy { FileChooser(requireContext()) }
+    private val viewModel by lazy { viewModels<PersonalCenterViewModel>().value }


    override fun onCreateView(
@@ -25,23 +33,45 @@ class PersonalCenterFragment : Fragment() {
    ): View {
        _binding = FragmentPersonalCenterBinding.inflate(inflater, container, false)
        return binding.root
-
    }

    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)
-        Log.e("jingo", "NIMapController PersonalCenterFragment onViewCreated")
        binding.root.setNavigationItemSelectedListener {
            when (it.itemId) {
                R.id.personal_center_menu_offline_map ->
                    findNavController().navigate(R.id.action_FirstFragment_to_SecondFragment)
+                R.id.personal_center_menu_import_data -> {
+                    // 用户选中导入数据，打开文件选择器，用户选择导入的数据文件目录
+                    fileChooser.openChooseFileDialog(object: FileChooserCallback() {
+                        override fun onCancel(reason: String) {
+                        }
+
+                        override fun onResult(uri: Uri) {
+                            val file = UriUtils.uri2File(uri)
+                            // 开始导入数据
+                            viewModel.importOmdbData(file)
+                        }
+                    })
+                }
            }
            true
        }
+
+        fileChooser.setCallbacks(this@PersonalCenterFragment)
    }

    override fun onDestroyView() {
        super.onDestroyView()
        _binding = null
    }
+
+    override fun fsafStartActivityForResult(intent: Intent, requestCode: Int) {
+        startActivityForResult(intent, requestCode)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        fileChooser.onActivityResult(requestCode, resultCode, data)
+    }
 }
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt
@@ -0,0 +1,16 @@
+package com.navinfo.omqs.ui.fragment.personalcenter
+
+import androidx.lifecycle.ViewModel
+import java.io.File
+
+class PersonalCenterViewModel: ViewModel() {
+    fun importOmdbData(omdbFile: File) {
+        // 检查File是否为sqlite数据库
+        if (omdbFile == null || omdbFile.exists()) {
+            throw Exception("文件不存在")
+        }
+        if (!omdbFile.name.endsWith(".sqlite") and !omdbFile.name.endsWith("db")) {
+            throw Exception("文件不存在")
+        }
+    }
+}
--- a/app/src/main/java/com/navinfo/omqs/ui/other/BaseRecyclerViewAdapter.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/other/BaseRecyclerViewAdapter.kt
@@ -1,6 +1,7 @@
 package com.navinfo.omqs.ui.other

 import android.view.LayoutInflater
+import android.view.View.OnClickListener
 import android.view.ViewGroup
 import androidx.databinding.DataBindingUtil
 import androidx.recyclerview.widget.RecyclerView
@@ -10,23 +11,51 @@ import androidx.recyclerview.widget.RecyclerView
 */
 abstract class BaseRecyclerViewAdapter<T>(var data: List<T> = listOf()) :
    RecyclerView.Adapter<BaseViewHolder>() {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder {
-        return BaseViewHolder(
-            DataBindingUtil.inflate(
-                LayoutInflater.from(parent.context),
-                viewType,
-                parent,
-                false
-            )
-        )
-    }
+    //    private var recyclerView: RecyclerView? = null
+//    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder {
+//
+//
+//
+//        return BaseViewHolder(
+//            DataBindingUtil.inflate(
+//                LayoutInflater.from(parent.context),
+//                viewType,
+//                parent,
+//                false
+//            )
+//        )
+//    }
+

    override fun getItemCount(): Int {
        return data.size
    }

-    fun refreshData(newData:List<T>){
+    fun refreshData(newData: List<T>) {
        this.data = newData
        this.notifyDataSetChanged()
    }
+
+
+    override fun onViewAttachedToWindow(holder: BaseViewHolder) {
+        super.onViewAttachedToWindow(holder)
+        holder.onStart()
+    }
+
+    override fun onViewDetachedFromWindow(holder: BaseViewHolder) {
+        super.onViewDetachedFromWindow(holder)
+        holder.apply {
+            onStop()
+        }
+    }
+//
+//    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
+//        super.onAttachedToRecyclerView(recyclerView)
+//        this.recyclerView = recyclerView
+//    }
+//
+//    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
+//        super.onDetachedFromRecyclerView(recyclerView)
+//        this.recyclerView = null
+//    }
 }
--- a/app/src/main/java/com/navinfo/omqs/ui/other/BaseViewHolder.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/other/BaseViewHolder.kt
@@ -1,11 +1,55 @@
 package com.navinfo.omqs.ui.other

-import androidx.databinding.ViewDataBinding
+import android.view.View
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
 import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding

 /**
 * dataBinding viewHolder 基类
+ * LifecycleRegistry 这是一个生命周期注册器，继承自 Lifecycle，LifecycleOwner 通过这个类来分发生命周期事件，并在 getLifecycle() 中返回
 */
-open class BaseViewHolder(var dataBinding: ViewDataBinding) :
-    RecyclerView.ViewHolder(dataBinding.root) {
+open class BaseViewHolder(val viewBinding: ViewBinding) :
+    RecyclerView.ViewHolder(viewBinding.root), LifecycleOwner {
+    private val lifecycleRegistry = LifecycleRegistry(this)
+    var tag = ""
+
+    init {
+//        dataBinding.lifecycleOwner = this
+        lifecycleRegistry.currentState = Lifecycle.State.INITIALIZED
+        lifecycleRegistry.currentState = Lifecycle.State.CREATED
+        itemView.addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {
+            // View onDetached 的时候回调 onDestroy()
+            override fun onViewDetachedFromWindow(v: View) {
+                itemView.removeOnAttachStateChangeListener(this)
+                onDestroy()
+            }
+
+            // View onAttached 的时候回调 onCreate()
+            override fun onViewAttachedToWindow(v: View) {
+                onStart()
+            }
+        })
+    }
+
+    fun onStart() {
+        lifecycleRegistry.currentState = Lifecycle.State.STARTED     //
+        lifecycleRegistry.currentState = Lifecycle.State.RESUMED     //   ON_RESUME EVENT
+    }
+
+    fun onStop() {
+        lifecycleRegistry.currentState = Lifecycle.State.STARTED    //
+        lifecycleRegistry.currentState = Lifecycle.State.CREATED    //     ON_STOP EVENT
+    }
+
+    fun onDestroy() {
+        lifecycleRegistry.currentState = Lifecycle.State.DESTROYED   ///  ON_DESTROY EVENT
+    }
+
+
+    override fun getLifecycle(): Lifecycle {
+        return lifecycleRegistry
+    }
 }
--- a/app/src/main/java/com/navinfo/omqs/ui/widget/MyProgressBar.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/widget/MyProgressBar.kt
@@ -5,10 +5,13 @@ import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.Rect
-import android.opengl.ETC1.getHeight
-import android.opengl.ETC1.getWidth
 import android.util.AttributeSet
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.LinearLayout
 import android.widget.ProgressBar
+import com.navinfo.omqs.R


 /**
@@ -18,8 +21,13 @@ class MyProgressBar : ProgressBar {
    private lateinit var mPaint: Paint
    private var text: String = ""
    private var rate = 0f
+    private lateinit var bar: ProgressBar

    constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) {
+//        LayoutInflater.from(context).inflate(
+//            R.layout.my_projressbar, this,
+//            true
+//        );
        initView()
    }

@@ -33,6 +41,7 @@ class MyProgressBar : ProgressBar {
        mPaint.color = Color.BLUE
    }

+
    @Synchronized
    override fun setProgress(progress: Int) {
        setText(progress)
@@ -40,7 +49,7 @@ class MyProgressBar : ProgressBar {
    }

    private fun setText(progress: Int) {
-        rate = progress * 1.0f / this.getMax()
+        rate = progress * 1.0f / this.max
        val i = (rate * 100).toInt()
        text = "$i%"
    }
@@ -53,12 +62,14 @@ class MyProgressBar : ProgressBar {
        // int x = (getWidth()/2) - rect.centerX();
        // int y = (getHeight()/2) - rect.centerY();
        var x = (width * rate).toInt()
-        if (x == width) {
+        val dx = width - rect.right
+        if (x > dx) {
            // 如果为百分之百则在左边绘制。
-            x = width - rect.right
+            x = dx
        }
-        val y: Int = 0 - rect.top
-        mPaint.textSize = 22f
+        mPaint.textSize = 24f
+        val y: Int = 10 - rect.top
+
        canvas.drawText(text, x.toFloat(), y.toFloat(), mPaint)
    }
 }