diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
index 33e2f7987f..e0d1c6eec4 100644
--- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
+++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
@@ -6,13 +6,13 @@ import android.animation.ObjectAnimator
import android.annotation.SuppressLint
import android.os.Bundle
import android.view.View
+import androidx.core.view.isVisible
import com.alibaba.android.arouter.launcher.ARouter
import com.mogo.commons.mvp.MvpFragment
import com.mogo.commons.voice.AIAssist
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
-import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P
import com.mogo.eagle.core.utilcode.util.DeviceUtils
@@ -24,9 +24,10 @@ import com.mogo.och.common.module.voice.VoiceNotice
import com.mogo.och.taxi.passenger.R
import com.mogo.och.taxi.passenger.presenter.BaseTaxiPassengerPresenter
import com.mogo.och.taxi.passenger.ui.arrived.ArrivedView
+import com.mogo.och.taxi.passenger.ui.bar.LeftBarView
import com.mogo.och.taxi.passenger.ui.bottom.BottomBar
import com.mogo.och.taxi.passenger.ui.checkstartautopilot.ChekAndStartAutopilotView
-import com.mogo.och.taxi.passenger.ui.rightbar.RightBarView
+import com.mogo.och.taxi.passenger.ui.bar.RightBarView
import com.mogo.och.taxi.passenger.ui.statusview.StatusBarView
import io.reactivex.disposables.Disposable
import kotlinx.android.synthetic.main.taxi_p_base_fragment.*
@@ -82,6 +83,8 @@ class TaxiPassengerBaseFragment() :
mv_music_info.visibility = if(musicShow) View.VISIBLE else View.GONE
}
+ })
+ lbv_go2_center.setOrderIdCallback(object :LeftBarView.LeftBarCallback{
override fun setGo2CenterClick() {
when (bottom.getCurrentPage()) {
BottomBar.SelectView.PRECISIONMAP -> {
@@ -119,6 +122,7 @@ class TaxiPassengerBaseFragment() :
romaDistanceView.visibility = View.GONE
}
rbv_setting_music.setShowOnlySetting(0)
+ lbv_go2_center.visibility = View.VISIBLE
pcnActionView.visibility = View.VISIBLE
CallerHmiManager.showTrafficLightView()
infoVideoView.visibility = View.GONE
@@ -132,6 +136,7 @@ class TaxiPassengerBaseFragment() :
romaPView.updateVisible(false)
romaDistanceView.visibility = View.GONE
rbv_setting_music.setShowOnlySetting(0)
+ lbv_go2_center.visibility = View.VISIBLE
pcnActionView.visibility = View.VISIBLE
CallerHmiManager.showTrafficLightView()
infoVideoView.visibility = View.GONE
@@ -143,6 +148,7 @@ class TaxiPassengerBaseFragment() :
presenter?.setItineraryVisibility()
speedView.visibility = View.GONE
rbv_setting_music.setShowOnlySetting(1)
+ lbv_go2_center.visibility = View.GONE
romaPView.updateVisible(false)
romaDistanceView.visibility = View.GONE
pcnActionView.visibility = View.GONE
diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt
index 3773c8cb43..69331f56d9 100644
--- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt
+++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt
@@ -94,7 +94,7 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback
}
var prePercentage = 0f
- val needChangeStyleNumber = 0.99
+ val needChangeStyleNumber = 0.98
val needChangeStyleNumberMin = 0.03f
override fun setDistanceInfo(surplusdistance:String,distanceUnit:String,
diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
index eed37e53a0..f39a5d6a0b 100644
--- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
+++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
@@ -84,13 +84,22 @@
app:layout_constraintTop_toTopOf="parent"
app:roma_change_dis_color="true" />
-
+
+
@@ -164,6 +173,15 @@
android:layout_width="match_parent"
android:layout_height="match_parent"/>
+
+
-
-
+
-
-
-
-
+
+
+
+
@@ -217,7 +219,7 @@
android:layout_height="@dimen/dp_20"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="@dimen/dp_66"
- android:layout_marginStart="@dimen/dp_38"
+ android:layout_marginStart="@dimen/dp_58"
android:layout_marginEnd="@dimen/dp_58"
android:progress="20"
android:maxHeight="@dimen/dp_10"
diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/LeftBarView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/LeftBarView.kt
new file mode 100644
index 0000000000..fea2810073
--- /dev/null
+++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/LeftBarView.kt
@@ -0,0 +1,63 @@
+package com.mogo.och.taxi.passenger.ui.bar
+
+import android.animation.ObjectAnimator
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.utilcode.kotlin.onClick
+import com.mogo.och.taxi.passenger.common.R
+import kotlinx.android.synthetic.main.taxi_p_leftbar.view.iv_center_location
+
+
+class LeftBarView : ConstraintLayout {
+
+ private val TAG = "RightBarView"
+
+ constructor(context: Context) : super(context)
+
+ constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet)
+
+ constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr)
+
+ constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes)
+
+ private var rightBarCallback:LeftBarCallback?=null
+
+ init {
+ }
+
+ private fun initView() {
+ LayoutInflater.from(context).inflate(R.layout.taxi_p_leftbar, this, true)
+
+ iv_center_location.onClick {
+ this.rightBarCallback?.setGo2CenterClick()
+ }
+ }
+
+ override fun onVisibilityAggregated(isVisible: Boolean) {
+ super.onVisibilityAggregated(isVisible)
+ }
+
+ override fun onAttachedToWindow() {
+ super.onAttachedToWindow()
+ }
+
+ init {
+ try {
+ initView()
+ } catch (e: Exception) {
+ e.printStackTrace()
+ }
+ }
+ fun setOrderIdCallback(rightBarCallback: LeftBarCallback) {
+ this.rightBarCallback = rightBarCallback
+ }
+
+
+ interface LeftBarCallback {
+ fun setGo2CenterClick()
+ }
+
+
+}
\ No newline at end of file
diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/rightbar/RightBarView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/RightBarView.kt
similarity index 93%
rename from OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/rightbar/RightBarView.kt
rename to OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/RightBarView.kt
index c0ab01ef2a..4335e7aa6c 100644
--- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/rightbar/RightBarView.kt
+++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/RightBarView.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.taxi.passenger.ui.rightbar
+package com.mogo.och.taxi.passenger.ui.bar
import android.animation.ObjectAnimator
import android.animation.ValueAnimator
@@ -19,15 +19,12 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.och.common.module.manager.auditionmanager.AuditionManager
import com.mogo.och.common.module.manager.auditionmanager.MusicData
import com.mogo.och.common.module.manager.auditionmanager.PlayState
-import com.mogo.och.common.module.voice.VoiceNotice
import com.mogo.och.taxi.passenger.common.R
import kotlinx.android.synthetic.main.taxi_p_rightbar.view.ck_music
import kotlinx.android.synthetic.main.taxi_p_rightbar.view.ck_setting
import kotlinx.android.synthetic.main.taxi_p_rightbar.view.ck_setting_only
import kotlinx.android.synthetic.main.taxi_p_rightbar.view.con_only_one_group
import kotlinx.android.synthetic.main.taxi_p_rightbar.view.con_third_group
-import kotlinx.android.synthetic.main.taxi_p_rightbar.view.iv_center_location
-import kotlinx.android.synthetic.main.taxi_p_rightbar.view.iv_center_location_bg
class RightBarView : ConstraintLayout, AuditionManager.MusicDataChangeListener {
@@ -102,12 +99,6 @@ class RightBarView : ConstraintLayout, AuditionManager.MusicDataChangeListener {
}
}
}
- iv_center_location.onClick {
- this.rightBarCallback?.setGo2CenterClick()
- }
- iv_center_location_bg.onClick {
- VoiceNotice.showNotice("云端暂停任务,注意车辆即将停车!")
- }
}
private fun startAnimal(){
@@ -166,7 +157,6 @@ class RightBarView : ConstraintLayout, AuditionManager.MusicDataChangeListener {
interface RightBarCallback {
fun setSettingAndMusicShow(settingShow:Boolean,musicShow:Boolean)
- fun setGo2CenterClick()
}
override fun updateState(oldData: MusicData?, musicData: MusicData) {
diff --git a/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_reset_location_bg.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_reset_location_bg.png
index 2525304006..59b0d95fd0 100644
Binary files a/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_reset_location_bg.png and b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_reset_location_bg.png differ
diff --git a/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_location_center_normal.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_location_center_normal.png
old mode 100755
new mode 100644
index fcebe35df7..a21f27c4c6
Binary files a/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_location_center_normal.png and b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_location_center_normal.png differ
diff --git a/OCH/taxi/pcommon/src/main/res/drawable/taxi_p_music_list_bottom.xml b/OCH/taxi/pcommon/src/main/res/drawable/taxi_p_music_list_bottom.xml
new file mode 100644
index 0000000000..8b3b6b5ada
--- /dev/null
+++ b/OCH/taxi/pcommon/src/main/res/drawable/taxi_p_music_list_bottom.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_evaluate.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_evaluate.xml
index b6c01f5107..af51cb9123 100644
--- a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_evaluate.xml
+++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_evaluate.xml
@@ -2,7 +2,7 @@
@@ -10,8 +10,8 @@
diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_leftbar.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_leftbar.xml
new file mode 100644
index 0000000000..3c0c76456f
--- /dev/null
+++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_leftbar.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music.xml
index 12bb0674fd..5060aadc50 100644
--- a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music.xml
+++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music.xml
@@ -21,7 +21,7 @@
+
+
\ No newline at end of file
diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_playing.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_playing.xml
index efcec69dc5..487aa69cbf 100644
--- a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_playing.xml
+++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_playing.xml
@@ -18,7 +18,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- android:layout_marginTop="@dimen/dp_127"
+ android:layout_marginTop="@dimen/dp_108"
android:src="@drawable/taxt_p_music_bg_middle"
android:layout_width="@dimen/dp_390"
android:layout_height="@dimen/dp_390"/>
@@ -28,7 +28,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- android:layout_marginTop="@dimen/dp_146"
+ android:layout_marginTop="@dimen/dp_127"
android:src="@drawable/taxt_p_music_bg_relax_head"
android:layout_width="@dimen/dp_310"
android:layout_height="@dimen/dp_310"/>
@@ -38,7 +38,7 @@
app:layout_constraintTop_toBottomOf="@+id/iv_music_cover"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- android:layout_marginTop="@dimen/dp_61"
+ android:layout_marginTop="@dimen/dp_52"
android:textSize="@dimen/dp_38"
tools:text="Current"
android:textColor="@color/taxi_cp_303C52"
@@ -71,7 +71,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_tag"
- android:layout_marginTop="@dimen/dp_31"
+ android:layout_marginTop="@dimen/dp_54"
android:progressDrawable="@drawable/taxt_p_music_seekbar_style"
android:paddingTop="3dp"
android:paddingBottom="@dimen/dp_3"
@@ -112,7 +112,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginBottom="@dimen/dp_109"
+ android:layout_marginBottom="@dimen/dp_99"
android:src="@drawable/taxi_p_music_play"
android:layout_width="@dimen/dp_146"
android:layout_height="@dimen/dp_146"/>
diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_rightbar.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_rightbar.xml
index eb2360772a..832565193c 100644
--- a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_rightbar.xml
+++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_rightbar.xml
@@ -38,29 +38,10 @@
app:layout_constraintEnd_toEndOf="@+id/iv_setting_music_bg"
app:layout_constraintBottom_toBottomOf="@+id/iv_setting_music_bg" />
-
-
-
-
diff --git a/OCH/taxi/pcommon/src/main/res/values/colors.xml b/OCH/taxi/pcommon/src/main/res/values/colors.xml
index 524c105c98..e6f45a4f3b 100644
--- a/OCH/taxi/pcommon/src/main/res/values/colors.xml
+++ b/OCH/taxi/pcommon/src/main/res/values/colors.xml
@@ -14,5 +14,6 @@
#96a5c2
#374968
#131415
+ #80FFFFFF
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
index a9fbeb519d..267f1d5457 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
@@ -15,6 +15,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P
import com.mogo.eagle.core.utilcode.util.DeviceUtils
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler
import com.mogo.map.listener.IMogoMapListener
import com.mogo.och.common.module.manager.xiaozhimanager.ZhiStateManager
import com.mogo.och.common.module.utils.RxUtils
@@ -22,9 +23,10 @@ import com.mogo.och.common.module.voice.VoiceNotice
import com.mogo.och.taxi.passenger.R
import com.mogo.och.taxi.passenger.presenter.BaseTaxiPassengerPresenter
import com.mogo.och.taxi.passenger.ui.arrived.ArrivedView
+import com.mogo.och.taxi.passenger.ui.bar.LeftBarView
import com.mogo.och.taxi.passenger.ui.bottom.BottomBar
import com.mogo.och.taxi.passenger.ui.checkstartautopilot.ChekAndStartAutopilotView
-import com.mogo.och.taxi.passenger.ui.rightbar.RightBarView
+import com.mogo.och.taxi.passenger.ui.bar.RightBarView
import com.mogo.och.taxi.passenger.ui.statusview.StatusBarView
import io.reactivex.disposables.Disposable
import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.arrivedView
@@ -34,6 +36,7 @@ import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.clSettingView
import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.evaluate
import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.infoVideoView
import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.itinerary
+import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.lbv_go2_center
import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.mapBizView
import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.mv_music_info
import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.overMapView
@@ -55,10 +58,9 @@ class TaxiPassengerBaseFragment() :
MvpFragment(), IMogoMapListener,
TaxiPassengerTaxiView {
- private var tipXiaoZhiDelay: Disposable?=null
-
private var statusBarView: StatusBarView? = null
+ private var tipXiaoZhiDelay: Disposable?=null
override fun getLayoutId(): Int {
return R.layout.taxt_u_p_base_fragment
@@ -95,6 +97,8 @@ class TaxiPassengerBaseFragment() :
mv_music_info.visibility = if(musicShow) View.VISIBLE else View.GONE
}
+ })
+ lbv_go2_center.setOrderIdCallback(object : LeftBarView.LeftBarCallback{
override fun setGo2CenterClick() {
when (bottom.getCurrentPage()) {
BottomBar.SelectView.PRECISIONMAP -> {
@@ -132,6 +136,7 @@ class TaxiPassengerBaseFragment() :
romaDistanceView.visibility = View.GONE
}
rbv_setting_music.setShowOnlySetting(0)
+ lbv_go2_center.visibility = View.VISIBLE
pcnActionView.visibility = View.VISIBLE
CallerHmiManager.showTrafficLightView()
infoVideoView.visibility = View.GONE
@@ -145,6 +150,7 @@ class TaxiPassengerBaseFragment() :
romaPView.updateVisible(false)
romaDistanceView.visibility = View.GONE
rbv_setting_music.setShowOnlySetting(0)
+ lbv_go2_center.visibility = View.VISIBLE
pcnActionView.visibility = View.VISIBLE
CallerHmiManager.showTrafficLightView()
infoVideoView.visibility = View.GONE
@@ -155,9 +161,10 @@ class TaxiPassengerBaseFragment() :
mapBizView.visibility = View.GONE
presenter?.setItineraryVisibility()
speedView.visibility = View.GONE
+ rbv_setting_music.setShowOnlySetting(1)
+ lbv_go2_center.visibility = View.GONE
romaPView.updateVisible(false)
romaDistanceView.visibility = View.GONE
- rbv_setting_music.setShowOnlySetting(1)
pcnActionView.visibility = View.GONE
CallerHmiManager.hideTrafficLightView()
infoVideoView.visibility = View.VISIBLE
@@ -174,31 +181,24 @@ class TaxiPassengerBaseFragment() :
override fun isShow(show: Boolean) {
CallerLogger.d(M_TAXI_P + TAG, "arrived ${show}")
if(arrivedView.visibility==View.GONE&&chekAndStartAutopilotView.visibility==View.GONE){
- showOrHide(true)
+ showOrHide(true,"到达目的地页面隐藏")
ZhiStateManager.setZhiEnable(true)
}else{
ZhiStateManager.setZhiEnable(false)
}
}
}
- chekAndStartAutopilotView.checkAndStartVisilityChangeListenr = object :ChekAndStartAutopilotView.CheckAndStartVisilityChangeListenr{
+ chekAndStartAutopilotView.checkAndStartVisilityChangeListenr = object : ChekAndStartAutopilotView.CheckAndStartVisilityChangeListenr{
override fun isShow(show: Boolean) {
CallerLogger.d(M_TAXI_P + TAG, "check and startAutopilot ${show}")
if(arrivedView.visibility==View.GONE&&chekAndStartAutopilotView.visibility==View.GONE){
- showOrHide(true)
+ showOrHide(true,"手机号check+startautopilot页面隐藏")
ZhiStateManager.setZhiEnable(true)
}else{
ZhiStateManager.setZhiEnable(false)
}
}
}
- view?.viewTreeObserver?.addOnWindowFocusChangeListener {
- if(it){
- CallerLogger.d(M_TAXI_P + TAG, "windows获取焦点")
- }else{
- CallerLogger.d(M_TAXI_P + TAG, "window失去焦点")
- }
- }
}
override fun onResume() {
@@ -261,9 +261,46 @@ class TaxiPassengerBaseFragment() :
}
}
+
+
+ fun showOrHideCheckAndStartAutopilotView(status:Int){
+ UiThreadHandler.post {
+ arrivedView.visibility = View.GONE
+ when (status) {
+ 0 -> {
+ if (chekAndStartAutopilotView.visibility == View.GONE) {
+ showOrHide(false,"显示手机号check")
+ }
+ chekAndStartAutopilotView.aniCheckAndStartAutopilot(true, 0)
+ }
+ 1 -> {
+ if (chekAndStartAutopilotView.visibility == View.GONE) {
+ showOrHide(false,"显示启动自动驾驶")
+ }
+ chekAndStartAutopilotView.aniCheckAndStartAutopilot(true, 1)
+ }
+ 2 -> {
+ chekAndStartAutopilotView.aniCheckAndStartAutopilot(false, 2)
+ }
+ else -> {}
+ }
+ }
+ }
+
+ fun tipXiaoZhi(){
+ RxUtils.disposeSubscribe(tipXiaoZhiDelay)
+ tipXiaoZhiDelay = RxUtils.createSubscribe(30_000) {
+ VoiceNotice.showNotice(
+ "想和我对话的时候可以直接戳我,也可以对我说\\'你好小智\\'!",
+ AIAssist.LEVEL2
+ )
+ }
+ }
+
+
fun setOverMapDebug(){
overMapView.setDebugMode(true)
- showOrHide(true)
+ showOrHide(true,"Debug 按钮")
}
/**
@@ -281,58 +318,24 @@ class TaxiPassengerBaseFragment() :
if (isShow) {
exitFullVideoScreen(true)
arrivedView.aniArrived(true)
- showOrHide(false)
+ showOrHide(false,"显示到达目的地")
RxUtils.createSubscribe(500) {
arrivedView.setDataAndStartAnimation()
VoiceNotice.showNotice("已到达目的地,带好随身物品,右侧下车更安全!期待下次再见", AIAssist.LEVEL2)
}
} else {
if(arrivedView.visibility!=View.GONE) {
- showOrHide(true)
+ showOrHide(true, "隐藏到达目的地")
arrivedView.aniArrived(false)
}
}
}
- fun showOrHideCheckAndStartAutopilotView(status:Int){
- arrivedView.visibility = View.GONE
- when (status) {
- 0 -> {
- if(chekAndStartAutopilotView.visibility == View.GONE){
- showOrHide(false)
- }
- chekAndStartAutopilotView.aniCheckAndStartAutopilot(true,0)
- }
- 1 -> {
- if(chekAndStartAutopilotView.visibility == View.GONE){
- showOrHide(false)
- }
- chekAndStartAutopilotView.aniCheckAndStartAutopilot(true,1)
- }
- 2 -> {
- chekAndStartAutopilotView.aniCheckAndStartAutopilot(false,2)
- }
- else -> {}
- }
- }
-
- fun tipXiaoZhi(){
- RxUtils.disposeSubscribe(tipXiaoZhiDelay)
- tipXiaoZhiDelay = RxUtils.createSubscribe(30_000) {
- VoiceNotice.showNotice(
- "想和我对话的时候可以直接戳我,也可以对我说\\'你好小智\\'!",
- AIAssist.LEVEL2
- )
- }
- }
-
-
-
private fun exitFullVideoScreen(resetVideoPlayer: Boolean) {
infoVideoView.exitFullScreenMode(resetVideoPlayer)
}
- fun showOrHideOverMapView(){
+ fun showOrHideOverMapView() {
CallerLogger.d(M_TAXI_P + TAG, "showOrHideOverMapView 清理轨迹和站点")
overMapView?.clearV2XMarkers()
overMapView?.clearCustomPolyline()
@@ -342,7 +345,8 @@ class TaxiPassengerBaseFragment() :
bottom.setCheckIndex(BottomBar.SelectView.OVERMAPVIEW)
}
- private fun showOrHide(isShow: Boolean){
+ private fun showOrHide(isShow: Boolean,type:String){
+ CallerLogger.d(M_TAXI_P + TAG, "类型:$type")
val animatorSet = AnimatorSet()
val allAnimator = mutableListOf()
allAnimator.addAll(aniStatusBar(isShow))
@@ -465,13 +469,11 @@ class TaxiPassengerBaseFragment() :
return statusBar
}
-
fun preLoadArrivedImages() {
arrivedView.preLoadImages()
}
-
companion object {
@JvmField
val TAG = "TaxiPassengerBaseFragment"
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt
index 654b8aae8c..e4f5645eb9 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt
@@ -98,7 +98,7 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback
}
var prePercentage = 0f
- val needChangeStyleNumber = 0.99
+ val needChangeStyleNumber = 0.98
val needChangeStyleNumberMin = 0.03f
override fun setDistanceInfo(surplusdistance:String,distanceUnit:String,
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
index bfdc3002c6..e3a7bedf92 100644
--- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
@@ -84,13 +84,23 @@
app:layout_constraintTop_toTopOf="parent"
app:roma_change_dis_color="true" />
-
+
+
+
@@ -169,6 +179,15 @@
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
+
+
-
-
-
-
-
-
-
+
+
+
+
+