yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.3.0]

Browse Source 
[UI调整]
This commit is contained in:
yangyakun
2024-03-22 17:15:15 +08:00
parent ede4fdb4eb
commit 70f878632b
20 changed files with 271 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
View File

@@ -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

2
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt
View File

@@ -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,

34
OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
View File

@@ -84,13 +84,22 @@
app:layout_constraintTop_toTopOf="parent"
app:roma_change_dis_color="true" />
<com.mogo.och.taxi.passenger.ui.rightbar.RightBarView
<com.mogo.och.taxi.passenger.ui.bar.RightBarView
android:id="@+id/rbv_setting_music"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_40"
android:layout_width="wrap_content"
android:layout_height="match_parent"/>
<com.mogo.och.taxi.passenger.ui.bar.LeftBarView
android:id="@+id/lbv_go2_center"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="@dimen/dp_607"
android:layout_marginStart="@dimen/dp_58"
android:layout_width="@dimen/dp_78"
android:layout_height="@dimen/dp_78"/>
<com.mogo.och.taxi.passenger.ui.music.MusicView
android:id="@+id/mv_music_info"
app:layout_constraintTop_toTopOf="parent"
@@ -138,8 +147,8 @@
<!-- 路程信息 -->
<com.mogo.och.taxi.passenger.ui.orderinfo.ItineraryView
android:id="@+id/itinerary"
android:layout_width="@dimen/dp_842"
android:layout_height="wrap_content"
android:layout_width="@dimen/dp_866"
android:layout_height="@dimen/dp_467"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/bottom"
app:layout_constraintStart_toStartOf="parent" />
@@ -164,6 +173,15 @@
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<com.mogo.och.taxi.passenger.ui.evaluate.EvaluateView
android:id="@+id/evaluate"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/pmbb_info"
app:layout_constraintEnd_toEndOf="@+id/aciv_xiaozhi_normal"
android:layout_marginEnd="@dimen/dp_50"
android:layout_width="@dimen/dp_640"
android:layout_height="wrap_content"/>
<com.mogo.och.common.module.manager.xiaozhimanager.ZhiView
android:id="@+id/aciv_xiaozhi_normal"
android:layout_width="@dimen/dp_360"
@@ -172,7 +190,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<!--气泡态消息盒子-->
<com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxBubbleView
android:id="@+id/pmbb_info"
@@ -183,14 +200,7 @@
app:layout_constraintBottom_toTopOf="@id/aciv_xiaozhi_normal"
app:layout_constraintEnd_toEndOf="parent" />
<com.mogo.och.taxi.passenger.ui.evaluate.EvaluateView
android:id="@+id/evaluate"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/pmbb_info"
app:layout_constraintEnd_toEndOf="@+id/aciv_xiaozhi_normal"
android:layout_marginEnd="@dimen/dp_50"
android:layout_width="@dimen/dp_621"
android:layout_height="wrap_content"/>
<com.mogo.och.taxi.passenger.ui.debug.DebugView
android:layout_width="wrap_content"

38
OCH/taxi/passenger/src/main/res/layout/taxi_p_itinerary.xml
View File

@@ -155,27 +155,29 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_north"
android:text="N"
android:textColor="@color/taxi_p_6C8BB9"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/simpleMap"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.appcompat.widget.AppCompatImageView
android:src="@drawable/taxi_p_north"
app:layout_constraintBottom_toTopOf="@+id/actv_north"
app:layout_constraintEnd_toEndOf="@+id/actv_north"
app:layout_constraintStart_toStartOf="@+id/actv_north"
android:layout_width="@dimen/dp_15"
android:layout_height="@dimen/dp_11"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_north"
android:text="N"
android:textColor="@color/taxi_p_6C8BB9"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_97"
android:layout_marginBottom="@dimen/dp_115"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.appcompat.widget.AppCompatImageView
android:src="@drawable/taxi_p_north"
app:layout_constraintBottom_toTopOf="@+id/actv_north"
app:layout_constraintEnd_toEndOf="@+id/actv_north"
app:layout_constraintStart_toStartOf="@+id/actv_north"
android:layout_width="@dimen/dp_15"
android:layout_height="@dimen/dp_11"/>
<!-- <com.mogo.och.taxi.passenger.ui.simplemap.SimpleMapView-->
<!-- android:id="@+id/simpleMap"-->
<!-- app:layout_constraintTop_toTopOf="@+id/gl_horizontal_center"-->
@@ -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"

63
OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/LeftBarView.kt Normal file
View File

@@ -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()
}
}

12
OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/rightbar/RightBarView.kt → OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/RightBarView.kt
View File

