From 7845223b08762015964775b6a65aafb402d86f5a Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Fri, 20 Jun 2025 15:31:07 +0800 Subject: [PATCH] =?UTF-8?q?[8.1.0][opt]=E9=9A=90=E8=97=8F=E9=A2=84?= =?UTF-8?q?=E6=B5=8B=E5=92=8C=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 | 13 ++++---- .../passenger/ui/homepage/HomeViewModel.kt | 32 +++++++++---------- .../src/main/res/layout/taxi_p_home.xml | 32 +++++++++---------- 3 files changed, 38 insertions(+), 39 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 041376229b..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 @@ -24,7 +24,6 @@ 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 import kotlinx.android.synthetic.main.taxi_p_home.view.midStartGuideline -import kotlinx.android.synthetic.main.taxi_p_home.view.preContainer class HomeView @JvmOverloads constructor( context: Context, @@ -88,37 +87,37 @@ class HomeView @JvmOverloads constructor( fun onCreate(savedInstanceState: Bundle?) { hdMapView.onCreate(savedInstanceState) - preContainer.onCreate(savedInstanceState) +// preContainer.onCreate(savedInstanceState) // decContainer.onCreate(savedInstanceState) } fun onSaveInstanceState(outState: Bundle) { hdMapView.onSaveInstanceState(outState) - preContainer.onSaveInstanceState(outState) +// preContainer.onSaveInstanceState(outState) // decContainer.onSaveInstanceState(outState) } fun onResume() { hdMapView.onResume() - preContainer.onResume() +// preContainer.onResume() // decContainer.onResume() } fun onLowMemory() { hdMapView.onLowMemory() - preContainer.onLowMemory() +// preContainer.onLowMemory() // decContainer.onLowMemory() } fun onPause() { hdMapView.onPause() - preContainer.onPause() +// preContainer.onPause() // decContainer.onPause() } fun onDestroy() { hdMapView.onDestroy() - preContainer.onDestroy() +// preContainer.onDestroy() // decContainer.onDestroy() } 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 edf0fec7d3..ecadbb6a40 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 @@ -55,21 +55,21 @@ class HomeViewModel : ViewModel(), BridgeListener, OrderListener { } private fun checkScreenChange(){ - CallerLogger.d(TAG,"havePredictionInfos:${havePredictionInfos}--haveTrajectoryInfos:${haveTrajectoryInfos}--order:${order}") - if(havePredictionInfos&&havePredictionInfos){//order!=null&& - 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(havePredictionInfos&&havePredictionInfos){//order!=null&& +// 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 ca7b9f7dd7..37838ee628 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,23 +34,23 @@ app:layout_constraintStart_toEndOf="@+id/midStartGuideline" app:layout_constraintTop_toTopOf="parent"> - + + + + + + + + - + + + + + + + +