diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt index 085f43c093..ed0b3c9475 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt @@ -72,34 +72,41 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : mView?.showOrHideArrivedEndLayout(isShow = false) mView?.showOrHidePressengerCheckPager(true, order.startSiteAddr, order.endSiteAddr, order.passengerNum, order.carNumber, order.passengerPhone) + mView?.showOrHideStartAutopilotView(isShow = false) } TaxiPassengerOrderStatusEnum.UserArriveAtStart -> { - mView?.showOrHideStartAutopilotView(isShow = true) + // 30 乘客到达上车点 mView?.showOrHideArrivedEndLayout(isShow = false) mView?.showOrHidePressengerCheckPager(isShow = false) + mView?.showOrHideStartAutopilotView(isShow = true) } TaxiPassengerOrderStatusEnum.OnTheWayToEnd -> { - mView?.showOrHideStartAutopilotView(isShow = false) + // 服务中（去往目的地） mView?.showOrHideArrivedEndLayout(isShow = false) mView?.showOrHidePressengerCheckPager(isShow = false) + mView?.showOrHideStartAutopilotView(isShow = false) } TaxiPassengerOrderStatusEnum.ArriveAtEnd -> { // 50 到达终点 乘客可以评价 mView?.showOrHideArrivedEndLayout(true) - mView?.showOrHideOverMapViewFragment(false) + mView?.showOrHidePressengerCheckPager(isShow = false) + mView?.showOrHideStartAutopilotView(isShow = false) + } + TaxiPassengerOrderStatusEnum.JourneyCompleted -> { + // 60 行程完成 + mView?.showOrHideStartAutopilotView(isShow = false) + mView?.showOrHidePressengerCheckPager(isShow = false) + mView?.showOrHideArrivedEndLayout(false) } - TaxiPassengerOrderStatusEnum.Cancel -> { // 70 取消订单 - mView?.showOrHideOverMapViewFragment(false) mView?.showOrHideStartAutopilotView(isShow = false) mView?.showOrHidePressengerCheckPager(isShow = false) mView?.showOrHideArrivedEndLayout(isShow = false) } - else -> {} } } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index 367cb50b4a..4fc77d7681 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -1,7 +1,9 @@ package com.mogo.och.taxi.passenger.ui +import android.graphics.drawable.AnimationDrawable import android.os.Bundle import android.view.View +import androidx.core.content.ContextCompat import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager @@ -11,12 +13,14 @@ import com.mogo.eagle.core.utilcode.util.OverlayViewUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.map.listener.IMogoMapListener import com.mogo.map.uicontroller.VisualAngleMode +import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.callback.ITaxiPassengerCommonValueCallback import com.mogo.och.taxi.passenger.presenter.BaseTaxiPassengerPresenter import com.mogo.och.taxi.passenger.ui.bottom.BottomBar import com.mogo.och.taxi.passenger.ui.arrived.ArrivedView import com.mogo.och.taxi.passenger.ui.startautopilot.StartAutopilotView +import kotlinx.android.synthetic.main.taxi_p_base_fragment.aciv_xiaozhi_normal import kotlinx.android.synthetic.main.taxi_p_base_fragment.bottom import kotlinx.android.synthetic.main.taxi_p_base_fragment.ck_setting import kotlinx.android.synthetic.main.taxi_p_base_fragment.itinerary @@ -125,7 +129,8 @@ class TaxiPassengerBaseFragment() : // 切换缩放到中视角 controller.changeZoom2(0.8f) } - + showOrHideArrivedEndLayout(true) +// showOrHideStartAutopilotView(true) } BottomBar.SelectView.OVERMAPVIEW -> { overMapView.displayCustomOverView() @@ -135,6 +140,10 @@ class TaxiPassengerBaseFragment() : } } + + aciv_xiaozhi_normal.setImageResource(R.drawable.taxi_p_xioazhi_normal) + val anim = aciv_xiaozhi_normal.drawable as AnimationDrawable + anim.start() } private fun initCheckView() { @@ -211,19 +220,6 @@ class TaxiPassengerBaseFragment() : } } - /** - * 显示或隐藏全局概览 - * - * @param isShow - */ - fun showOrHideOverMapViewFragment(isShow: Boolean) { - if (isShow) { - overMapView.visibility = View.VISIBLE - } else { - overMapView.visibility = View.GONE - } - } - /** * 显示或者隐藏乘客可点击自动驾驶页面 * 乘客验证成功，页面显示，按钮置于不可点击 @@ -265,11 +261,9 @@ class TaxiPassengerBaseFragment() : } mArrivedEndView?.get()?.let { OverlayViewUtils.showOverlayView(activity, it, R.style.och_window_anim_alpha) - UiThreadHandler.postDelayed({ - it.setDataAndStartAnimation() - }, //如果在全屏 回收需要300毫秒 后期优化使用单独的播放器 - 500 - ) + RxUtils.createSubscribe(500) { + it.setDataAndStartAnimation() + } } } else { mArrivedEndView?.get()?.let { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index 4487d21ce6..ec1b21f7b7 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -8,18 +8,16 @@ import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.OverlayViewUtils +import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.callback.ITaxiPassengerCommonCallback import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack -import io.reactivex.Observable -import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.aciv_close import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.actv_endstation import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.svp_frame -import java.util.concurrent.TimeUnit /** @@ -94,25 +92,9 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { } }) svp_frame.startPlayLogic() - } - - /** - * 评论成功 向左移动并消失 消失后感谢页面透明度0-1 然后开始小手的动画 - */ - fun scoreSuccess(){ - // 10s 后逻辑 - subscribe = Observable.timer(10000, TimeUnit.MILLISECONDS) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe { - // 正在展示感谢页面 - if (taxiPassengerCommonCallback == null) { - // 没有用户确定页面 - OverlayViewUtils.dismissOverlayView(this@ArrivedView) - } else { - // 有排队展示的用户确定页面 - taxiPassengerCommonCallback?.onCommonCallback() - } - } + RxUtils.createSubscribe(60_000) { + OverlayViewUtils.dismissOverlayView(this@ArrivedView) + } } companion object { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearGlideView.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearGlideView.java new file mode 100644 index 0000000000..d596eaa8c9 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearGlideView.java @@ -0,0 +1,107 @@ +package com.mogo.och.taxi.passenger.ui.arrived; + + +import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.drawable.Drawable; +import android.util.AttributeSet; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatImageView; + +import com.bumptech.glide.Priority; +import com.bumptech.glide.load.engine.DiskCacheStrategy; +import com.bumptech.glide.request.RequestOptions; +import com.bumptech.glide.request.target.CustomTarget; +import com.bumptech.glide.request.transition.Transition; +import com.mogo.eagle.core.function.api.autopilot.IMoGoBackCameraVideoListener; +import com.mogo.eagle.core.function.api.autopilot.IMoGoRoboBusJinlvM1StitchedVideoListener; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager; +import com.mogo.eagle.core.function.call.autopilot.CallerBackCameraVideoListenerManager; +import com.mogo.eagle.core.function.call.autopilot.CallerRoboBusJinlvM1StitchedVideoListenerManager; +import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp; +import com.mogo.eagle.core.utilcode.util.ThreadUtils; +import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider; + +/** + * 图片帧展示View + */ +public class RightRearGlideView extends AppCompatImageView implements IMoGoBackCameraVideoListener, IMoGoRoboBusJinlvM1StitchedVideoListener { + private static final String TAG = RightRearGlideView.class.getSimpleName(); + private final RequestOptions requestOptions = new RequestOptions() + .priority(Priority.HIGH) + .skipMemoryCache(true) + .diskCacheStrategy(DiskCacheStrategy.NONE) + .dontAnimate(); + + public RightRearGlideView(@NonNull Context context) { + super(context); + } + + public RightRearGlideView(@NonNull Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + } + + public RightRearGlideView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + CallerAutoPilotControlManager.INSTANCE.setIsSubscribeBackCameraVideoVideo(1, true); + CallerBackCameraVideoListenerManager.INSTANCE.addListener(TAG, this); + CallerRoboBusJinlvM1StitchedVideoListenerManager.INSTANCE.addListener(TAG, this); + } + + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + CallerAutoPilotControlManager.INSTANCE.setIsSubscribeBackCameraVideoVideo(1, false); + CallerBackCameraVideoListenerManager.INSTANCE.removeListener(this); + CallerRoboBusJinlvM1StitchedVideoListenerManager.INSTANCE.removeListener(this); + } + + private final CustomTarget target = new CustomTarget() { + @Override + public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) { + //回调内容 + if (!resource.isRecycled()) { + RightRearGlideView.this.setImageBitmap(resource); + } + } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + //这个方法在target被回收时调用，如果在除了imageView以外的地方引用了imageView中的bitmap，在这里清除引用以避免崩溃 + } + }; + + private void draw(@NonNull byte[] data) { + ThreadUtils.runOnUiThread(() -> GlideApp.with(RightRearGlideView.this) + .asBitmap() + .load(data) + .placeholder(RightRearGlideView.this.getDrawable()) + .apply(requestOptions) + .into(target)); + } + + @Override + public void onBackCameraVideo(@NonNull byte[] data) { + draw(data); + } + + @Override + protected void onSizeChanged(int w, int h, int oldw, int oldh) { + super.onSizeChanged(w, h, oldw, oldh); + setOutlineProvider(new TextureVideoViewOutlineProvider(36F)); + setClipToOutline(true); + } + + @Override + public void onRoboBusJinlvM1StitchedVideo(@NonNull byte[] data) { + draw(data); + } + +} diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_start_panel_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_start_panel_bg.png index 7121f26751..784a482dcf 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_start_panel_bg.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_start_panel_bg.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xioazhi_normal.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xioazhi_normal.xml new file mode 100644 index 0000000000..9d33730891 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xioazhi_normal.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_001.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_001.png new file mode 100644 index 0000000000..cb7db36c2c Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_001.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_002.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_002.png new file mode 100644 index 0000000000..a36b1da62b Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_002.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_003.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_003.png new file mode 100644 index 0000000000..87b553eb8c Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_003.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_004.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_004.png new file mode 100644 index 0000000000..f2d0e78377 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_004.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_005.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_005.png new file mode 100644 index 0000000000..6aa005a055 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_005.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_006.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_006.png new file mode 100644 index 0000000000..4b1e9a9de5 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_006.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_007.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_007.png new file mode 100644 index 0000000000..bf68dac47a Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_007.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_008.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_008.png new file mode 100644 index 0000000000..fd712a4095 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_008.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_009.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_009.png new file mode 100644 index 0000000000..05b17f3cd3 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_009.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_010.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_010.png new file mode 100644 index 0000000000..025b42e2ab Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_010.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_011.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_011.png new file mode 100644 index 0000000000..8969af2617 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_011.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_012.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_012.png new file mode 100644 index 0000000000..e7471586b0 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_012.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_013.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_013.png new file mode 100644 index 0000000000..dd6fcc7786 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_013.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_014.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_014.png new file mode 100644 index 0000000000..08536db05a Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_014.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_015.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_015.png new file mode 100644 index 0000000000..2d4231035b Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_015.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_016.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_016.png new file mode 100644 index 0000000000..7f48db0506 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_016.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_017.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_017.png new file mode 100644 index 0000000000..954ed2def0 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_017.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_018.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_018.png new file mode 100644 index 0000000000..eda4e15a9d Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_018.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_019.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_019.png new file mode 100644 index 0000000000..1b0a34c76d Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_019.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_020.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_020.png new file mode 100644 index 0000000000..681bd1645f Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_020.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_021.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_021.png new file mode 100644 index 0000000000..f3ef6b2dc4 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_021.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_022.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_022.png new file mode 100644 index 0000000000..43295566fd Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_022.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_023.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_023.png new file mode 100644 index 0000000000..bfb89ede83 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_023.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_024.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_024.png new file mode 100644 index 0000000000..8cc2c71b46 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_024.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_025.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_025.png new file mode 100644 index 0000000000..deb5204f2e Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_025.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_026.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_026.png new file mode 100644 index 0000000000..a85cb6b3d9 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_026.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_027.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_027.png new file mode 100644 index 0000000000..bb8fddcd13 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_027.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_028.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_028.png new file mode 100644 index 0000000000..2fc95f1c41 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_028.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_029.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_029.png new file mode 100644 index 0000000000..f83ca099a1 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_029.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_030.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_030.png new file mode 100644 index 0000000000..27b215d5b9 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_030.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_031.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_031.png new file mode 100644 index 0000000000..7693a6d1f1 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_031.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_032.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_032.png new file mode 100644 index 0000000000..ff2ed7db69 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_032.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_033.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_033.png new file mode 100644 index 0000000000..1fc080a11e Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_033.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_034.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_034.png new file mode 100644 index 0000000000..518acd262d Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_034.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_035.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_035.png new file mode 100644 index 0000000000..4331a45174 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_035.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_036.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_036.png new file mode 100644 index 0000000000..5c588a63bb Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_036.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_037.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_037.png new file mode 100644 index 0000000000..b201614624 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_037.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_038.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_038.png new file mode 100644 index 0000000000..d1786ec29e Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_038.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_039.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_039.png new file mode 100644 index 0000000000..7fe6b0b652 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_039.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_040.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_040.png new file mode 100644 index 0000000000..6fc6ff93ec Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_040.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_041.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_041.png new file mode 100644 index 0000000000..1036f21e96 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_041.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_042.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_042.png new file mode 100644 index 0000000000..b5120ea601 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_042.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_043.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_043.png new file mode 100644 index 0000000000..1895b6d113 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_043.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_044.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_044.png new file mode 100644 index 0000000000..9074c1a86c Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_044.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_045.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_045.png new file mode 100644 index 0000000000..5040da3c8d Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_045.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_046.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_046.png new file mode 100644 index 0000000000..c84424d4ea Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_046.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_047.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_047.png new file mode 100644 index 0000000000..46bd5d50bf Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_047.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_048.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_048.png new file mode 100644 index 0000000000..d0150d4136 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_048.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_049.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_049.png new file mode 100644 index 0000000000..05ee2a8f21 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_049.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_050.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_050.png new file mode 100644 index 0000000000..43ef587987 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_050.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_051.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_051.png new file mode 100644 index 0000000000..edee75dd1f Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_051.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_052.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_052.png new file mode 100644 index 0000000000..86fe1610ad Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_052.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_053.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_053.png new file mode 100644 index 0000000000..427333dbd1 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_053.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_054.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_054.png new file mode 100644 index 0000000000..ef05391406 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_054.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_055.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_055.png new file mode 100644 index 0000000000..fe5a759b61 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_055.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_056.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_056.png new file mode 100644 index 0000000000..a9e5aab6ec Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_056.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_057.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_057.png new file mode 100644 index 0000000000..64aa4c945e Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_057.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_058.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_058.png new file mode 100644 index 0000000000..ad3747d97a Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_058.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_059.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_059.png new file mode 100644 index 0000000000..ee07110d07 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_059.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_060.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_060.png new file mode 100644 index 0000000000..e24b93d5ec Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_060.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_061.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_061.png new file mode 100644 index 0000000000..b65e9e9646 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_061.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_062.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_062.png new file mode 100644 index 0000000000..8fbf30603a Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_062.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_063.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_063.png new file mode 100644 index 0000000000..5148d07e06 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_063.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_064.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_064.png new file mode 100644 index 0000000000..a20393e74d Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_064.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_065.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_065.png new file mode 100644 index 0000000000..967f5ec3f0 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal_065.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml index 639c9f7253..3fab5b9ecb 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml @@ -25,6 +25,7 @@ android:layout_height="@dimen/dp_120"/> - @@ -63,7 +64,7 @@ app:layout_constraintBottom_toBottomOf="@+id/v_video_right_rear" android:layout_marginStart="@dimen/dp_44" android:layout_marginBottom="@dimen/dp_11" - android:text="前向摄像头" + android:text="后向摄像头" android:textSize="@dimen/dp_40" android:textColor="@color/taxi_p_76D7FF" android:layout_width="wrap_content" diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml index e52f3adfcd..8c996a51c3 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -100,4 +100,14 @@ android:layout_width="match_parent" android:layout_height="@dimen/dp_160"/> + + \ No newline at end of file