xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
qiji4215
2023-07-17 14:49:21 +08:00
parent 1253cc10be
commit 6210f41b69
15 changed files with 155 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
View File

@@ -601,6 +601,13 @@ class MainActivity : BaseActivity() {
}
}
/**
* 显示轨迹回放布局
*/
fun showIndoorDataLayout() {
binding.mainActivityMenuIndoorGroup.visibility = View.VISIBLE
}
/**
* 路径规划
*/

32
app/src/main/java/com/navinfo/omqs/ui/activity/scan/QRCodeViewModel.kt
View File

@@ -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()