diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/BigFrameAnimatorContainer.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/BigFrameAnimatorContainer.kt index 5644803bfd..6e286cbd0d 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/BigFrameAnimatorContainer.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/BigFrameAnimatorContainer.kt @@ -29,7 +29,7 @@ class BigFrameAnimatorContainer (resId: Int, private var mSoftReferenceImageView: SoftReference? = null // 软引用ImageView，以便及时释放掉 private var mHandler: Handler? = null private var mDelayMillis = 0 - private var mOnAnimationStoppedListener: OnAnimationStoppedListener? = null//播放停止监听 + var mOnAnimationStoppedListener: OnAnimationStoppedListener? = null//播放停止监听 var isOnce:Boolean = false private val readQueue = ArrayBlockingQueue>(8,true) 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 a1f770f638..8d6af1db62 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 @@ -1,5 +1,10 @@ package com.mogo.och.taxi.passenger.ui +import android.animation.Animator +import android.animation.AnimatorListenerAdapter +import android.animation.AnimatorSet +import android.animation.ObjectAnimator +import android.annotation.SuppressLint import android.os.Bundle import android.view.View import com.alibaba.android.arouter.launcher.ARouter @@ -20,7 +25,9 @@ import com.mogo.och.common.module.utils.RxUtils 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.bottom.BottomBar +import com.mogo.och.taxi.passenger.ui.checkstartautopilot.ChekAndStartAutopilotView 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 @@ -36,6 +43,7 @@ import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.pcnActionView import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.romaDistanceView import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.romaPView import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.rv_location_center +import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.speedView /** * 网约车基础Fragment，主要负责布局通用界面，处理站点面板和通话面板互斥情况 @@ -169,6 +177,22 @@ class TaxiPassengerBaseFragment() : } } + arrivedView.arrivedVisilityChangeListenr = object :ArrivedView.ArrivedVisilityChangeListenr{ + override fun isShow(show: Boolean) { + CallerLogger.d(M_TAXI_P + TAG, "arrived ${show}") + if(arrivedView.visibility==View.GONE&&chekAndStartAutopilotView.visibility==View.GONE){ + showOrHide(true) + } + } + } + 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) + } + } + } view?.viewTreeObserver?.addOnWindowFocusChangeListener { if(it){ CallerLogger.d(M_TAXI_P + TAG, "windows获取焦点") @@ -245,23 +269,52 @@ class TaxiPassengerBaseFragment() : fun setOverMapDebug(){ overMapView.setDebugMode(true) + showOrHide(true) + } + + /** + * 显示或者隐藏到达乘客站点的洁面 + * ① 取消订单 可有可无 + * ② 到达上车点 隐藏到达终点的页面（上一个订单没有评价） + * ③ 到达目的地 显示到达终点的页面 + * ④ debug 使用 + * + * @param isShow true 展示 false 隐藏 + */ + fun showOrHideArrivedEndLayout(isShow: Boolean) { + chekAndStartAutopilotView.visibility = View.GONE + if (isShow) { + exitFullVideoScreen(true) + arrivedView.aniArrived(true) + showOrHide(false) + RxUtils.createSubscribe(500) { + arrivedView.setDataAndStartAnimation() + VoiceNotice.showNotice("已到达目的地，带好随身物品，右侧下车更安全！期待下次再见", AIAssist.LEVEL2) + } + } else { + showOrHide(true) + arrivedView.aniArrived(false) + } } fun showOrHideCheckAndStartAutopilotView(status:Int){ + arrivedView.visibility = View.GONE when (status) { 0 -> { - chekAndStartAutopilotView.visibility = View.VISIBLE - statusBarView?.visibility = View.GONE - chekAndStartAutopilotView.resetCheckView() + if(chekAndStartAutopilotView.visibility == View.GONE){ + showOrHide(false) + } + chekAndStartAutopilotView.aniCheckAndStartAutopilot(true,0) } 1 -> { - chekAndStartAutopilotView.visibility = View.VISIBLE - statusBarView?.visibility = View.GONE - chekAndStartAutopilotView.startAnimation2StartAutopilit() + if(chekAndStartAutopilotView.visibility == View.GONE){ + showOrHide(false) + } + chekAndStartAutopilotView.aniCheckAndStartAutopilot(true,1) } 2 -> { - chekAndStartAutopilotView.visibility = View.GONE - statusBarView?.visibility = View.VISIBLE + chekAndStartAutopilotView.aniCheckAndStartAutopilot(false,2) + showOrHide(true) chekAndStartAutopilotView.resetCheckView() } else -> {} @@ -280,28 +333,6 @@ class TaxiPassengerBaseFragment() : - /** - * 显示或者隐藏到达乘客站点的洁面 - * ① 取消订单 可有可无 - * ② 到达上车点 隐藏到达终点的页面（上一个订单没有评价） - * ③ 到达目的地 显示到达终点的页面 - * ④ debug 使用 - * - * @param isShow true 展示 false 隐藏 - */ - fun showOrHideArrivedEndLayout(isShow: Boolean) { - if (isShow) { - exitFullVideoScreen(true) - arrivedView.visibility = View.VISIBLE - RxUtils.createSubscribe(500) { - arrivedView.setDataAndStartAnimation() - VoiceNotice.showNotice("已到达目的地，带好随身物品，右侧下车更安全！期待下次再见", AIAssist.LEVEL2) - } - } else { - arrivedView.visibility = View.GONE - } - } - private fun exitFullVideoScreen(resetVideoPlayer: Boolean) { infoVideoView.exitFullScreenMode(resetVideoPlayer) } @@ -316,6 +347,136 @@ class TaxiPassengerBaseFragment() : bottom.setCheckIndex(BottomBar.SelectView.OVERMAPVIEW) } + private fun showOrHide(isShow: Boolean){ + val animatorSet = AnimatorSet() + val allAnimator = mutableListOf() + allAnimator.addAll(aniStatusBar(isShow)) + allAnimator.addAll(aniBottomBar(isShow)) + + allAnimator.addAll(aniSpeedSettingRow(isShow,speedView)) + allAnimator.addAll(aniSpeedSettingRow(isShow,romaPView)) + allAnimator.addAll(aniSpeedSettingRow(isShow,romaDistanceView)) + allAnimator.addAll(aniSpeedSettingRow(isShow,ck_setting)) + + allAnimator.addAll(aniOrderInfo(isShow)) + animatorSet.playTogether(allAnimator) + animatorSet.start() + } + + @SuppressLint("ObjectAnimatorBinding") + fun aniStatusBar(show:Boolean):List{ + val statusBar = mutableListOf() + val translationYStart: Float + val translationYEnd: Float + val alphaStart: Float + val alphaEnd: Float + if(show){ + translationYStart = -statusBarView!!.height.toFloat() + translationYEnd = 0f + alphaStart = 0.3f + alphaEnd = 1f + }else{ + translationYStart = 0f + translationYEnd = -statusBarView!!.height.toFloat() + alphaStart = 1f + alphaEnd = 0.3f + } + statusBar.add(ObjectAnimator.ofFloat(statusBarView, "translationY", translationYStart, translationYEnd).apply { + duration = 1000 + }) + //ofFloatMove.duration = 1000 + statusBar.add( ObjectAnimator.ofFloat(statusBarView, "alpha", alphaStart, alphaEnd).apply { + duration = 1000 + }) + return statusBar + } + + private fun aniBottomBar(show:Boolean):List{ + val statusBar = mutableListOf() + val translationYStart: Float + val translationYEnd: Float + val alphaStart: Float + val alphaEnd: Float + if(show){ + translationYStart = bottom!!.height.toFloat() + translationYEnd = 0f + alphaStart = 0.3f + alphaEnd = 1f + }else{ + translationYStart = 0f + translationYEnd = bottom!!.height.toFloat() + alphaStart = 1f + alphaEnd = 0.3f + } + + statusBar.add(ObjectAnimator.ofFloat(bottom, "translationY", translationYStart, translationYEnd).apply { + duration = 1000 + }) + statusBar.add(ObjectAnimator.ofFloat(bottom, "alpha", alphaStart, alphaEnd).apply { + duration = 1000 + }) + return statusBar + } + + private fun aniSpeedSettingRow(show:Boolean,view:View):List{ + val statusBar = mutableListOf() + val translationYStart: Float + val translationYEnd: Float + val alphaStart: Float + val alphaEnd: Float + if(show){ + translationYStart = -view.height.toFloat() + translationYEnd = 0f + alphaStart = 0.0f + alphaEnd = 1f + }else{ + translationYStart = 0f + translationYEnd = -view.height.toFloat() + alphaStart = 1f + alphaEnd = 0.0f + } + + statusBar.add(ObjectAnimator.ofFloat(view, "translationY", translationYStart, translationYEnd).apply { + duration = 1000 + }) + statusBar.add(ObjectAnimator.ofFloat(view, "alpha", alphaStart, alphaEnd).apply { + duration = 1000 + }) + return statusBar + } + private fun aniOrderInfo(show:Boolean):List{ + val statusBar = mutableListOf() + val translationYStart: Float + val translationYEnd: Float + val alphaStart: Float + val alphaEnd: Float + if(show){ + translationYStart = itinerary.height.toFloat()/5 + translationYEnd = 0f + alphaStart = 0.0f + alphaEnd = 1f + }else{ + translationYStart = 0f + translationYEnd = itinerary.height.toFloat()/5 + alphaStart = 1f + alphaEnd = 0.0f + } + + statusBar.add(ObjectAnimator.ofFloat(itinerary, "translationY", translationYStart, translationYEnd).apply { + duration = 1000 + }) + statusBar.add(ObjectAnimator.ofFloat(itinerary, "alpha", alphaStart, alphaEnd).apply { + duration = 1000 + }) + return statusBar + } + + + + + + + companion object { @JvmField val TAG = "TaxiPassengerBaseFragment" diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index 0867f74bd6..08c48cf2b4 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -1,16 +1,22 @@ package com.mogo.och.taxi.passenger.ui.arrived +import android.animation.Animator +import android.animation.AnimatorListenerAdapter +import android.animation.ObjectAnimator import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import androidx.lifecycle.ViewModelProvider 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.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.och.common.module.utils.BigFrameAnimatorContainer import com.mogo.och.common.module.utils.FrameAnimatorContainer import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.taxi.passenger.R +import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import io.reactivex.disposables.Disposable @@ -18,6 +24,8 @@ import kotlinx.android.synthetic.main.taxt_u_p_arrived_end_panel.view.aciv_bg import kotlinx.android.synthetic.main.taxt_u_p_arrived_end_panel.view.aciv_close import kotlinx.android.synthetic.main.taxt_u_p_arrived_end_panel.view.actv_endstation import kotlinx.android.synthetic.main.taxt_u_p_arrived_end_panel.view.v_video_right_rear_view +import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.arrivedView +import kotlinx.android.synthetic.main.taxt_u_p_check_startautopilot.view.aciv_check_autopilot /** * @@ -38,7 +46,9 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { private val gsyVideoOptionBuilder = GSYVideoOptionBuilder() - private var taxiPxiaozhiLove: FrameAnimatorContainer?=null + private var taxiPxiaozhiLove: BigFrameAnimatorContainer?=null + + var arrivedVisilityChangeListenr:ArrivedVisilityChangeListenr?=null private fun initView() { @@ -49,8 +59,8 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { visibility = View.GONE } - taxiPxiaozhiLove = FrameAnimatorContainer(R.array.arrived_dest, 18,aciv_bg) - taxiPxiaozhiLove?.setOnAnimStopListener(object : FrameAnimatorContainer.OnAnimationStoppedListener{ + taxiPxiaozhiLove = BigFrameAnimatorContainer(R.array.arrived_dest, 31,aciv_bg,isOnce = true) + taxiPxiaozhiLove?.setOnAnimStopListener(object : BigFrameAnimatorContainer.OnAnimationStoppedListener{ override fun AnimationStopped() { d(SceneConstant.M_TAXI_P + TAG, "动画暂停") } @@ -60,14 +70,16 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { override fun onVisibilityAggregated(isVisible: Boolean) { super.onVisibilityAggregated(isVisible) d(SceneConstant.M_TAXI_P + TAG, "展示---:${isVisible}") - if(isVisible){ + if (isVisible) { + taxiPxiaozhiLove = BigFrameAnimatorContainer(R.array.arrived_dest, 31,aciv_bg,isOnce = true) + taxiPxiaozhiLove?.start() v_video_right_rear_view.resetView() - taxiPxiaozhiLove?.reStart() - }else{ + } else { v_video_right_rear_view.resetView() - taxiPxiaozhiLove?.stop() + taxiPxiaozhiLove = null RxUtils.disposeSubscribe(subscribe) } + arrivedVisilityChangeListenr?.isShow(isVisible) } override fun onAttachedToWindow() { @@ -105,4 +117,37 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { actv_endstation.text = stationName } + fun aniArrived(show:Boolean){ + RxUtils.createSubscribe(500) { + val alphaStart: Float + val alphaEnd: Float + if(show){ + alphaStart = 0.0f + alphaEnd = 1f + visibility = View.VISIBLE + }else{ + alphaStart = 1f + alphaEnd = 0.0f + visibility = View.GONE + } + ObjectAnimator.ofFloat(this@ArrivedView, "alpha", alphaStart, alphaEnd).apply { + duration = 2000 + addListener(object :AnimatorListenerAdapter(){ + override fun onAnimationEnd(animation: Animator) { + CallerLogger.d(TaxiPassengerBaseFragment.TAG,"onAnimationEndcarrivedView") + if(show){ + visibility = View.VISIBLE + }else{ + visibility = View.GONE + } + } + }) + }.start() + } + } + + interface ArrivedVisilityChangeListenr{ + fun isShow(show: Boolean) + } + } \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt index 414277180c..bb384b8682 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt @@ -1,5 +1,8 @@ package com.mogo.och.taxi.passenger.ui.checkstartautopilot +import android.animation.Animator +import android.animation.AnimatorListenerAdapter +import android.animation.ObjectAnimator import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater @@ -11,7 +14,9 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.common.module.utils.BigFrameAnimatorContainer import com.mogo.och.taxi.passenger.R +import com.mogo.och.taxi.passenger.ui.arrived.ArrivedView import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout +import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.chekAndStartAutopilotView import kotlinx.android.synthetic.main.taxt_u_p_check_startautopilot.view.aciv_check_autopilot import kotlinx.android.synthetic.main.taxt_u_p_check_startautopilot.view.checkPhoneNumber import kotlinx.android.synthetic.main.taxt_u_p_check_startautopilot.view.startAutopilotClose @@ -46,6 +51,9 @@ class ChekAndStartAutopilotView : WindowRelativeLayout, private var aniCheck2StartAutopilotView: BigFrameAnimatorContainer? = null + var checkAndStartVisilityChangeListenr: CheckAndStartVisilityChangeListenr?=null + + private fun initView(context: Context) { d(SceneConstant.M_TAXI_P + TAG, "initView") LayoutInflater.from(context).inflate(R.layout.taxt_u_p_check_startautopilot, this, true) @@ -60,9 +68,15 @@ class ChekAndStartAutopilotView : WindowRelativeLayout, if (isVisible) { aniCheck2StartAutopilotView = BigFrameAnimatorContainer(R.array.check2startautopilt, 39, aciv_check_autopilot, true) + aniCheck2StartAutopilotView?.mOnAnimationStoppedListener = object : BigFrameAnimatorContainer.OnAnimationStoppedListener{ + override fun AnimationStopped() { + startAutopilotView.showStartAutopilot() + } + } } else { aniCheck2StartAutopilotView = null } + checkAndStartVisilityChangeListenr?.isShow(isVisible) } override fun onAttachedToWindow() { @@ -107,4 +121,47 @@ class ChekAndStartAutopilotView : WindowRelativeLayout, aniCheck2StartAutopilotView?.start() } + fun aniCheckAndStartAutopilot(show:Boolean,status:Int){ + val alphaStart: Float + val alphaEnd: Float + if(show){ + alphaStart = 0.0f + alphaEnd = 1f + visibility = View.VISIBLE + }else{ + alphaStart = 1f + alphaEnd = 0.0f + visibility = View.GONE + } + when (status) { + 0 -> { + checkPhoneNumber.visibility = View.VISIBLE + startAutopilotView.visibility = View.GONE + startAutopilotClose.visibility = View.GONE + ObjectAnimator.ofFloat(this@ChekAndStartAutopilotView, "alpha", alphaStart, alphaEnd).apply { + duration = 3000 + }.start() + } + 1 -> { + checkPhoneNumber.visibility = View.GONE + startAutopilotView.visibility = View.VISIBLE + startAutopilotClose.visibility = View.VISIBLE + aniCheck2StartAutopilotView?.start() + } + 2 -> { + checkPhoneNumber.visibility = View.VISIBLE + startAutopilotView.visibility = View.GONE + startAutopilotClose.visibility = View.GONE + return + } + else -> {} + } + + } + + interface CheckAndStartVisilityChangeListenr{ + fun isShow(show: Boolean) + } + + } \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt index b6b5f2cd77..8f58c3a778 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt @@ -66,7 +66,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu } }) taxiPStartAutopilot = FrameAnimatorContainer( - R.array.taxi_p_start_autopilot, 15, taxi_p_autopilot_btn_bg, true + R.array.taxi_p_start_autopilot, 15, taxi_p_autopilot_btn_bg, true, initFirstFrame = false ) taxiPStartAutopilot?.setOnAnimStopListener(object : FrameAnimatorContainer.OnAnimationStoppedListener { @@ -128,6 +128,32 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu } } + override fun onVisibilityAggregated(isVisible: Boolean) { + super.onVisibilityAggregated(isVisible) + if(isVisible){ + taxi_p_start_autopilot.background = null + taxi_p_start_autopilot.text = resources.getString(R.string.taxi_p_start_autopilot_txt) + }else{ + unableStartAutopilot() + goneAllDoorState() + resetView() + CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "onDetachedFromWindow") + } + } + + private fun resetView() { + taxi_p_autopilot_starting.visibility = View.GONE + taxi_p_autopilot_btn_bg.visibility = View.GONE + taxi_p_start_autopilot.visibility = View.GONE + } + + fun showStartAutopilot(){ + taxi_p_autopilot_starting.visibility = View.VISIBLE + taxi_p_autopilot_btn_bg.visibility = View.VISIBLE + taxi_p_start_autopilot.visibility = View.VISIBLE + taxiPStartAutopilot?.reStart() + } + override fun onAttachedToWindow() { super.onAttachedToWindow() CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "onAttachedToWindow") @@ -198,13 +224,6 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu actv_rear_right_door.visibility = GONE } - override fun onDetachedFromWindow() { - CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "onDetachedFromWindow") - unableStartAutopilot() - goneAllDoorState() - super.onDetachedFromWindow() - } - override fun unableStartAutopilotByDoorState() { unableStartAutopilot() } diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_000.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_000.png new file mode 100644 index 0000000000..50232503a8 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_000.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_001.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_001.png new file mode 100644 index 0000000000..781820164c Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_001.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_002.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_002.png new file mode 100644 index 0000000000..81a8e3f86f Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_002.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_003.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_003.png new file mode 100644 index 0000000000..2c416d18f0 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_003.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_004.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_004.png new file mode 100644 index 0000000000..af410d27f3 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_004.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_005.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_005.png new file mode 100644 index 0000000000..eb3c3260ce Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_005.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_006.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_006.png new file mode 100644 index 0000000000..909a90a70f Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_006.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_007.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_007.png new file mode 100644 index 0000000000..b0576410d7 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_007.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_008.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_008.png new file mode 100644 index 0000000000..5a7c5ac93b Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_008.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_009.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_009.png new file mode 100644 index 0000000000..c525df0923 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_009.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_010.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_010.png new file mode 100644 index 0000000000..1502af1960 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_010.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_011.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_011.png new file mode 100644 index 0000000000..cbf3228029 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_011.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_012.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_012.png new file mode 100644 index 0000000000..8da3710591 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_012.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_013.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_013.png new file mode 100644 index 0000000000..0fc95a43f6 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_013.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_014.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_014.png new file mode 100644 index 0000000000..4c4832b522 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_014.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_015.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_015.png new file mode 100644 index 0000000000..92b49c17e7 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_015.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_016.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_016.png new file mode 100644 index 0000000000..49cc3d7eda Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_016.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_017.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_017.png new file mode 100644 index 0000000000..c101518a8c Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_017.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_018.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_018.png new file mode 100644 index 0000000000..206c1ba8f2 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_018.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_019.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_019.png new file mode 100644 index 0000000000..fb64b872c8 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_019.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_020.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_020.png new file mode 100644 index 0000000000..dce940c4bb Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_020.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_021.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_021.png new file mode 100644 index 0000000000..7c7b6517e8 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_021.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_022.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_022.png new file mode 100644 index 0000000000..25d79c52c9 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_022.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_023.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_023.png new file mode 100644 index 0000000000..b91621dafb Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_023.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_024.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_024.png new file mode 100644 index 0000000000..0f5c5ac2d0 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_024.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_025.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_025.png new file mode 100644 index 0000000000..15f48ae5c5 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_025.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_026.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_026.png new file mode 100644 index 0000000000..f993c00d0d Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_026.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_027.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_027.png new file mode 100644 index 0000000000..718d3a9d2e Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_027.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_028.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_028.png new file mode 100644 index 0000000000..7818f21466 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_028.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_029.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_029.png new file mode 100644 index 0000000000..8f0940ca46 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_029.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_030.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_030.png new file mode 100644 index 0000000000..c7f253ea27 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_030.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_speed_bg.webp b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_speed_bg.webp index 50f20ef2e8..40280b8e5e 100644 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_speed_bg.webp and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_speed_bg.webp differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_roma_checked.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_roma_checked.png index 7377fd23a7..1119113e5c 100644 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_roma_checked.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_roma_checked.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_roma_normal.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_roma_normal.png index 38e78514d9..eca54cb0cf 100644 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_roma_normal.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_roma_normal.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_setting_checked.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_setting_checked.png index 017decf57c..33e50083e3 100644 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_setting_checked.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_setting_checked.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_setting_normal.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_setting_normal.png index c317fdc045..b31bfa8d64 100644 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_setting_normal.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_setting_normal.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_start_autopilot_bottom_bg.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_start_autopilot_bottom_bg.xml index 54909012c8..3243142fc8 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_start_autopilot_bottom_bg.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_start_autopilot_bottom_bg.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_check.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_check.xml index 9d718cd88e..6e10bcca73 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_check.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_check.xml @@ -46,7 +46,7 @@ android:textSize="@dimen/dp_55" app:layout_constraintBottom_toTopOf="@+id/tv_passenger_start" app:layout_constraintStart_toStartOf="@+id/iv_passenger_start_boll" - android:text="乘客数：2位" /> + tools:text="乘客数：2位" /> + tools:text="起 点 : 衡山科学城" /> + tools:text="终 点 : 石鼓收费站" /> - @drawable/check2startautopilt_000 - @drawable/check2startautopilt_001 - @drawable/check2startautopilt_002 - @drawable/check2startautopilt_003 - @drawable/check2startautopilt_004 - @drawable/check2startautopilt_005 - @drawable/check2startautopilt_006 - @drawable/check2startautopilt_007 - @drawable/check2startautopilt_008 - @drawable/check2startautopilt_009 + @drawable/arrive_dest_000 + @drawable/arrive_dest_001 + @drawable/arrive_dest_002 + @drawable/arrive_dest_003 + @drawable/arrive_dest_004 + @drawable/arrive_dest_005 + @drawable/arrive_dest_006 + @drawable/arrive_dest_007 + @drawable/arrive_dest_008 + @drawable/arrive_dest_009 - @drawable/check2startautopilt_010 - @drawable/check2startautopilt_011 - @drawable/check2startautopilt_012 - @drawable/check2startautopilt_013 - @drawable/check2startautopilt_014 - @drawable/check2startautopilt_015 - @drawable/check2startautopilt_016 - @drawable/check2startautopilt_017 - @drawable/check2startautopilt_018 + @drawable/arrive_dest_011 + @drawable/arrive_dest_011 + @drawable/arrive_dest_012 + @drawable/arrive_dest_013 + @drawable/arrive_dest_014 + @drawable/arrive_dest_015 + @drawable/arrive_dest_016 + @drawable/arrive_dest_017 + @drawable/arrive_dest_018 + @drawable/arrive_dest_019 + + @drawable/arrive_dest_020 + @drawable/arrive_dest_021 + @drawable/arrive_dest_022 + @drawable/arrive_dest_023 + @drawable/arrive_dest_024 + @drawable/arrive_dest_025 + @drawable/arrive_dest_026 + @drawable/arrive_dest_027 + @drawable/arrive_dest_028 + @drawable/arrive_dest_029 + + + @drawable/arrive_dest_030 diff --git a/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml b/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml index 94e732c3f5..93414df929 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml @@ -54,6 +54,7 @@ #333333 #995D6A8C #B37E90BF + #876E788B diff --git a/gradle/bytex/bytex.gradle b/gradle/bytex/bytex.gradle index daa366db18..8431f55a1c 100644 --- a/gradle/bytex/bytex.gradle +++ b/gradle/bytex/bytex.gradle @@ -13,10 +13,10 @@ if (!isAndroidTest) { apply from: rootProject.file('gradle/bytex/bytex_log_chain.gradle') apply from: rootProject.file('gradle/bytex/bytex_sticky_service.gradle') apply from: rootProject.file('gradle/bytex/bytex_thread_opt.gradle') - apply from: rootProject.file('gradle/bytex/bytex_lancetx.gradle') +// apply from: rootProject.file('gradle/bytex/bytex_lancetx.gradle') apply from: rootProject.file('gradle/bytex/bytex_apm.gradle') apply from: rootProject.file('gradle/bytex/bytex_systrace.gradle') - apply from: rootProject.file('gradle/bytex/bytex_matrix.gradle') +// apply from: rootProject.file('gradle/bytex/bytex_matrix.gradle') apply from: rootProject.file('gradle/bytex/bytex_handler_proxy.gradle') // apply from: rootProject.file('gradle/bytex/bytex_btrace.gradle') }