调试道路施工
This commit is contained in:
parent
705779f631
commit
c9f084d289
@ -35,7 +35,7 @@
|
||||
"zoomMin": 15,
|
||||
"zoomMax": 17,
|
||||
"catch":true,
|
||||
"checkLinkId": true
|
||||
"checkLinkId": false
|
||||
},
|
||||
"2002": {
|
||||
"table": "OMDB_RD_LINK_FUNCTION_CLASS",
|
||||
@ -100,6 +100,7 @@
|
||||
"code": 2017,
|
||||
"name": "道路施工",
|
||||
"catch":true,
|
||||
"checkLinkId": false,
|
||||
"zoomMin": 15,
|
||||
"zoomMax": 17
|
||||
},
|
||||
|
@ -478,9 +478,9 @@ class MainActivity : BaseActivity() {
|
||||
viewModel.liveDataItemList.observe(this) {
|
||||
if (it.isNotEmpty()) {
|
||||
if (leftFragment == null || leftFragment !is ItemListFragment) {
|
||||
leftFragment = ItemListFragment {
|
||||
leftFragment = ItemListFragment {fragment->
|
||||
binding.mainActivityLeftFragment.visibility = View.GONE
|
||||
supportFragmentManager.beginTransaction().remove(leftFragment!!).commit()
|
||||
supportFragmentManager.beginTransaction().remove(fragment).commit()
|
||||
leftFragment = null
|
||||
null
|
||||
}
|
||||
@ -696,7 +696,7 @@ class MainActivity : BaseActivity() {
|
||||
Toast.makeText(this, "输入格式不正确", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
dialog.dismiss()
|
||||
// dialog.dismiss()
|
||||
}
|
||||
inputDialog.show()
|
||||
}
|
||||
|
@ -1491,10 +1491,12 @@ class MainViewModel @Inject constructor(
|
||||
when (searchEnum) {
|
||||
SearchEnum.LINK -> {
|
||||
viewModelScope.launch(Dispatchers.IO) {
|
||||
Log.e("jingo","查询link $msg")
|
||||
val link = realmOperateHelper.queryLink(linkPid = msg)
|
||||
if (link != null) {
|
||||
link?.let { l ->
|
||||
mapController.lineHandler.showLine(l.geometry)
|
||||
Log.e("jingo","查询link ${link.geometry}")
|
||||
withContext(Dispatchers.Main){
|
||||
mapController.lineHandler.showLine(link.geometry)
|
||||
dialog.dismiss()
|
||||
}
|
||||
} else {
|
||||
|
@ -184,8 +184,8 @@ class EvaluationResultViewModel @Inject constructor(
|
||||
if (linkId.isNotEmpty()) {
|
||||
viewModelScope.launch {
|
||||
val link = realmOperateHelper.queryLink(linkId)
|
||||
link?.let { l ->
|
||||
mapController.lineHandler.showLine(l.geometry)
|
||||
if(link != null){
|
||||
mapController.lineHandler.showLine(link.geometry)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user