增加离线地图下载流程

app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt

@@ -7,6 +7,7 @@ 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
@@ -30,41 +31,49 @@ 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
             }
         }
     }
 
+    private fun initView() {
+        //登录校验，初始化成功
+        viewModel.loginStatus.observe(this, loginObserve)
+
+    }
+
     /**
      * 登录dialog
      */
@@ -73,7 +82,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 +93,17 @@ class LoginActivity : PermissionsActivity() {
 
     //进应用根本不调用，待查
     override fun onPermissionsGranted() {
-        Log.e("jingo","调用了吗")
+        Log.e("jingo", "调用了吗")
 
     }
 
     override fun onPermissionsDenied() {
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+    }
+
     /**
      * 处理登录按钮
      */

app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt

@@ -5,6 +5,7 @@ import android.util.Log
 import android.view.View
 import android.widget.Toast
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.navinfo.omqs.Constant
@@ -65,7 +66,7 @@ class LoginViewModel(
      */
     fun onClick(view: View) {
         loginUser.value!!.username = "admin2"
-        loginUser.postValue(loginUser.value)
+        loginUser.value = loginUser.value
     }
 
     /**
@@ -81,7 +82,6 @@ class LoginViewModel(
         //不指定IO，会在主线程里运行
         jobLogin = viewModelScope.launch(Dispatchers.IO) {
             loginCheck(context, userName, password)
-            Log.e("jingo", "运行完了1？${Thread.currentThread().name}")
         }
     }
 
@@ -90,14 +90,12 @@ 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)
@@ -108,7 +106,6 @@ class LoginViewModel(
         //假装解压文件等
         delay(1000)
         loginStatus.postValue(LoginStatus.LOGIN_STATUS_SUCCESS)
-        Log.e("jingo", "delay之后？${Thread.currentThread().name}")
 
 //        }
     }
@@ -121,6 +118,7 @@ class LoginViewModel(
         sdCardPath?.let {
             Constant.ROOT_PATH = sdCardPath.absolutePath
             Constant.MAP_PATH = Constant.ROOT_PATH + "/map/"
+            Constant.OFFLINE_MAP_PATH = Constant.MAP_PATH + "offline/"
             val file = File(Constant.MAP_PATH)
             if (!file.exists()) {
                 file.mkdirs()
@@ -135,7 +133,7 @@ class LoginViewModel(
         Log.e("jingo", "取消了？${Thread.currentThread().name}")
         jobLogin?.let {
             it.cancel()
-            loginStatus.postValue(LoginStatus.LOGIN_STATUS_CANCEL)
+            loginStatus.value = LoginStatus.LOGIN_STATUS_CANCEL
         }
     }
 

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)