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