From 8bf83f703cd53df13419c42d08191e10fcbee782 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Thu, 22 May 2025 14:56:21 +0800 Subject: [PATCH] =?UTF-8?q?[8.0.0][Fix]=E4=B8=8B=E6=8E=89=E9=A2=84?= =?UTF-8?q?=E6=B5=8B=E3=80=81=E5=86=B3=E7=AD=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/ui/homepage/HomeView.kt | 26 ++++++------- .../passenger/ui/homepage/HomeViewModel.kt | 38 +++++++++---------- .../src/main/res/layout/taxi_p_home.xml | 34 ++++++++--------- 3 files changed, 48 insertions(+), 50 deletions(-) diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeView.kt index 8493f3a364..4060c0e58e 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeView.kt @@ -19,9 +19,7 @@ import com.mogo.och.unmanned.passenger.ui.bar.LeftBarView import com.mogo.och.unmanned.taxi.passenger.R import kotlinx.android.synthetic.main.taxi_p_home.view.acbtn_show_all import kotlinx.android.synthetic.main.taxi_p_home.view.acbtn_show_hdmap -import kotlinx.android.synthetic.main.taxi_p_home.view.decContainer import kotlinx.android.synthetic.main.taxi_p_home.view.hdMapView -import kotlinx.android.synthetic.main.taxi_p_home.view.preContainer import kotlinx.android.synthetic.main.taxi_p_home.view.lbv_go2_center import kotlinx.android.synthetic.main.taxi_p_home.view.leftEndGuideline import kotlinx.android.synthetic.main.taxi_p_home.view.midContainer @@ -89,38 +87,38 @@ class HomeView @JvmOverloads constructor( fun onCreate(savedInstanceState: Bundle?) { hdMapView.onCreate(savedInstanceState) - preContainer.onCreate(savedInstanceState) - decContainer.onCreate(savedInstanceState) +// preContainer.onCreate(savedInstanceState) +// decContainer.onCreate(savedInstanceState) } fun onSaveInstanceState(outState: Bundle) { hdMapView.onSaveInstanceState(outState) - preContainer.onSaveInstanceState(outState) - decContainer.onSaveInstanceState(outState) +// preContainer.onSaveInstanceState(outState) +// decContainer.onSaveInstanceState(outState) } fun onResume() { hdMapView.onResume() - preContainer.onResume() - decContainer.onResume() +// preContainer.onResume() +// decContainer.onResume() } fun onLowMemory() { hdMapView.onLowMemory() - preContainer.onLowMemory() - decContainer.onLowMemory() +// preContainer.onLowMemory() +// decContainer.onLowMemory() } fun onPause() { hdMapView.onPause() - preContainer.onPause() - decContainer.onPause() +// preContainer.onPause() +// decContainer.onPause() } fun onDestroy() { hdMapView.onDestroy() - preContainer.onDestroy() - decContainer.onDestroy() +// preContainer.onDestroy() +// decContainer.onDestroy() } override fun onAttachedToWindow() { diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeViewModel.kt index 355b465fd2..57a84256d6 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeViewModel.kt @@ -41,35 +41,35 @@ class HomeViewModel : ViewModel(), BridgeListener, OrderListener { override fun onTrajectoryHaveData(haveTrajectoryInfos: Boolean) { this.haveTrajectoryInfos = haveTrajectoryInfos - checkScreenChange() +// checkScreenChange() } override fun onPredictionHavaData(havePredictionInfos: Boolean) { this.havePredictionInfos = havePredictionInfos - checkScreenChange() +// checkScreenChange() } override fun onCurrentOrderStatusChanged(order: BaseOrderBean?) { this.order = order - checkScreenChange() +// checkScreenChange() } fun checkScreenChange(){ - CallerLogger.d(TAG,"havePredictionInfos:${havePredictionInfos}--haveTrajectoryInfos:${haveTrajectoryInfos}--order:${order}") - if(order!=null&&havePredictionInfos&&havePredictionInfos){ - FunctionBuildConfig.isDrawDecIdentifyData = true - FunctionBuildConfig.isDrawPreIdentifyData = true - // 展示三联屏 - BizLoopManager.runInMainThread{ - this.viewCallback?.showThreeScreen() - } - }else{ - FunctionBuildConfig.isDrawDecIdentifyData = false - FunctionBuildConfig.isDrawPreIdentifyData = false - // 展示二联屏幕 - BizLoopManager.runInMainThread{ - this.viewCallback?.showTwoScreen() - } - } +// CallerLogger.d(TAG,"havePredictionInfos:${havePredictionInfos}--haveTrajectoryInfos:${haveTrajectoryInfos}--order:${order}") +// if(order!=null&&havePredictionInfos&&havePredictionInfos){ +// FunctionBuildConfig.isDrawDecIdentifyData = true +// FunctionBuildConfig.isDrawPreIdentifyData = true +// // 展示三联屏 +// BizLoopManager.runInMainThread{ +// this.viewCallback?.showThreeScreen() +// } +// }else{ +// FunctionBuildConfig.isDrawDecIdentifyData = false +// FunctionBuildConfig.isDrawPreIdentifyData = false +// // 展示二联屏幕 +// BizLoopManager.runInMainThread{ +// this.viewCallback?.showTwoScreen() +// } +// } } } \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml index a16b67fb3b..1616971d6f 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml @@ -34,24 +34,24 @@ app:layout_constraintStart_toEndOf="@+id/midStartGuideline" app:layout_constraintEnd_toStartOf="@id/rightStartGuideline"> - + + + + + + + + - + + + + + + + + +