增加室内整理工具更新信息逻辑

2023-07-17 14:49:21 +08:00
parent 1253cc10be
commit 6210f41b69
15 changed files with 155 additions and 99 deletions
--- a/app/src/main/java/com/navinfo/omqs/bean/QRCodeBean.kt
+++ b/app/src/main/java/com/navinfo/omqs/bean/QRCodeBean.kt
@@ -2,5 +2,5 @@ package com.navinfo.omqs.bean

 data class QRCodeBean(
    var errcode: Int = -1,
-    var msg: String = ""
+    var errmsg: String = ""
 )
--- a/app/src/main/java/com/navinfo/omqs/http/NetworkServiceImpl.kt
+++ b/app/src/main/java/com/navinfo/omqs/http/NetworkServiceImpl.kt
@@ -101,7 +101,16 @@ class NetworkServiceImpl @Inject constructor(
        //在IO线程中运行
        withContext(Dispatchers.IO) {
            return@withContext try {
-                val result = netApi.retrofitUpdateServerInfo(url,indoorConnectionInfoBean)
+                val map: MutableMap<String, String> = HashMap()
+                map["username"] = indoorConnectionInfoBean.username
+                map["uname"] = indoorConnectionInfoBean.uname
+                map["userid"] = indoorConnectionInfoBean.userid
+                map["plate"] = indoorConnectionInfoBean.plate
+                map["token"] = indoorConnectionInfoBean.token
+                map["baseurl"] = indoorConnectionInfoBean.baseurl
+                map["platform"] = indoorConnectionInfoBean.platform
+
+                val result = netApi.retrofitUpdateServerInfo(url,map)
                if (result.isSuccessful) {
                    if (result.code() == 200) {
                        NetResult.Success(result.body())
--- a/app/src/main/java/com/navinfo/omqs/http/RetrofitNetworkServiceAPI.kt
+++ b/app/src/main/java/com/navinfo/omqs/http/RetrofitNetworkServiceAPI.kt
@@ -78,9 +78,9 @@ interface RetrofitNetworkServiceAPI {
    /**
     * 登录接口
     */
-    @Headers("Content-Type: application/json")
+    @FormUrlEncoded
    @POST
-    suspend fun retrofitUpdateServerInfo(@Url url: String,@Body indoorConnectionInfoBean: IndoorConnectionInfoBean): Response<QRCodeBean>
+    suspend fun retrofitUpdateServerInfo(@Url url: String,@FieldMap map: Map<String,String>): Response<QRCodeBean>

    @Headers("Content-Type: application/json")
    @POST("/devcp/uploadSceneProblem")
--- a/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt
+++ b/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt
@@ -176,6 +176,19 @@ class TaskUploadScope(
                            } else if (it.problemType == "遗漏") {
                                problemType = 2
                            }
+
+                            var roadClassfcation = 0
+
+                            var roadFunctionGrade = 0
+
+                            var dataLevel = 0
+
+                            if(hadLinkDvoBean.linkInfo!=null){
+                                roadClassfcation = hadLinkDvoBean.linkInfo!!.kind
+                                roadFunctionGrade = hadLinkDvoBean.linkInfo!!.functionLevel
+                                dataLevel = hadLinkDvoBean.linkInfo!!.dataLevel
+                            }
+
                            var evaluationWay = 2
                            val evaluationInfo = EvaluationInfo(
                                evaluationTaskId = taskBean.id.toString(),
@@ -193,11 +206,11 @@ class TaskUploadScope(
                                evaluatorName = it.checkUserId,
                                evaluationDate = it.checkTime,
                                evaluationWay = evaluationWay,
-                                roadClassfcation = 1,
-                                roadFunctionGrade = 3,
+                                roadClassfcation = roadClassfcation,
+                                roadFunctionGrade = roadFunctionGrade,
                                noEvaluationreason = "",
                                linkLength = s.toDouble(),
-                                dataLevel = 3,
+                                dataLevel = dataLevel,
                                linstringLength = 0.0,
                            )

--- 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
@@ -601,6 +601,13 @@ class MainActivity : BaseActivity() {
        }
    }

+    /**
+     * 显示轨迹回放布局
+     */
+    fun showIndoorDataLayout() {
+        binding.mainActivityMenuIndoorGroup.visibility = View.VISIBLE
+    }
+
    /**
     * 路径规划
     */
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/scan/QRCodeViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/scan/QRCodeViewModel.kt
@@ -9,14 +9,10 @@ import androidx.lifecycle.viewModelScope
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.bean.IndoorConnectionInfoBean
 import com.navinfo.omqs.bean.QRCodeBean
-import com.navinfo.omqs.bean.SysUserBean
-import com.navinfo.omqs.http.DefaultResponse
 import com.navinfo.omqs.http.NetResult
 import com.navinfo.omqs.http.NetworkService
-import com.navinfo.omqs.ui.activity.login.LoginStatus
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.IOException
@@ -99,11 +95,14 @@ class QrCodeViewModel @Inject constructor(
                                                Toast.LENGTH_LONG
                                            ).show()
                                        }
+
+                                        updateServerInfo(context)
+
                                    } else {
                                        withContext(Dispatchers.Main) {
                                            Toast.makeText(
                                                context,
-                                                "${defaultUserResponse.msg}",
+                                                "${defaultUserResponse.errmsg}",
                                                Toast.LENGTH_SHORT
                                            )
                                                .show()
@@ -165,17 +164,20 @@ class QrCodeViewModel @Inject constructor(

        viewModelScope.launch(Dispatchers.Default) {
            val url = "http://${Constant.INDOOR_IP}:8080/sensor/service/connection"
+
+
+            val indoorConnectionInfoBean = IndoorConnectionInfoBean(
+                Constant.USER_ID,
+                Constant.USER_ID,
+                Constant.USER_ID,
+                "eyJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2ODk2MjI5MjQsInVzZXJJZCI6IjEwNCIsImlhdCI6MTY4OTU3MjUyNCwidXNlcm5hbWUiOiJ3ZWl3ZWlsaW4wMDEwNCJ9.9WUqOhme8Yi_2xRBKMMe0ihb_yR1uwTqWTdZfZ7dMtE",
+                "http://fastmap.navinfo.com/onemap",
+                Constant.USER_ID,
+                "Android"
+            )
            when (val result = networkService.updateServerInfo(
                url = url,
-                indoorConnectionInfoBean = IndoorConnectionInfoBean(
-                    Constant.USER_ID,
-                    Constant.USER_ID,
-                    Constant.USER_ID,
-                    Constant.USER_ID,
-                    com.navinfo.collect.library.system.Constant.SERVER_ADDRESS,
-                    Constant.USER_ID,
-                    "Android"
-                )
+                indoorConnectionInfoBean = indoorConnectionInfoBean
            )) {
                is NetResult.Success<*> -> {

@@ -198,7 +200,7 @@ class QrCodeViewModel @Inject constructor(
                                withContext(Dispatchers.Main) {
                                    Toast.makeText(
                                        context,
-                                        "${defaultUserResponse.msg}",
+                                        "${defaultUserResponse.errmsg}",
                                        Toast.LENGTH_SHORT
                                    )
                                        .show()
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt
@@ -193,14 +193,29 @@ class ConsoleFragment : BaseFragment(), OnClickListener {
                R.id.console_personal_center_bg, R.id.console_personal_center_icon_bg -> {
                    if (sceneFlag) {
                        mFragment = PersonalCenterFragment {
-                            TransitionManager.go(aScene, aTransition)
+                            if(it){
+                                activity?.let { a ->
+                                    a.supportFragmentManager.beginTransaction().remove(this).commit()
+                                    (a as MainActivity).showIndoorDataLayout()
+                                }
+                            }else{
+                                TransitionManager.go(aScene, aTransition)
+                            }
+
                        }
                        sceneFlag = false
                        TransitionManager.go(bScene, bTransition)
                    } else {
                        if (mFragment !is PersonalCenterFragment) {
                            mFragment = PersonalCenterFragment {
-                                TransitionManager.go(aScene, aTransition)
+                                if(it){
+                                    activity?.let { a ->
+                                        a.supportFragmentManager.beginTransaction().remove(this).commit()
+                                        (a as MainActivity).showIndoorDataLayout()
+                                    }
+                                }else{
+                                    TransitionManager.go(aScene, aTransition)
+                                }
                            }
                            childFragmentManager.beginTransaction().replace(fragmentId, mFragment!!)
                                .commit()
--- 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
@@ -15,14 +15,17 @@ 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.collect.library.data.entity.TaskBean
 import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.FragmentPersonalCenterBinding
 import com.navinfo.omqs.db.ImportOMDBHelper
 import com.navinfo.omqs.hilt.ImportOMDBHiltFactory
 import com.navinfo.omqs.tools.CoroutineUtils
+import com.navinfo.omqs.ui.activity.map.MainActivity
 import com.navinfo.omqs.ui.fragment.BaseFragment
 import com.navinfo.omqs.ui.activity.scan.QrCodeActivity
+import com.navinfo.omqs.ui.fragment.console.ConsoleFragment
 import com.permissionx.guolindev.PermissionX
 import dagger.hilt.android.AndroidEntryPoint
 import org.oscim.core.GeoPoint
@@ -32,7 +35,7 @@ import javax.inject.Inject
 * 个人中心
 */
@AndroidEntryPoint
-class PersonalCenterFragment(private var backListener: (() -> Unit?)? = null) : BaseFragment(),
+class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit?)? = null) : BaseFragment(),
    FSAFActivityCallbacks {

    private var _binding: FragmentPersonalCenterBinding? = null
@@ -137,6 +140,9 @@ class PersonalCenterFragment(private var backListener: (() -> Unit?)? = null) :
                    //跳转二维码扫描界面
                    checkPermission()
                }
+                R.id.personal_center_menu_scan_indoor_data -> {
+                    indoorDataListener?.invoke(true)
+                }
            }
            true
        }
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklink/TaskLinkViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklink/TaskLinkViewModel.kt
@@ -193,8 +193,8 @@ class TaskLinkViewModel @Inject constructor(
                    kind = liveDataSelectKind.value!!.type,
                    functionLevel = liveDataSelectFunctionLevel.value!!.type,
                    dataLevel = liveDataSelectDataLevel.value!!.type,
-                    length = mapController.measureLayerHandler.lineLengthLiveData.value!!,
-                )
+                ),
+                length = mapController.measureLayerHandler.lineLengthLiveData.value!!,
            )
            val task: TaskBean = liveDataTaskBean.value!!
            task.hadLinkDvoList.add(linkBean)
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt
@@ -241,8 +241,9 @@ class TaskListAdapter(
            FileUploadStatus.DONE -> {
                binding.taskUploadBtn.stopAnimator()
                binding.taskUploadBtn.setText("已上传")
+                binding.taskUploadBtn.isEnabled = false
                binding.taskUploadBtn.setProgress(0)
-                binding.taskUploadBtn.setBackgroundColor(binding.root.resources.getColor(R.color.ripple_end_color))
+                binding.taskUploadBtn.setBackgroundColor(binding.root.resources.getColor(R.color.gray_121))
            }

            FileUploadStatus.ERROR -> {