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

修改多点列表点击显示问题

Browse Source
This commit is contained in:
qiji4215 2023-09-26 17:46:14 +08:00
parent 1187be699b
commit 4c18381125
5 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt
View File

@ -40,7 +40,13 @@ class LoginActivity : CheckPermissionsActivity() {
binding.activity = this
initView()
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 {

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

@ -51,6 +51,7 @@ import com.navinfo.omqs.util.SignUtil
import com.navinfo.omqs.util.SpeakMode
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import org.oscim.core.GeoPoint
import org.oscim.renderer.GLViewport
@ -353,31 +354,22 @@ class MainActivity : BaseActivity() {
rightController.navigateUp()
}
val fragment =
supportFragmentManager.findFragmentById(R.id.main_activity_sign_more_info_fragment)
if (fragment == null) {
supportFragmentManager.beginTransaction()
.replace(R.id.main_activity_sign_more_info_fragment, SignMoreInfoFragment())
.commit()
}else{
supportFragmentManager.beginTransaction().add(R.id.main_activity_sign_more_info_fragment, SignMoreInfoFragment()).commit()
lifecycleScope.launch{
delay(100)
val fragment =
supportFragmentManager.findFragmentById(R.id.main_activity_sign_more_info_fragment)
if (fragment == null) {
supportFragmentManager.beginTransaction()
.replace(R.id.main_activity_sign_more_info_fragment, SignMoreInfoFragment())
.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) {

2
app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt
View File

@ -101,7 +101,7 @@ class SignMoreInfoFragment : BaseFragment() {
DataCodeEnum.OMDB_TRAFFIC_SIGN.code -> {
val adapter = TwoItemAdapter()
binding.signInfoRecyclerview.adapter = adapter
adapter.refreshData(SignUtil.getTrafficSignMoreInfo(it))
adapter.refreshData(SignUtil.getTrafficSignMoreInfo(it.renderEntity))
}
else -> {
val adapter = SignUtil.getMoreInfoAdapter(it.renderEntity)

2
app/src/main/res/menu/personal_center_menu.xml
View File

@ -59,7 +59,7 @@
<item
android:id="@+id/personal_center_menu_version"
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 android:checkableBehavior="single">
<item android:title="小标题">

2
vtm

@ -1 +1 @@
Subproject commit 39b9993b1cc5257d11c872161812ffe890e44bd9
Subproject commit 271e7b22785b0570a34c50476e17a98dfcca7e71