@@ -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) {

BIN
OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxi_p_reset_location_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_location_center_normal.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

6
OCH/taxi/pcommon/src/main/res/drawable/taxi_p_music_list_bottom.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient android:startColor="@color/taxi_cp_80FFFFFF" android:endColor="@android:color/transparent" android:angle="90"/>
<corners android:bottomLeftRadius="@dimen/dp_30" android:bottomRightRadius="@dimen/dp_30"/>
</shape>

8
OCH/taxi/pcommon/src/main/res/layout/taxi_p_evaluate.xml
View File

@@ -2,7 +2,7 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="@dimen/dp_621"
android:layout_width="@dimen/dp_640"
android:layout_height="wrap_content"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
@@ -10,8 +10,8 @@
<com.mogo.eagle.core.widget.RoundCanClickConstraintLayout
android:layout_width="@dimen/dp_600"
android:layout_height="@dimen/dp_349"
android:layout_marginStart="@dimen/dp_21"
android:layout_marginTop="@dimen/dp_33"
android:layout_marginStart="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_40"
android:background="#8CF5FAFF"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -92,7 +92,7 @@
android:id="@+id/iv_close"
android:layout_width="@dimen/dp_81"
android:layout_height="@dimen/dp_81"
android:layout_marginTop="@dimen/dp_10"
android:src="@drawable/taxi_p_evaluate_close"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

29
OCH/taxi/pcommon/src/main/res/layout/taxi_p_leftbar.xml Normal file
View File

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="@dimen/dp_78"
android:layout_height="@dimen/dp_78"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
<ImageView
android:id="@+id/iv_center_location_bg"
android:layout_width="@dimen/dp_78"
android:layout_height="@dimen/dp_78"
android:layout_marginTop="@dimen/dp_64"
android:src="@drawable/taxi_p_reset_location_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iv_setting_music_bg" />
<ImageView
android:id="@+id/iv_center_location"
app:layout_constraintTop_toTopOf="@+id/iv_center_location_bg"
app:layout_constraintBottom_toBottomOf="@+id/iv_center_location_bg"
app:layout_constraintStart_toStartOf="@+id/iv_center_location_bg"
app:layout_constraintEnd_toEndOf="@+id/iv_center_location_bg"
android:src="@drawable/taxi_p_center_location_selector"
android:layout_width="@dimen/dp_41"
android:layout_height="@dimen/dp_42"/>
</merge>

2
OCH/taxi/pcommon/src/main/res/layout/taxi_p_music.xml
View File

@@ -21,7 +21,7 @@
<com.mogo.och.taxi.passenger.ui.music.list.MusicListView
android:id="@+id/mlv_list"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginTop="@dimen/dp_50"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:visibility="visible"

10
OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_list.xml
View File

@@ -21,10 +21,16 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_music_list"
app:layout_constraintTop_toBottomOf="@+id/tv_music_title"
android:layout_marginTop="@dimen/dp_52"
android:paddingTop="@dimen/dp_26"
android:layout_marginTop="@dimen/dp_26"
android:layout_width="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="@dimen/dp_20"
android:layout_height="0dp"/>
<View
android:background="@drawable/taxi_p_music_list_bottom"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_91"/>
</merge>

10
OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_playing.xml
View File

@@ -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"/>

21
OCH/taxi/pcommon/src/main/res/layout/taxi_p_rightbar.xml
View File

@@ -38,29 +38,10 @@
app:layout_constraintEnd_toEndOf="@+id/iv_setting_music_bg"
app:layout_constraintBottom_toBottomOf="@+id/iv_setting_music_bg" />
<ImageView
android:id="@+id/iv_center_location_bg"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"
android:layout_marginTop="@dimen/dp_64"
android:src="@drawable/taxi_p_reset_location_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iv_setting_music_bg" />
<ImageView
android:id="@+id/iv_center_location"
app:layout_constraintTop_toTopOf="@+id/iv_center_location_bg"
app:layout_constraintBottom_toBottomOf="@+id/iv_center_location_bg"
app:layout_constraintStart_toStartOf="@+id/iv_center_location_bg"
app:layout_constraintEnd_toEndOf="@+id/iv_center_location_bg"
android:src="@drawable/taxi_p_center_location_selector"
android:layout_width="@dimen/dp_76"
android:layout_height="@dimen/dp_76"/>
<androidx.constraintlayout.widget.Group
android:id="@+id/con_third_group"
android:visibility="visible"
app:constraint_referenced_ids="iv_setting_music_bg,ck_setting,ck_music,iv_center_location_bg,iv_center_location"
app:constraint_referenced_ids="iv_setting_music_bg,ck_setting,ck_music"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>

1
OCH/taxi/pcommon/src/main/res/values/colors.xml
View File

@@ -14,5 +14,6 @@
<color name="taxi_cp_96a5c2">#96a5c2</color>
<color name="taxi_cp_374968">#374968</color>
<color name="taxi_cp_131415">#131415</color>
<color name="taxi_cp_80FFFFFF">#80FFFFFF</color>
</resources>

112
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
View File

@@ -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<TaxiPassengerBaseFragment?, BaseTaxiPassengerPresenter?>(), 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<Animator>()
allAnimator.addAll(aniStatusBar(isShow))
@@ -465,13 +469,11 @@ class TaxiPassengerBaseFragment() :
return statusBar
}
fun preLoadArrivedImages() {
arrivedView.preLoadImages()
}
companion object {
@JvmField
val TAG = "TaxiPassengerBaseFragment"

2
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt
View File

@@ -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,

34
OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
View File

@@ -84,13 +84,23 @@
app:layout_constraintTop_toTopOf="parent"
app:roma_change_dis_color="true" />
<com.mogo.och.taxi.passenger.ui.rightbar.RightBarView
<com.mogo.och.taxi.passenger.ui.bar.RightBarView
android:id="@+id/rbv_setting_music"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_40"
android:layout_width="wrap_content"
android:layout_height="match_parent"/>
<com.mogo.och.taxi.passenger.ui.bar.LeftBarView
android:id="@+id/lbv_go2_center"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginStart="@dimen/dp_58"
android:layout_marginBottom="@dimen/dp_607"
android:layout_width="@dimen/dp_78"
android:layout_height="@dimen/dp_78"/>
<com.mogo.och.taxi.passenger.ui.music.MusicView
android:id="@+id/mv_music_info"
app:layout_constraintTop_toTopOf="parent"
@@ -137,8 +147,8 @@
<!-- 路程信息 -->
<com.mogo.och.taxi.passenger.ui.orderinfo.ItineraryView
android:id="@+id/itinerary"
android:layout_width="@dimen/dp_842"
android:layout_height="wrap_content"
android:layout_width="@dimen/dp_866"
android:layout_height="@dimen/dp_467"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/bottom"
app:layout_constraintStart_toStartOf="parent" />
@@ -169,6 +179,15 @@
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<com.mogo.och.taxi.passenger.ui.evaluate.EvaluateView
android:id="@+id/evaluate"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/pmbb_info"
app:layout_constraintEnd_toEndOf="@+id/aciv_xiaozhi_normal"
android:layout_marginEnd="@dimen/dp_50"
android:layout_width="@dimen/dp_640"
android:layout_height="wrap_content"/>
<com.mogo.och.common.module.manager.xiaozhimanager.ZhiView
@@ -189,15 +208,6 @@
android:layout_marginBottom="-80dp"
app:layout_constraintEnd_toEndOf="parent" />
<com.mogo.och.taxi.passenger.ui.evaluate.EvaluateView
android:id="@+id/evaluate"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/pmbb_info"
app:layout_constraintEnd_toEndOf="@+id/aciv_xiaozhi_normal"
android:layout_marginEnd="@dimen/dp_50"
android:layout_width="@dimen/dp_621"
android:layout_height="wrap_content"/>
<com.mogo.och.taxi.passenger.ui.debug.DebugView
android:layout_width="wrap_content"

40
OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_itinerary.xml
View File

@@ -156,27 +156,29 @@
app:layout_constraintStart_toStartOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_north"
android:text="N"
android:textColor="@color/taxi_p_6C8BB9"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/simpleMap"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.appcompat.widget.AppCompatImageView
android:src="@drawable/taxi_p_north"
app:layout_constraintBottom_toTopOf="@+id/actv_north"
app:layout_constraintEnd_toEndOf="@+id/actv_north"
app:layout_constraintStart_toStartOf="@+id/actv_north"
android:layout_width="@dimen/dp_15"
android:layout_height="@dimen/dp_11"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_north"
android:text="N"
android:textColor="@color/taxi_p_6C8BB9"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_97"
android:layout_marginBottom="@dimen/dp_115"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.appcompat.widget.AppCompatImageView
android:src="@drawable/taxi_p_north"
app:layout_constraintBottom_toTopOf="@+id/actv_north"
app:layout_constraintEnd_toEndOf="@+id/actv_north"
app:layout_constraintStart_toStartOf="@+id/actv_north"
android:layout_width="@dimen/dp_15"
android:layout_height="@dimen/dp_11"/>
<ProgressBar
android:id="@+id/progress_distance"
style="?android:attr/progressBarStyleHorizontal"
@@ -184,7 +186,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"