修改多点列表点击显示问题
This commit is contained in:
parent
1187be699b
commit
4c18381125
@ -40,7 +40,13 @@ class LoginActivity : CheckPermissionsActivity() {
|
|||||||
binding.activity = this
|
binding.activity = this
|
||||||
initView()
|
initView()
|
||||||
Log.e("jingo", getScreenParams())
|
Log.e("jingo", getScreenParams())
|
||||||
UMConfigure.init(this, "650bece7b2f6fa00ba573c7a", "native", UMConfigure.DEVICE_TYPE_PHONE, "")
|
UMConfigure.init(
|
||||||
|
this,
|
||||||
|
"650bece7b2f6fa00ba573c7a",
|
||||||
|
"native",
|
||||||
|
UMConfigure.DEVICE_TYPE_PHONE,
|
||||||
|
""
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getScreenParams(): String {
|
private fun getScreenParams(): String {
|
||||||
|
@ -51,6 +51,7 @@ import com.navinfo.omqs.util.SignUtil
|
|||||||
import com.navinfo.omqs.util.SpeakMode
|
import com.navinfo.omqs.util.SpeakMode
|
||||||
import dagger.hilt.android.AndroidEntryPoint
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.delay
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import org.oscim.core.GeoPoint
|
import org.oscim.core.GeoPoint
|
||||||
import org.oscim.renderer.GLViewport
|
import org.oscim.renderer.GLViewport
|
||||||
@ -353,31 +354,22 @@ class MainActivity : BaseActivity() {
|
|||||||
rightController.navigateUp()
|
rightController.navigateUp()
|
||||||
}
|
}
|
||||||
|
|
||||||
val fragment =
|
lifecycleScope.launch{
|
||||||
supportFragmentManager.findFragmentById(R.id.main_activity_sign_more_info_fragment)
|
delay(100)
|
||||||
if (fragment == null) {
|
val fragment =
|
||||||
supportFragmentManager.beginTransaction()
|
supportFragmentManager.findFragmentById(R.id.main_activity_sign_more_info_fragment)
|
||||||
.replace(R.id.main_activity_sign_more_info_fragment, SignMoreInfoFragment())
|
if (fragment == null) {
|
||||||
.commit()
|
supportFragmentManager.beginTransaction()
|
||||||
}else{
|
.replace(R.id.main_activity_sign_more_info_fragment, SignMoreInfoFragment())
|
||||||
supportFragmentManager.beginTransaction().add(R.id.main_activity_sign_more_info_fragment, SignMoreInfoFragment()).commit()
|
.commit()
|
||||||
|
}else{
|
||||||
|
supportFragmentManager.beginTransaction().add(R.id.main_activity_sign_more_info_fragment, SignMoreInfoFragment()).commit()
|
||||||
|
}
|
||||||
|
val bundle = Bundle()
|
||||||
|
bundle.putParcelable("SignBean", it)
|
||||||
|
bundle.putBoolean("AutoSave", false)
|
||||||
|
rightController.navigate(R.id.EvaluationResultFragment, bundle)
|
||||||
}
|
}
|
||||||
//启动问题记录
|
|
||||||
val signBean = SignBean(
|
|
||||||
iconId = SignUtil.getSignIcon(it),
|
|
||||||
iconText = SignUtil.getSignIconText(it),
|
|
||||||
linkId = it.properties[RenderEntity.Companion.LinkTable.linkPid]
|
|
||||||
?: "",
|
|
||||||
name = SignUtil.getSignNameText(it),
|
|
||||||
bottomRightText = SignUtil.getSignBottomRightText(it),
|
|
||||||
renderEntity = it,
|
|
||||||
isMoreInfo = SignUtil.isMoreInfo(it),
|
|
||||||
index = SignUtil.getRoadInfoIndex(it)
|
|
||||||
)
|
|
||||||
val bundle = Bundle()
|
|
||||||
bundle.putParcelable("SignBean", signBean)
|
|
||||||
bundle.putBoolean("AutoSave", false)
|
|
||||||
rightController.navigate(R.id.EvaluationResultFragment, bundle)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
viewModel.liveIndoorToolsResp.observe(this) {
|
viewModel.liveIndoorToolsResp.observe(this) {
|
||||||
|
@ -101,7 +101,7 @@ class SignMoreInfoFragment : BaseFragment() {
|
|||||||
DataCodeEnum.OMDB_TRAFFIC_SIGN.code -> {
|
DataCodeEnum.OMDB_TRAFFIC_SIGN.code -> {
|
||||||
val adapter = TwoItemAdapter()
|
val adapter = TwoItemAdapter()
|
||||||
binding.signInfoRecyclerview.adapter = adapter
|
binding.signInfoRecyclerview.adapter = adapter
|
||||||
adapter.refreshData(SignUtil.getTrafficSignMoreInfo(it))
|
adapter.refreshData(SignUtil.getTrafficSignMoreInfo(it.renderEntity))
|
||||||
}
|
}
|
||||||
else -> {
|
else -> {
|
||||||
val adapter = SignUtil.getMoreInfoAdapter(it.renderEntity)
|
val adapter = SignUtil.getMoreInfoAdapter(it.renderEntity)
|
||||||
|
@ -59,7 +59,7 @@
|
|||||||
<item
|
<item
|
||||||
android:id="@+id/personal_center_menu_version"
|
android:id="@+id/personal_center_menu_version"
|
||||||
android:icon="@drawable/ic_baseline_layers_24"
|
android:icon="@drawable/ic_baseline_layers_24"
|
||||||
android:title="版本:23QE4_V1.5.3_20230920_A" />
|
android:title="版本:23QE4_V1.5.4_20230926_A" />
|
||||||
</group>
|
</group>
|
||||||
<group android:checkableBehavior="single">
|
<group android:checkableBehavior="single">
|
||||||
<item android:title="小标题">
|
<item android:title="小标题">
|
||||||
|
2
vtm
2
vtm
@ -1 +1 @@
|
|||||||
Subproject commit 39b9993b1cc5257d11c872161812ffe890e44bd9
|
Subproject commit 271e7b22785b0570a34c50476e17a98dfcca7e71
|
Loading…
x
Reference in New Issue
Block a user