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/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()
    }
 }