[8.0.0][Fix]下掉预测、决策功能
This commit is contained in:
@@ -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() {
|
||||
|
||||
@@ -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()
|
||||
// }
|
||||
// }
|
||||
}
|
||||
}
|
||||
@@ -34,24 +34,24 @@
|
||||
app:layout_constraintStart_toEndOf="@+id/midStartGuideline"
|
||||
app:layout_constraintEnd_toStartOf="@id/rightStartGuideline">
|
||||
|
||||
<com.mogo.eagle.core.function.view.PredictionLayout
|
||||
android:id="@+id/preContainer"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
android:background="@drawable/taxi_p_home_middle_top_bg"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/dp_676" />
|
||||
<!-- <com.mogo.eagle.core.function.view.PredictionLayout-->
|
||||
<!-- android:id="@+id/preContainer"-->
|
||||
<!-- app:layout_constraintTop_toTopOf="parent"-->
|
||||
<!-- app:layout_constraintStart_toStartOf="parent"-->
|
||||
<!-- app:layout_constraintEnd_toEndOf="parent"-->
|
||||
<!-- android:background="@drawable/taxi_p_home_middle_top_bg"-->
|
||||
<!-- android:layout_width="match_parent"-->
|
||||
<!-- android:layout_height="@dimen/dp_676" />-->
|
||||
|
||||
<com.mogo.eagle.core.function.view.DecisionLayout
|
||||
android:id="@+id/decContainer"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
android:background="@drawable/taxi_p_home_middle_bottom_bg"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/dp_676"
|
||||
/>
|
||||
<!-- <com.mogo.eagle.core.function.view.DecisionLayout-->
|
||||
<!-- android:id="@+id/decContainer"-->
|
||||
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
|
||||
<!-- app:layout_constraintStart_toStartOf="parent"-->
|
||||
<!-- app:layout_constraintEnd_toEndOf="parent"-->
|
||||
<!-- android:background="@drawable/taxi_p_home_middle_bottom_bg"-->
|
||||
<!-- android:layout_width="match_parent"-->
|
||||
<!-- android:layout_height="@dimen/dp_676"-->
|
||||
<!-- />-->
|
||||
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
Reference in New Issue
Block a user