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

2023-05-26 17:45:56 +08:00
parent 8d6bb8c6e8 591b9cd579
commit e9735ee4d8
22 changed files with 266 additions and 63 deletions
--- 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
@@ -10,8 +10,9 @@ import androidx.lifecycle.viewModelScope
 import com.blankj.utilcode.util.ResourceUtils
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.bean.LoginUserBean
-import com.navinfo.omqs.db.MyRealmModule
+import com.navinfo.omqs.bean.SysUserBean
 import com.navinfo.omqs.db.RoomAppDatabase
+import com.navinfo.omqs.http.DefaultUserResponse
 import com.navinfo.omqs.http.NetResult
 import com.navinfo.omqs.http.NetworkService
 import com.navinfo.omqs.tools.FileManager
@@ -19,6 +20,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import kotlinx.coroutines.*
+import retrofit2.Response
 import java.io.File
 import java.io.IOException
 import javax.inject.Inject
@@ -74,7 +76,7 @@ class LoginViewModel @Inject constructor(
    var jobLogin: Job? = null;

    init {
-        loginUser.value = LoginUserBean(username = "admin", password = "123456")
+        loginUser.value = LoginUserBean(userCode = "02911", passWord = "123456")
    }


@@ -82,7 +84,7 @@ class LoginViewModel @Inject constructor(
     * 处理注册按钮
     */
    fun onClick(view: View) {
-        loginUser.value!!.username = "admin2"
+        loginUser.value!!.userCode = "admin2"
        loginUser.value = loginUser.value
    }

@@ -111,12 +113,61 @@ class LoginViewModel @Inject constructor(
 //        withContext(Dispatchers.IO) {
        //网络访问
        loginStatus.postValue(LoginStatus.LOGIN_STATUS_NET_LOADING)
-        //假装网络访问，等待2秒
-        delay(1000)
+        var userCode = "99999";
+        //登录访问
+        when (val result = networkService.loginUser(LoginUserBean(userName,password))) {
+            is NetResult.Success<*> ->{
+                if (result.data!=null) {
+                    try {
+                        val defaultUserResponse = result.data as DefaultUserResponse<SysUserBean>
+                        if(defaultUserResponse.success){
+                            if(defaultUserResponse.obj==null|| defaultUserResponse.obj!!.userCode==null){
+                                withContext(Dispatchers.Main) {
+                                    Toast.makeText(context, "服务返回用户Code信息错误", Toast.LENGTH_SHORT)
+                                        .show()
+                                }
+                                loginStatus.postValue(LoginStatus.LOGIN_STATUS_CANCEL)
+                                return
+                            }else{
+                                userCode = defaultUserResponse.obj?.userCode.toString()
+                            }
+                        }else{
+                            withContext(Dispatchers.Main) {
+                                Toast.makeText(context, "${defaultUserResponse.msg}", Toast.LENGTH_SHORT)
+                                    .show()
+                            }
+                            loginStatus.postValue(LoginStatus.LOGIN_STATUS_CANCEL)
+                            return
+                        }
+
+                    } catch (e: IOException) {
+                        loginStatus.postValue(LoginStatus.LOGIN_STATUS_FOLDER_FAILURE)
+                    }
+                }
+            }
+            is NetResult.Error<*> ->{
+                withContext(Dispatchers.Main) {
+                    Toast.makeText(context, "${result.exception.message}", Toast.LENGTH_SHORT)
+                        .show()
+                }
+                loginStatus.postValue(LoginStatus.LOGIN_STATUS_CANCEL)
+                return
+            }
+            is NetResult.Failure<*> ->{
+                withContext(Dispatchers.Main) {
+                    Toast.makeText(context, "${result.code}:${result.msg}", Toast.LENGTH_SHORT)
+                        .show()
+                }
+                loginStatus.postValue(LoginStatus.LOGIN_STATUS_CANCEL)
+                return
+            }
+            else -> {}
+        }
+
        //文件夹初始化
        try {
            loginStatus.postValue(LoginStatus.LOGIN_STATUS_FOLDER_INIT)
-            createUserFolder(context, "02911")
+            createUserFolder(context, userCode)
        } catch (e: IOException) {
            loginStatus.postValue(LoginStatus.LOGIN_STATUS_FOLDER_FAILURE)
        }
@@ -134,13 +185,13 @@ class LoginViewModel @Inject constructor(
                    roomAppDatabase.getOfflineMapDao().insertOrUpdate(result.data)
                }
            }
-            is NetResult.Error -> {
+            is NetResult.Error<*> -> {
                withContext(Dispatchers.Main) {
                    Toast.makeText(context, "${result.exception.message}", Toast.LENGTH_SHORT)
                        .show()
                }
            }
-            is NetResult.Failure -> {
+            is NetResult.Failure<*> -> {
                withContext(Dispatchers.Main) {
                    Toast.makeText(context, "${result.code}:${result.msg}", Toast.LENGTH_SHORT)
                        .show()
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt
@@ -1,5 +1,6 @@
 package com.navinfo.omqs.ui.fragment.evaluationresult

+import android.app.Dialog
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
@@ -19,6 +20,7 @@ import com.navinfo.omqs.ui.fragment.BaseFragment
 import com.navinfo.omqs.ui.other.shareViewModels
 import dagger.hilt.android.AndroidEntryPoint
 import androidx.navigation.findNavController
+import com.navinfo.omqs.ui.dialog.FirstDialog

@AndroidEntryPoint
 class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
@@ -65,7 +67,17 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
        }
        //返回按钮点击
        binding.evaluationBar.setOnClickListener() {
-            onBackPressed()
+            val mDialog = FirstDialog(context)
+            mDialog.setTitle("提示？")
+            mDialog.setMessage("是否退出，请确认！")
+            mDialog.setPositiveButton("确定", object : FirstDialog.OnClickListener {
+                override fun onClick(dialog: Dialog?, which: Int) {
+                    mDialog.dismiss()
+                    onBackPressed()
+                }
+            })
+            mDialog.setNegativeButton("取消", null)
+            mDialog.show()
        }

        //保存事件
@@ -76,7 +88,7 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
        //删除事件
        binding.evaluationBarDelete.setOnClickListener() {

-            viewModel.deleteData()
+            viewModel.deleteData(requireContext())

        }

--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
@@ -1,6 +1,7 @@
 package com.navinfo.omqs.ui.fragment.evaluationresult

 import android.app.Activity
+import android.app.Dialog
 import android.content.Context
 import android.graphics.drawable.AnimationDrawable
 import android.graphics.drawable.BitmapDrawable
@@ -22,12 +23,13 @@ import com.navinfo.collect.library.data.entity.QsRecordBean
 import com.navinfo.collect.library.data.entity.RenderEntity.Companion.LinkTable
 import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.collect.library.utils.GeometryTools
-import com.navinfo.omqs.bean.SignBean
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
 import com.navinfo.omqs.bean.ChatMsgEntity
+import com.navinfo.omqs.bean.SignBean
 import com.navinfo.omqs.db.RealmOperateHelper
 import com.navinfo.omqs.db.RoomAppDatabase
+import com.navinfo.omqs.ui.dialog.FirstDialog
 import com.navinfo.omqs.util.DateTimeUtil
 import com.navinfo.omqs.util.SoundMeter
 import com.navinfo.omqs.util.SpeakMode
@@ -326,22 +328,29 @@ class EvaluationResultViewModel @Inject constructor(
        }
    }

-    fun deleteData() {
-        viewModelScope.launch(Dispatchers.IO) {
-
-            val realm = Realm.getDefaultInstance()
-            Log.e("jingo", "realm hashCOde ${realm.hashCode()}")
-            realm.executeTransaction {
-                val objects =
-                    it.where(QsRecordBean::class.java).equalTo("id", liveDataQsRecordBean.value?.id)
-                        .findFirst()
-                objects?.deleteFromRealm()
+    fun deleteData(context: Context) {
+        val mDialog = FirstDialog(context)
+        mDialog.setTitle("提示？")
+        mDialog.setMessage("是否删除Mark，请确认！")
+        mDialog.setPositiveButton("确定", object : FirstDialog.OnClickListener {
+            override fun onClick(dialog: Dialog?, which: Int) {
+                mDialog.dismiss()
+                viewModelScope.launch(Dispatchers.IO) {
+                    val realm = Realm.getDefaultInstance()
+                    Log.e("jingo", "realm hashCOde ${realm.hashCode()}")
+                    realm.executeTransaction {
+                        val objects = it.where(QsRecordBean::class.java)
+                            .equalTo("id", liveDataQsRecordBean.value?.id).findFirst()
+                        objects?.deleteFromRealm()
+                    }
+                    mapController.markerHandle.removeQsRecordMark(liveDataQsRecordBean.value!!)
+                    mapController.mMapView.vtmMap.updateMap(true)
+                    liveDataFinish.postValue(true)
+                }
            }
-//            realm.close()
-            mapController.markerHandle.removeQsRecordMark(liveDataQsRecordBean.value!!)
-            mapController.mMapView.vtmMap.updateMap(true)
-            liveDataFinish.postValue(true)
-        }
+        })
+        mDialog.setNegativeButton("取消", null)
+        mDialog.show()
    }

    /**
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt
@@ -91,13 +91,13 @@ class TaskViewModel @Inject constructor(
                        }
                    }
                }
-                is NetResult.Error -> {
+                is NetResult.Error<*> -> {
                    withContext(Dispatchers.Main) {
                        Toast.makeText(context, "${result.exception.message}", Toast.LENGTH_SHORT)
                            .show()
                    }
                }
-                is NetResult.Failure -> {
+                is NetResult.Failure<*> -> {
                    withContext(Dispatchers.Main) {
                        Toast.makeText(context, "${result.code}:${result.msg}", Toast.LENGTH_SHORT)
                            .show()