diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt
index fd43b4bd..f6a9b4f4 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt
@@ -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 {
diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
index abd9f946..2f205215 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
@@ -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) {
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt
index 2ecf8477..37023521 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt
@@ -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)
diff --git a/app/src/main/res/menu/personal_center_menu.xml b/app/src/main/res/menu/personal_center_menu.xml
index 9e53afd3..48d8d485 100644
--- a/app/src/main/res/menu/personal_center_menu.xml
+++ b/app/src/main/res/menu/personal_center_menu.xml
@@ -59,7 +59,7 @@
+ android:title="版本:23QE4_V1.5.4_20230926_A" />
-
diff --git a/vtm b/vtm
index 39b9993b..271e7b22 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit 39b9993b1cc5257d11c872161812ffe890e44bd9
+Subproject commit 271e7b22785b0570a34c50476e17a98dfcca7e71