From 8219a95d08741d0280630460c468423e089646b0 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 22 May 2023 18:56:50 +0800 Subject: [PATCH] =?UTF-8?q?[charter]=20[3.2.0]=20[=E5=BC=B1=E7=BD=91?= =?UTF-8?q?=E3=80=81=E7=BD=91=E7=BB=9C=E5=8A=A0=E8=BD=BD=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusPassengerFunctionOrderPresenter.kt | 38 ++++++++-- .../fragment/M1OrderLineFragment.kt | 66 ++++++++++++----- .../res/drawable-nodpi/m1_order_net_fail.png | Bin 0 -> 44567 bytes .../src/main/res/layout/m1_order_fragment.xml | 67 ++++++++++-------- .../src/main/res/layout/m1_order_loading.xml | 38 ++++++++++ .../src/main/res/layout/m1_order_net_fail.xml | 51 +++++++++++++ .../src/main/res/values/strings.xml | 1 + 7 files changed, 209 insertions(+), 52 deletions(-) create mode 100644 OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_net_fail.png create mode 100644 OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_loading.xml create mode 100644 OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_net_fail.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt index 47ad1581fc..43d50a7518 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt @@ -67,8 +67,13 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) : CharterPassengerModel.setStatusChangeListener(TAG,this) CallerTelematicListenerManager.addListener(TAG, msgReceived) + extracted() + } + + private fun extracted() { val currentOrderStatus = CharterPassengerModel.getCurrentOrderStatus() - if(currentOrderStatus==OrderStatusEnum.OrderNoLine||currentOrderStatus==OrderStatusEnum.OrdersWithLine) { + onStatusChange(currentOrderStatus) + if (currentOrderStatus == OrderStatusEnum.OrderNoLine || currentOrderStatus == OrderStatusEnum.OrdersWithLine) { val hasSetLineAndSite = CharterPassengerModel.hasSetLineAndSite() if (hasSetLineAndSite != null) {// 已经设置了线路和站点 checkLine = hasSetLineAndSite.first @@ -141,27 +146,41 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) : override fun onFail(code: Int, msg: String?) { ToastUtils.showShort("查询站点失败") + mView?.setVisableByTrun(showNetError = true) + } + + override fun onError() { + super.onError() + ToastUtils.showShort("查询站点失败") + mView?.setVisableByTrun(showNetError = true) } }) } private fun queryLineList() { + mView?.setVisableByTrun(showLoading = true) BusPassengerServiceManager.queryLineList(context, object : OchCommonServiceCallback { override fun onSuccess(data: LineInfoListResponse?) { if (data?.data == null) return + mView?.setVisableByTrun(showBiz = true) mView?.lineAdapterSetData(data.data,checkLine) } override fun onFail(code: Int, msg: String) { ToastUtils.showShort("查询线路失败") + mView?.setVisableByTrun(showNetError = true) + } + + override fun onError() { + super.onError() + mView?.setVisableByTrun(showNetError = true) } }) } override fun onResume(owner: LifecycleOwner) { super.onResume(owner) - mView?.setViewByOrderStatus(CharterPassengerModel.getCurrentOrderStatus()) } override fun onDestroy(owner: LifecycleOwner) { @@ -273,15 +292,24 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) : } override fun onStatusChange(currentStatus: OrderStatusEnum) { - mView?.setViewByOrderStatus(currentStatus) + when (currentStatus) { + OrderStatusEnum.OrderNoLine -> { + mView?.setVisableByTrun(showBiz = true) + extracted() + } + OrderStatusEnum.OrdersWithLine ->{ + mView?.setVisableByTrun(showBiz = true) + } + else ->{ + mView?.setVisableByTrun(showNorOrder = true) + } + } } fun canSwitchLine():Boolean { val gnssSpeed = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().gnssSpeed if (gnssSpeed < 0.5) { - // TODO: 自驾中 需要 靠边停车中、到站 - // TODO: 没有自驾中 需要 靠边停车中、到站 when (CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state) { IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶 return true diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt index 140eb2ef76..3a2f6b65f9 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt @@ -1,8 +1,10 @@ package com.mogo.och.bus.passenger.ui.dialogfragment.fragment +import android.animation.ObjectAnimator import android.graphics.drawable.AnimationDrawable import android.os.Bundle import android.view.View +import android.view.animation.LinearInterpolator import androidx.recyclerview.widget.LinearLayoutManager import com.elegant.utils.UiThreadHandler import com.mogo.commons.mvp.MvpFragment @@ -23,6 +25,7 @@ import com.mogo.och.bus.passenger.view.BottomDecoration import com.mogo.och.common.module.utils.RxUtils import io.reactivex.disposables.Disposable import kotlinx.android.synthetic.main.m1_order_fragment.* +import kotlinx.android.synthetic.main.m1_order_loading.iv_loading_wait_ent import me.jessyan.autosize.utils.AutoSizeUtils /** @@ -44,6 +47,14 @@ class M1OrderLineFragment : private var subscribeDirverAgree: Disposable? = null private var subscribeDirverRefuse: Disposable? = null + private val loadingAni = + ObjectAnimator.ofFloat(iv_loading_wait_ent, "rotation", 0f, 90f, 180f, 270f, 360f) + .apply { + repeatCount = -1 + interpolator = LinearInterpolator() + duration = 1000 + } + override fun getLayoutId(): Int { return R.layout.m1_order_fragment @@ -57,6 +68,7 @@ class M1OrderLineFragment : CallerLogger.d(SceneConstant.M_BUS_P + TAG, "initViews") lineAdapter = OrderLineItemAdapter(requireContext(), lineList) siteAdapter = OrderSiteItemAdapter(requireContext(), siteList) + loadingAni.target = iv_loading_wait_ent rlv_line_list.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) rlv_line_list.addItemDecoration( @@ -163,23 +175,41 @@ class M1OrderLineFragment : } } - - fun setViewByOrderStatus(currentStatus: OrderStatusEnum) { - when (currentStatus) { - OrderStatusEnum.NoOrderUnuse -> { - // 无订单页面 - m1_order_noorder.visibility = View.VISIBLE - lsv_line_site.visibility = View.GONE - } - OrderStatusEnum.OrderNoLine -> { - // 选择线路页面 - m1_order_noorder.visibility = View.GONE - lsv_line_site.visibility = View.VISIBLE - } - OrderStatusEnum.OrdersWithLine -> { - // 选择线路页面 - m1_order_noorder.visibility = View.GONE - lsv_line_site.visibility = View.VISIBLE + fun setVisableByTrun( + showBiz: Boolean = false, + showNetError: Boolean = false, + showNorOrder: Boolean = false, + showLoading: Boolean = false + ) { + if(showBiz){ + // 选择线路页面 + m1_order_noorder.visibility = View.GONE + m1_order_neterror.visibility = View.GONE + lsv_line_site.visibility = View.VISIBLE + m1_order_loading.visibility = View.GONE + return + } + if(showNetError){ + m1_order_noorder.visibility = View.GONE + m1_order_neterror.visibility = View.VISIBLE + lsv_line_site.visibility = View.GONE + m1_order_loading.visibility = View.GONE + return + } + if(showNorOrder){ + m1_order_noorder.visibility = View.VISIBLE + m1_order_neterror.visibility = View.GONE + lsv_line_site.visibility = View.GONE + m1_order_loading.visibility = View.GONE + return + } + if(showLoading){ + m1_order_noorder.visibility = View.GONE + m1_order_neterror.visibility = View.GONE + lsv_line_site.visibility = View.GONE + m1_order_loading.visibility = View.VISIBLE + if (!loadingAni.isRunning) { + loadingAni.start() } } } @@ -196,7 +226,7 @@ class M1OrderLineFragment : override fun onDestroyView() { super.onDestroyView() - //loadingAni.cancel() + loadingAni.cancel() CallerLogger.d(SceneConstant.M_BUS_P + TAG, "onDestroyView") RxUtils.disposeSubscribe(subscribeDirverAgree) RxUtils.disposeSubscribe(subscribeDirverRefuse) diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_net_fail.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_net_fail.png new file mode 100644 index 0000000000000000000000000000000000000000..05b348e149a20c873acbd1a90f6845a6615a8281 GIT binary patch literal 44567 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

gx7!;pe;PbeVktfRot@AOWJ_+Fc&7sUdlnTbeC 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 literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml index 1e4824f86c..932725b461 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml @@ -56,14 +56,13 @@ android:id="@+id/rv_site_list" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="@dimen/dp_26" - /> - + android:layout_marginTop="@dimen/dp_26" /> + + android:layout_height="@dimen/dp_90" + android:background="@drawable/charter_p_selct_site_bottom_corner" + app:layout_constraintBottom_toBottomOf="parent" /> @@ -167,34 +166,34 @@ + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="@+id/aciv_driver_agree_image" + app:layout_constraintStart_toStartOf="@+id/aciv_driver_agree_image" + app:layout_constraintTop_toBottomOf="@+id/aciv_driver_agree_image" /> + app:layout_constraintEnd_toEndOf="@+id/aciv_driver_agree_image" + app:layout_constraintStart_toStartOf="@+id/aciv_driver_agree_image" + app:layout_constraintTop_toBottomOf="@+id/aciv_driver_agree_title_top" /> + android:layout_height="wrap_content" + android:visibility="gone" + app:constraint_referenced_ids="aciv_driver_agree_image,aciv_driver_agree_title_top,aciv_driver_agree_title_bottom" /> @@ -211,24 +210,24 @@ + app:layout_constraintEnd_toEndOf="@+id/aciv_driver_refuse_image" + app:layout_constraintStart_toStartOf="@+id/aciv_driver_refuse_image" + app:layout_constraintTop_toBottomOf="@+id/aciv_driver_refuse_image" /> + android:layout_height="wrap_content" + android:visibility="gone" + app:constraint_referenced_ids="aciv_driver_refuse_image,aciv_driver_refuse_title" /> @@ -239,6 +238,16 @@ layout="@layout/m1_order_noorder" android:visibility="gone" /> + + + + diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_loading.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_loading.xml new file mode 100644 index 0000000000..a2c08d102a --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_loading.xml @@ -0,0 +1,38 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_net_fail.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_net_fail.xml new file mode 100644 index 0000000000..4724f5aa1d --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_net_fail.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml b/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml index 1cde6d41fd..f7264de06a 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml @@ -49,6 +49,7 @@ 先关闭车门再启动吧~ 自驾系统繁忙,稍后再试试吧~ %1$s就要到啦! + 稍后再来看看吧