From 70f878632b268650cdca0a08bad8b386b537af81 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 22 Mar 2024 17:15:15 +0800 Subject: [PATCH] =?UTF-8?q?[6.3.0]=20[UI=E8=B0=83=E6=95=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/ui/TaxiPassengerBaseFragment.kt | 10 +- .../passenger/ui/orderinfo/ItineraryView.kt | 2 +- .../main/res/layout/taxi_p_base_fragment.xml | 34 ++++-- .../src/main/res/layout/taxi_p_itinerary.xml | 38 +++--- .../och/taxi/passenger/ui/bar/LeftBarView.kt | 63 ++++++++++ .../ui/{rightbar => bar}/RightBarView.kt | 12 +- .../taxi_p_reset_location_bg.png | Bin 5574 -> 3697 bytes .../taxt_p_location_center_normal.png | Bin 1971 -> 1462 bytes .../res/drawable/taxi_p_music_list_bottom.xml | 6 + .../src/main/res/layout/taxi_p_evaluate.xml | 8 +- .../src/main/res/layout/taxi_p_leftbar.xml | 29 +++++ .../src/main/res/layout/taxi_p_music.xml | 2 +- .../src/main/res/layout/taxi_p_music_list.xml | 10 +- .../main/res/layout/taxi_p_music_playing.xml | 10 +- .../src/main/res/layout/taxi_p_rightbar.xml | 21 +--- .../pcommon/src/main/res/values/colors.xml | 1 + .../passenger/ui/TaxiPassengerBaseFragment.kt | 112 +++++++++--------- .../passenger/ui/orderinfo/ItineraryView.kt | 2 +- .../res/layout/taxt_u_p_base_fragment.xml | 34 ++++-- .../main/res/layout/taxt_u_p_itinerary.xml | 40 ++++--- 20 files changed, 271 insertions(+), 163 deletions(-) create mode 100644 OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/LeftBarView.kt rename OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/{rightbar => bar}/RightBarView.kt (93%) mode change 100755 => 100644 OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_location_center_normal.png create mode 100644 OCH/taxi/pcommon/src/main/res/drawable/taxi_p_music_list_bottom.xml create mode 100644 OCH/taxi/pcommon/src/main/res/layout/taxi_p_leftbar.xml 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 2525304006e800df1f027a497e8f06e1fc785fb8..59b0d95fd0b0b4e78c984bba50489ea46d097974 100644 GIT binary patch delta 3662 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 AN&o-= 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 fcebe35df7d8e4f535f49c1458d8b9a1de2a32b3..a21f27c4c685b3fe2b51b8d045592ebd36ee89f3 GIT binary patch delta 1409 zcmV-{1%CRo54H;-iBL{Q4GJ0x0000DNk~Le0000f0000g2nGNE050@$Sdk$}e<`2? z00aO40096104e|g004)8{*M3v1t3X8K~z`??O0t*TtyU~Gk4jgZbPY!7V8gKj1}a8 zWho>ryWK(`N^PWJSutR$K1hv?CZ;dGXh`FmJ~U|)Uwlxs8oIEWRwcD!m!DLNK}d}7 z(5kJH0d_i)a00pPB~L3aOivHMp$;!`_!ZCRL|Aw$n{LFo*(sD`!Wf{DK85^fARu>mzG+R zY+s9pr2`2{-Z^eHrX8eVRib~kj_3?g{ zwG51vMaa&*!KdSK{Sp#^+1`b;Kb2NNawx^SoNLKoTf1bF`hcQ3`kJquk zIgs6>{oPm61(t0{5WIVWr$h#2JBB+mI@sN8wxw!H+a2fp7`i41iZGP&W)*@0i!a2B zw`y;oI4Jbxhlf11jfKm4dMP7GZ(EyaG0({ExK)wizQ{${mPrnW!wekoW)cp_B4CeQ z{YhkJXCPF-2-%nde~;-EI`B@}4jMf$(%01^+f?Q9n&1dF{&EA4FC4|%Ot~Oqt@G_$ z^uO@s79I8Vue+vZZ+sPtvweo6X-vFE!pb+nMoU>tc%p!$dhq~AkVHAa<19^GGjeqj zX1u;o3!R>wY(Zdpf^zi#WUQ~5X!N7`G*e0@JkuwXfCxffe|b95Pf$Y57lTXz(9w|z zv--T+F`9_MiIe70IE`B%+Kbx5iMytzWzD}|I3e5B77{2}#6NF2qS5eNC={yxeVUZ& zkow`^wdDz5tV0ewN9XHN|4g>2%D5BzWh}=Ur5b%(wh0-4a);)+GSu5~EA_KTMx*ZW zHU7ytc{DKve`IKMAX1&s6$P&^c!+WSg$zdmherk@pUAdkIb)v`4!|K|a^$3{!ryen zWXqt4>z&T|`z9EWgmPf@r8ee_v2k>U`?)vY~6&#zc{)JRX0e zpDi-nVqPUrVk^3p>!#05{5EEKc^PBKN;N6K;&{}@Z(hLK++#Q!BQAIoUpY zk0N{gW0$t!oy*bF%EzJ+Z%rf(=cUWZ+zs)CH|U&%@CVHD?`%$DSbM{GF+Pji+ogK< zG-AtRRwU&>9$)Y~%y6Ay!@wQbq+c}jY(`5pSDDR1+4!!L%qDxX@Bb{5*o)-1$1mEf znYxiHp_dnmvxqNo5xOo6X$b1&RZ?%S=v|) z<76{qWDWjRnlPLZfL~DIe_h&~icf+&caE7@V>?UE0b97-SAKPrZpE&|3xtuPOe_L` zK>)Hfc*L*cH9BYRJ~;)f?vb?*Gh=)&Zo?UNm{=Q8K|hy_$4+`q0E>V{$YlYxNw-3rf=f3*+D=Io$30vJAd^jx-D zrXY`5R=1%{PH(q<5J7K~&5`l3CMn$pq9cISFIl%hR_>sI0W$&KtX-Omydvj?RdRav zR7U`#<73N{sMeZ)1sw0?0hdicD0@6%@LQ*mk9@hxdNCK&i@eRy>AJsdXU zb}Ki#E}oC)e_8QkTdp~RqD>d3x1^Q(0W1Cn`4d{lyhX#)6DzV( z@kV~F810!&W&?J}39$H0904rY^?8UNSWLD85yaLsZ_$YKOvXGO;uCpYx)xx+lx_pj z5x}@!xYu{d^yB?3-lCDsS)mPvjQ8;o+%2xbf9-gsc$&6Pq}w%i3^0BahI!Xuf}(g* z#QRyiMUyaRl2GSu+>G9}QO3^jZQk>}{JxuIZ?R?Vv60of-}^j4&|RLz{* zA38UX2&!ZOC-H4qRDS=52-eFo7WC>NS6RjS(CMIKXO@nS5Ob3u!d_4_p=o4Xz)!Lc6S75_js^Yr8}UQde`#*_LrCk6r)Pf+lzUdLz~cHk7W73h&Yw9x z;$1NJi_0UV4C59rk+OPN=v6~RgD3G=ZI^g2C&xM2lA-|~udfD6xi|TNg*caP%=0Xs zI=D*9w+9dG98Je>_k3Oeiy09)-H9Anz$)HWj?u+$UK + + + + \ 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"/> + + - - - - - - - + + + + +