From a5e5a2de8d09ee3838172cfd9179df072d43e468 Mon Sep 17 00:00:00 2001 From: pangfan Date: Sat, 2 Apr 2022 18:00:56 +0800 Subject: [PATCH] [Bus/Taxi d 2.6.5]Taxi code opt --- ...ayManager.java => TaxiOverlayManager.java} | 4 +- .../{MogoOCHTaxi.java => TaxiProvider.java} | 14 +- .../och/taxi/bean/CarHeartbeatReqBean.java | 4 +- .../taxi/callback/{Shadow.kt => IShadow.kt} | 22 +- ...back.java => ITaxiADASStatusCallback.java} | 2 +- ...va => ITaxiAutopilotPlanningCallback.java} | 2 +- ...lback.java => ITaxiCarStatusCallback.java} | 2 +- ...ava => ITaxiControllerStatusCallback.java} | 2 +- ...ack.java => ITaxiNaviChangedCallback.java} | 2 +- ...ack.java => ITaxiOrderStatusCallback.java} | 2 +- .../{OCHTaxiConst.kt => TaxiConst.kt} | 2 +- ...riverRoleEnum.kt => TaxiDriverRoleEnum.kt} | 2 +- ...elReasons.kt => TaxiOrderCancelReasons.kt} | 2 +- ...erStatusEnum.kt => TaxiOrderStatusEnum.kt} | 4 +- ...{OrderTypeEnum.kt => TaxiOrderTypeEnum.kt} | 2 +- .../taxi/model/NaviToDestinationModel.java | 6 +- ...ogoOCHTaxiModelNew.java => TaxiModel.java} | 216 +++++++++--------- ...Manager.java => TaxiModelLoopManager.java} | 40 ++-- ...viceApiNew.java => TaxiServiceApiNew.java} | 2 +- ...Callback.java => TaxiServiceCallback.java} | 2 +- ...anagerNew.java => TaxiServiceManager.java} | 56 ++--- ...HTaxiPresenter.java => TaxiPresenter.java} | 84 +++---- ...Fragment.java => BaseTaxiTabFragment.java} | 6 +- .../mogo/och/taxi/ui/BorderShadowLayout.java | 28 +-- .../ui/{OCHTaxiView.java => ITaxiView.java} | 2 +- ...va => TaxiBeingServerdOrdersFragment.java} | 92 ++++---- ...OCHTaxiFragment.java => TaxiFragment.java} | 58 ++--- ...agment.java => TaxiGrabOrderFragment.java} | 24 +- ...aviFragment.java => TaxiNaviFragment.java} | 10 +- ...t.java => TaxiOperationDatasFragment.java} | 12 +- ...Dialog.java => TaxiOrderCancelDialog.java} | 48 ++-- ...t.java => TaxiPersonalDialogFragment.java} | 36 +-- ...mageView.java => TaxiRadiusImageView.java} | 8 +- ...nt.java => TaxiReserveOrdersFragment.java} | 20 +- ...ent.java => TaxiServerOrdersFragment.java} | 16 +- ...lyticsUtil.java => TaxiAnalyticsUtil.java} | 28 +-- ...chTaxiUtils.java => TaxiDateTimeUtil.java} | 6 +- .../main/res/layout/taxi_order_grab_view.xml | 2 +- 38 files changed, 435 insertions(+), 435 deletions(-) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/{OCHTaxiOverlayManager.java => TaxiOverlayManager.java} (96%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/{MogoOCHTaxi.java => TaxiProvider.java} (89%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/{Shadow.kt => IShadow.kt} (66%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/{IOCHTaxiADASStatusCallback.java => ITaxiADASStatusCallback.java} (90%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/{IOCHTaxiAutopilotPlanningCallback.java => ITaxiAutopilotPlanningCallback.java} (79%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/{IOCHTaxiCarStatusCallback.java => ITaxiCarStatusCallback.java} (85%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/{IOCHTaxiControllerStatusCallback.java => ITaxiControllerStatusCallback.java} (87%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/{IOCHTaxiNaviChangedCallback.java => ITaxiNaviChangedCallback.java} (86%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/{IOCHTaxiOrderStatusCallback.java => ITaxiOrderStatusCallback.java} (97%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/{OCHTaxiConst.kt => TaxiConst.kt} (99%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/{DriverRoleEnum.kt => TaxiDriverRoleEnum.kt} (75%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/{OrderCancelReasons.kt => TaxiOrderCancelReasons.kt} (94%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/{OrderStatusEnum.kt => TaxiOrderStatusEnum.kt} (90%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/{OrderTypeEnum.kt => TaxiOrderTypeEnum.kt} (77%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/{MogoOCHTaxiModelNew.java => TaxiModel.java} (85%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/{OCHTaxiModelLoopManager.java => TaxiModelLoopManager.java} (74%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/{OCHTaxiServiceApiNew.java => TaxiServiceApiNew.java} (99%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/{OCHTaxiServiceCallback.java => TaxiServiceCallback.java} (83%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/{OCHTaxiServiceManagerNew.java => TaxiServiceManager.java} (87%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/{OCHTaxiPresenter.java => TaxiPresenter.java} (66%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/{BaseOchTaxiTabFragment.java => BaseTaxiTabFragment.java} (98%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/{OCHTaxiView.java => ITaxiView.java} (78%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/{OCHTaxiBeingServerdOrdersFragment.java => TaxiBeingServerdOrdersFragment.java} (84%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/{OCHTaxiFragment.java => TaxiFragment.java} (91%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/{OCHTaxiGrabOrderFragment.java => TaxiGrabOrderFragment.java} (88%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/{OCHNaviFragment.java => TaxiNaviFragment.java} (96%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/{OCHTaxiOperationDatasFragment.java => TaxiOperationDatasFragment.java} (88%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/{OCHTaxiOrderCancelDialog.java => TaxiOrderCancelDialog.java} (72%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/{OCHTaxiPersonalDialogFragment.java => TaxiPersonalDialogFragment.java} (93%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/{OCHTaxiRadiuImageView.java => TaxiRadiusImageView.java} (92%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/{OCHTaxiReserveOrdersFragment.java => TaxiReserveOrdersFragment.java} (89%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/{OCHTaxiServerOrdersFragment.java => TaxiServerOrdersFragment.java} (91%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/{OchTaxiAnalyticsUtil.java => TaxiAnalyticsUtil.java} (63%) rename OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/{OchTaxiUtils.java => TaxiDateTimeUtil.java} (94%) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiOverlayManager.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiOverlayManager.java similarity index 96% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiOverlayManager.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiOverlayManager.java index 102212c192..096e6c7c04 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiOverlayManager.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiOverlayManager.java @@ -14,7 +14,7 @@ import com.mogo.module.common.MogoApisHandler; import java.util.ArrayList; import java.util.List; -public class OCHTaxiOverlayManager { +public class TaxiOverlayManager { private IMogoPolyline mMoGoPolyline; @@ -26,7 +26,7 @@ public class OCHTaxiOverlayManager { private List mPolylineColors; private Context mContext; IMogoOverlayManager mogoOverlayManager; - public OCHTaxiOverlayManager(Context context) { + public TaxiOverlayManager(Context context) { mPolylineOptions = new MogoPolylineOptions(); // 绘制路径集合 mPolylinePointList = new ArrayList<>(); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxi.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java similarity index 89% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxi.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java index 52359ab13e..c926c94b65 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxi.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java @@ -12,8 +12,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.MogoMapUIController; import com.mogo.module.common.MogoApisHandler; -import com.mogo.och.taxi.constant.OCHTaxiConst; -import com.mogo.och.taxi.ui.OCHTaxiFragment; +import com.mogo.och.taxi.constant.TaxiConst; +import com.mogo.och.taxi.ui.TaxiFragment; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; @@ -27,11 +27,11 @@ public *

* 网约车-出租车 */ -@Route( path = OCHTaxiConst.PATH ) -class MogoOCHTaxi implements IMogoOCH , IMogoStatusChangedListener { +@Route( path = TaxiConst.PATH ) +class TaxiProvider implements IMogoOCH , IMogoStatusChangedListener { - private static final String TAG = "MogoOCHTaxi"; - private OCHTaxiFragment ochTaxiFragment; + private static final String TAG = "TaxiProvider"; + private TaxiFragment ochTaxiFragment; private FragmentActivity mActivity; private int mContainerId; @Override @@ -52,7 +52,7 @@ class MogoOCHTaxi implements IMogoOCH , IMogoStatusChangedListener { private void showFragment() { if (ochTaxiFragment == null) { CallerLogger.INSTANCE.d(M_TAXI + TAG, "准备add fragment======"); - ochTaxiFragment = new OCHTaxiFragment(); + ochTaxiFragment = new TaxiFragment(); mActivity.getSupportFragmentManager().beginTransaction().add(mContainerId, ochTaxiFragment).commitAllowingStateLoss(); return; } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/CarHeartbeatReqBean.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/CarHeartbeatReqBean.java index b95cb5c3da..d82de2425e 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/CarHeartbeatReqBean.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/CarHeartbeatReqBean.java @@ -1,6 +1,6 @@ package com.mogo.och.taxi.bean; -import com.mogo.och.taxi.constant.OCHTaxiConst; +import com.mogo.och.taxi.constant.TaxiConst; import java.util.UUID; @@ -21,6 +21,6 @@ public class CarHeartbeatReqBean { this.lon = lon; this.lat = lat; this.msgId = UUID.randomUUID().toString(); - this.interval = (int) (OCHTaxiConst.LOOP_PERIOD_60S / 1000); + this.interval = (int) (TaxiConst.LOOP_PERIOD_60S / 1000); } } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/Shadow.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IShadow.kt similarity index 66% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/Shadow.kt rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IShadow.kt index 59c9d02eba..1bf997c223 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/Shadow.kt +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IShadow.kt @@ -6,36 +6,36 @@ import androidx.annotation.ColorRes * @author: wangmingjun * @date: 2022/1/21 */ -interface Shadow { +interface IShadow { //设置阴影半径 - fun setShadowRadius(radius:Float):Shadow + fun setShadowRadius(radius:Float):IShadow //添加单位设置 - fun setShadowRadius(unit:Int,radius: Float):Shadow + fun setShadowRadius(unit:Int,radius: Float):IShadow //设置应用颜色 - fun setShadowColor(color:Int):Shadow + fun setShadowColor(color:Int):IShadow //设置阴影颜色资源文件id - fun setShadowColorRes(@ColorRes color: Int):Shadow + fun setShadowColorRes(@ColorRes color: Int):IShadow /** * 设置模糊半径 * @param radius */ - fun setBlurRadius(radius:Float):Shadow + fun setBlurRadius(radius:Float):IShadow /** * * @param unit @{@link android.util.TypedValue#TYPE_DIMENSION} * @param radius 模糊半径 */ - fun setBlurRadius(unit:Int,radius:Float):Shadow + fun setBlurRadius(unit:Int,radius:Float):IShadow /** * 设置水平方向的偏移量 * @param offset x轴偏移 */ - fun setXOffset(offset:Float):Shadow + fun setXOffset(offset:Float):IShadow /** @@ -43,20 +43,20 @@ interface Shadow { * @param unit @{@link android.util.TypedValue#TYPE_DIMENSION} * @param offset x轴偏移 */ - fun setXOffset(unit:Int,offset:Float):Shadow + fun setXOffset(unit:Int,offset:Float):IShadow /** * 设置竖直方向的偏移量 * @param offset y轴偏移 */ - fun setYOffset(offset:Float):Shadow + fun setYOffset(offset:Float):IShadow /** * 设置竖直方向的偏移量,带单位 * @param unit @{@link android.util.TypedValue#TYPE_DIMENSION} * @param offset y轴偏移 */ - fun setYOffset(unit:Int,offset:Float):Shadow + fun setYOffset(unit:Int,offset:Float):IShadow /** * 更新绘制 diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiADASStatusCallback.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java similarity index 90% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiADASStatusCallback.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java index 0b8b59420c..278b1ac9dc 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiADASStatusCallback.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java @@ -5,7 +5,7 @@ package com.mogo.och.taxi.callback; * * Model->Presenter回调：ADAS相关（自动驾驶状态回调，到达终点等等） */ -public interface IOCHTaxiADASStatusCallback { +public interface ITaxiADASStatusCallback { // 自动驾驶触发的已到达目的地：暂未用到 void onAutopilotArriveEnd(); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiAutopilotPlanningCallback.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiAutopilotPlanningCallback.java similarity index 79% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiAutopilotPlanningCallback.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiAutopilotPlanningCallback.java index 9d5760ca70..32226d2dd4 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiAutopilotPlanningCallback.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiAutopilotPlanningCallback.java @@ -9,6 +9,6 @@ import mogo.telematics.pad.MessagePad; * @author: wangmingjun * @date: 2021/11/1 */ -public interface IOCHTaxiAutopilotPlanningCallback { +public interface ITaxiAutopilotPlanningCallback { void routeResult(List models); } \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiCarStatusCallback.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiCarStatusCallback.java similarity index 85% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiCarStatusCallback.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiCarStatusCallback.java index 9763d6414d..531a6e1cf6 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiCarStatusCallback.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiCarStatusCallback.java @@ -5,7 +5,7 @@ package com.mogo.och.taxi.callback; * * Model->Presenter回调：出车/收车状态变更 */ -public interface IOCHTaxiCarStatusCallback { +public interface ITaxiCarStatusCallback { void onCarStatusChanged(boolean inOperation,String role); void onServiceDataUpdate(long dailyTimeDuration, long dailyOrderNum); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiControllerStatusCallback.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiControllerStatusCallback.java similarity index 87% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiControllerStatusCallback.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiControllerStatusCallback.java index f4fce22cc1..ad3229062c 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiControllerStatusCallback.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiControllerStatusCallback.java @@ -7,7 +7,7 @@ import android.location.Location; * * Model->Presenter回调：状态控制器监听（accOn、adas ui show、voice ui show、push ui show、v2x ui show等等） */ -public interface IOCHTaxiControllerStatusCallback { +public interface ITaxiControllerStatusCallback { // 是否vr map模式 void onVRModeChanged(boolean isVRMode); // 自车定位 diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiNaviChangedCallback.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiNaviChangedCallback.java similarity index 86% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiNaviChangedCallback.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiNaviChangedCallback.java index cc3117acc7..138de6b9b1 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiNaviChangedCallback.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiNaviChangedCallback.java @@ -4,7 +4,7 @@ package com.mogo.och.taxi.callback; * @author: wangmingjun * @date: 2021/12/3 */ -public interface IOCHTaxiNaviChangedCallback { +public interface ITaxiNaviChangedCallback { // 当前位置距离上车点的距离（米）、预估时间（秒） void onCurrentNaviDistAndTimeChanged(int meters, long timeInSecond); void reInitNaviAmap(boolean isPlay,boolean isRestart); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiOrderStatusCallback.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java similarity index 97% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiOrderStatusCallback.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java index 70ee58527c..b4dd23a2eb 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiOrderStatusCallback.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java @@ -12,7 +12,7 @@ import java.util.List; * * Model->Presenter回调：订单相关（进行中/待服务单变更，当前进行单状态变更，新到预约单，抢单，抢单结果状态等等） */ -public interface IOCHTaxiOrderStatusCallback { +public interface ITaxiOrderStatusCallback { // 进行中单变更：暂未用到 void onOrdersInServiceChanged(@NonNull List inServiceList); // 待服务单变更 diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OCHTaxiConst.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt similarity index 99% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OCHTaxiConst.kt rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt index 9102614a1f..bb1fffec68 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OCHTaxiConst.kt +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt @@ -5,7 +5,7 @@ import com.mogo.commons.debug.DebugConfig /** * Created on 2021/12/6 */ -class OCHTaxiConst { +class TaxiConst { companion object { private const val BASE_URL_OCH_DEV = "http://tech-dev.zhidaohulian.com" diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/DriverRoleEnum.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiDriverRoleEnum.kt similarity index 75% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/DriverRoleEnum.kt rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiDriverRoleEnum.kt index 3f81dba2fc..07572efcd4 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/DriverRoleEnum.kt +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiDriverRoleEnum.kt @@ -4,7 +4,7 @@ package com.mogo.och.taxi.constant * Created on 2021/12/7 * 1 运营, 2 测试, 3演示 */ -enum class DriverRoleEnum(val code: Int) { +enum class TaxiDriverRoleEnum(val code: Int) { OPERATION( 1), TEST( 2), DEMO( 3); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OrderCancelReasons.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderCancelReasons.kt similarity index 94% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OrderCancelReasons.kt rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderCancelReasons.kt index 060e152a83..be9f951a93 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OrderCancelReasons.kt +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderCancelReasons.kt @@ -20,7 +20,7 @@ package com.mogo.och.taxi.constant * 2003 车电量不足 * 2004 其他 */ -enum class OrderCancelReasons(val type: Int, val msg: String) { +enum class TaxiOrderCancelReasons(val type: Int, val msg: String) { CarBroken(1000, "车况异常"), DeviceBroken(1001, "设备异常"), BatteryLow(1002, "电量不足"), diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OrderStatusEnum.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderStatusEnum.kt similarity index 90% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OrderStatusEnum.kt rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderStatusEnum.kt index b84cd602c5..1f703d0f2a 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OrderStatusEnum.kt +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderStatusEnum.kt @@ -23,7 +23,7 @@ package com.mogo.och.taxi.constant * 60 已完成, * 70 已取消 */ -enum class OrderStatusEnum(val code: Int) { +enum class TaxiOrderStatusEnum(val code: Int) { None( 0 ), OnTheWayToStart( 10), ArriveAtStart( 20), @@ -35,7 +35,7 @@ enum class OrderStatusEnum(val code: Int) { companion object { @JvmStatic - fun valueOf(code: Int): OrderStatusEnum? { + fun valueOf(code: Int): TaxiOrderStatusEnum? { for (value in values()) { if (value.code == code) { return value diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OrderTypeEnum.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderTypeEnum.kt similarity index 77% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OrderTypeEnum.kt rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderTypeEnum.kt index 97ffeb20e1..34b09c6cc7 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OrderTypeEnum.kt +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderTypeEnum.kt @@ -5,7 +5,7 @@ package com.mogo.och.taxi.constant * * Created on 2021/12/6 */ -enum class OrderTypeEnum(val type: Int) { +enum class TaxiOrderTypeEnum(val type: Int) { Instant(1), // 即时单 Reserved(2) // 预约单 } \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/NaviToDestinationModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/NaviToDestinationModel.java index d362461175..5de88ce119 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/NaviToDestinationModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/NaviToDestinationModel.java @@ -27,7 +27,7 @@ import com.autonavi.tbt.TrafficFacilityInfo; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.eagle.core.utilcode.util.NetworkUtils; -import com.mogo.och.taxi.callback.IOCHTaxiNaviChangedCallback; +import com.mogo.och.taxi.callback.ITaxiNaviChangedCallback; import com.mogo.och.taxi.utils.PermissionUtil; import java.util.ArrayList; @@ -44,7 +44,7 @@ public class NaviToDestinationModel implements AMapNaviListener { protected final List sList = new ArrayList(); protected final List eList = new ArrayList(); protected List mWayPointList = new ArrayList(); - private IOCHTaxiNaviChangedCallback mNaviChangedCallback; + private ITaxiNaviChangedCallback mNaviChangedCallback; private AtomicInteger errorCount = new AtomicInteger(0); private boolean isPlay; public static NaviToDestinationModel getInstance(Context context) { @@ -92,7 +92,7 @@ public class NaviToDestinationModel implements AMapNaviListener { } } - public void setOCHTaciNaviChangedCallback(IOCHTaxiNaviChangedCallback callback){ + public void setOCHTaciNaviChangedCallback(ITaxiNaviChangedCallback callback){ this.mNaviChangedCallback = callback; } @Override diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java similarity index 85% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index cdcb22cea9..838e6ca2a1 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -42,18 +42,18 @@ import com.mogo.och.taxi.bean.OrdersInServiceQueryRespBean; import com.mogo.och.taxi.bean.OrdersListQueryRespBean; import com.mogo.och.taxi.bean.OrdersNewBookingQueryRespBean; import com.mogo.och.taxi.bean.QueryOrderRouteResp; -import com.mogo.och.taxi.callback.IOCHTaxiADASStatusCallback; -import com.mogo.och.taxi.callback.IOCHTaxiCarStatusCallback; -import com.mogo.och.taxi.callback.IOCHTaxiControllerStatusCallback; -import com.mogo.och.taxi.callback.IOCHTaxiOrderStatusCallback; -import com.mogo.och.taxi.constant.DriverRoleEnum; -import com.mogo.och.taxi.constant.OCHTaxiConst; -import com.mogo.och.taxi.constant.OrderStatusEnum; -import com.mogo.och.taxi.constant.OrderTypeEnum; -import com.mogo.och.taxi.network.OCHTaxiServiceCallback; -import com.mogo.och.taxi.network.OCHTaxiServiceManagerNew; +import com.mogo.och.taxi.callback.ITaxiADASStatusCallback; +import com.mogo.och.taxi.callback.ITaxiCarStatusCallback; +import com.mogo.och.taxi.callback.ITaxiControllerStatusCallback; +import com.mogo.och.taxi.callback.ITaxiOrderStatusCallback; +import com.mogo.och.taxi.constant.TaxiDriverRoleEnum; +import com.mogo.och.taxi.constant.TaxiConst; +import com.mogo.och.taxi.constant.TaxiOrderStatusEnum; +import com.mogo.och.taxi.constant.TaxiOrderTypeEnum; +import com.mogo.och.taxi.network.TaxiServiceCallback; +import com.mogo.och.taxi.network.TaxiServiceManager; import com.mogo.och.taxi.utils.CoordinateCalculateRouteUtil; -import com.mogo.och.taxi.utils.OchTaxiAnalyticsUtil; +import com.mogo.och.taxi.utils.TaxiAnalyticsUtil; import com.mogo.och.taxi.utils.OrderUtil; import com.mogo.och.taxi.utils.PinYinUtil; import com.mogo.aicloud.services.socket.IMogoLifecycleListener; @@ -79,15 +79,15 @@ import mogo_msg.MogoReportMsg; *

* 网约车 - 出租车业务逻辑处理 */ -public class MogoOCHTaxiModelNew { +public class TaxiModel { - private static final String TAG = MogoOCHTaxiModelNew.class.getSimpleName(); + private static final String TAG = TaxiModel.class.getSimpleName(); private static final class SingletonHolder { - private static final MogoOCHTaxiModelNew INSTANCE = new MogoOCHTaxiModelNew(); + private static final TaxiModel INSTANCE = new TaxiModel(); } - public static MogoOCHTaxiModelNew getInstance() { + public static TaxiModel getInstance() { return SingletonHolder.INSTANCE; } @@ -100,31 +100,31 @@ public class MogoOCHTaxiModelNew { private volatile List mInServiceList = Collections.emptyList(); //进行中订单 private volatile List mWaitServiceList = Collections.emptyList(); //待服务订单 - private IOCHTaxiADASStatusCallback mADASStatusCallback; //Model->Presenter：自动驾驶状态相关 - private IOCHTaxiCarStatusCallback mCarStatusCallback; //Model->Presenter：出车/收车状态 - private IOCHTaxiControllerStatusCallback mControllerStatusCallback; //Model->Presenter：VR mode等 - private IOCHTaxiOrderStatusCallback mOrderStatusCallback; //Model->Presenter：订单变更 + private ITaxiADASStatusCallback mADASStatusCallback; //Model->Presenter：自动驾驶状态相关 + private ITaxiCarStatusCallback mCarStatusCallback; //Model->Presenter：出车/收车状态 + private ITaxiControllerStatusCallback mControllerStatusCallback; //Model->Presenter：VR mode等 + private ITaxiOrderStatusCallback mOrderStatusCallback; //Model->Presenter：订单变更 private List mRoutePoints = new ArrayList<>(); private double mLongitude, mLatitude; - private MogoOCHTaxiModelNew() { + private TaxiModel() { } - public void setADASStatusCallback(IOCHTaxiADASStatusCallback callback) { + public void setADASStatusCallback(ITaxiADASStatusCallback callback) { this.mADASStatusCallback = callback; } - public void setCarStatusCallback(IOCHTaxiCarStatusCallback callback) { + public void setCarStatusCallback(ITaxiCarStatusCallback callback) { this.mCarStatusCallback = callback; } - public void setControllerStatusCallback(IOCHTaxiControllerStatusCallback callback) { + public void setControllerStatusCallback(ITaxiControllerStatusCallback callback) { this.mControllerStatusCallback = callback; } - public void setOrderStatusCallback(IOCHTaxiOrderStatusCallback callback) { + public void setOrderStatusCallback(ITaxiOrderStatusCallback callback) { this.mOrderStatusCallback = callback; } @@ -240,20 +240,20 @@ public class MogoOCHTaxiModelNew { private void startOrStopOrderLoop(boolean start) { CallerLogger.INSTANCE.d(M_TAXI + TAG, "startOrStopOrderLoop() " + start); if (start) { - OCHTaxiModelLoopManager.getInstance().startInAndWaitOrdersLoop(); - OCHTaxiModelLoopManager.getInstance().startNewBookingOrderLoop(); - OCHTaxiModelLoopManager.getInstance().startHeartbeatLoop(); + TaxiModelLoopManager.getInstance().startInAndWaitOrdersLoop(); + TaxiModelLoopManager.getInstance().startNewBookingOrderLoop(); + TaxiModelLoopManager.getInstance().startHeartbeatLoop(); } else { - OCHTaxiModelLoopManager.getInstance().stopInAndWaitOrdersLoop(); - OCHTaxiModelLoopManager.getInstance().stopNewBookingOrderLoop(); - OCHTaxiModelLoopManager.getInstance().stopHeartbeatLoop(); + TaxiModelLoopManager.getInstance().stopInAndWaitOrdersLoop(); + TaxiModelLoopManager.getInstance().stopNewBookingOrderLoop(); + TaxiModelLoopManager.getInstance().stopHeartbeatLoop(); } } //查询出车/收车状态 public void queryCarStatus() { - OCHTaxiServiceManagerNew.getInstance().queryDriverServiceStatus(mContext, - new OCHTaxiServiceCallback() { + TaxiServiceManager.getInstance().queryDriverServiceStatus(mContext, + new TaxiServiceCallback() { @Override public void onSuccess(DriverStatusQueryRespBean data) { if (null != data && 0 == data.code) { @@ -262,10 +262,10 @@ public class MogoOCHTaxiModelNew { CallerLogger.INSTANCE.d(M_TAXI + TAG, "changeCarStatus:" + mOCHCarStatus); // startOrStopOrderLoop(mOCHCarStatus == 1); todo 只从一个入口开始订单轮询 String role = ""; - if (DriverRoleEnum.DEMO.getCode() == data.data.purpose){ - role = OCHTaxiConst.DEMO_USER; - }else if (DriverRoleEnum.TEST.getCode() == data.data.purpose){ - role = OCHTaxiConst.TEST_USER; + if (TaxiDriverRoleEnum.DEMO.getCode() == data.data.purpose){ + role = TaxiConst.DEMO_USER; + }else if (TaxiDriverRoleEnum.TEST.getCode() == data.data.purpose){ + role = TaxiConst.TEST_USER; } if (mCarStatusCallback != null) { mCarStatusCallback.onCarStatusChanged(mOCHCarStatus == 1 , role); @@ -294,8 +294,8 @@ public class MogoOCHTaxiModelNew { return; } final int status = mOCHCarStatus == 1 ? 0 : 1; - OCHTaxiServiceManagerNew.getInstance().updateDriverServiceStatus(mContext, status, - new OCHTaxiServiceCallback() { + TaxiServiceManager.getInstance().updateDriverServiceStatus(mContext, status, + new TaxiServiceCallback() { @Override public void onSuccess(BaseData data) { if (null != data && 0 == data.code) { @@ -325,8 +325,8 @@ public class MogoOCHTaxiModelNew { * 才更新最新进行中单到本地 */ public void queryInAndWaitOrders() { - OCHTaxiServiceManagerNew.getInstance().queryOrdersInAndWaitService(mContext, - new OCHTaxiServiceCallback() { + TaxiServiceManager.getInstance().queryOrdersInAndWaitService(mContext, + new TaxiServiceCallback() { @Override public void onSuccess(OrdersInServiceQueryRespBean data) { if (data == null || data.data == null) { @@ -399,15 +399,15 @@ public class MogoOCHTaxiModelNew { return; } final String orderNo = mCurrentOCHOrder.orderNo; - OCHTaxiServiceManagerNew.getInstance().queryOrderById(mContext, orderNo, - new OCHTaxiServiceCallback() { + TaxiServiceManager.getInstance().queryOrderById(mContext, orderNo, + new TaxiServiceCallback() { @Override public void onSuccess(OrderQueryRespBean data) { if (data != null && data.data != null && mCurrentOCHOrder != null && mCurrentOCHOrder.orderNo.equals(data.data.orderNo)) { - if (data.data.orderStatus == OrderStatusEnum.Cancel.getCode() - || data.data.orderStatus == OrderStatusEnum.JourneyCompleted.getCode() - || data.data.orderStatus == OrderStatusEnum.None.getCode()) { + if (data.data.orderStatus == TaxiOrderStatusEnum.Cancel.getCode() + || data.data.orderStatus == TaxiOrderStatusEnum.JourneyCompleted.getCode() + || data.data.orderStatus == TaxiOrderStatusEnum.None.getCode()) { clearCurrentOCHOrder(); cancelAutopilot(); } else { @@ -427,13 +427,13 @@ public class MogoOCHTaxiModelNew { } //更新当前订单状态 - public void updateOCHOrderStatus(final OrderStatusEnum orderStatus) { + public void updateOCHOrderStatus(final TaxiOrderStatusEnum orderStatus) { if (mCurrentOCHOrder == null) { return; } final String orderNo = mCurrentOCHOrder.orderNo; - OCHTaxiServiceManagerNew.getInstance().updateOrderStatus(mContext, orderNo, - orderStatus.getCode(), new OCHTaxiServiceCallback() { + TaxiServiceManager.getInstance().updateOrderStatus(mContext, orderNo, + orderStatus.getCode(), new TaxiServiceCallback() { @Override public void onSuccess(BaseData data) { if (null != data && 0 == data.code @@ -466,8 +466,8 @@ public class MogoOCHTaxiModelNew { return; } final String orderNo = mCurrentOCHOrder.orderNo; - OCHTaxiServiceManagerNew.getInstance().cancelOrder(mContext, orderNo, reasonType, reason, - new OCHTaxiServiceCallback() { + TaxiServiceManager.getInstance().cancelOrder(mContext, orderNo, reasonType, reason, + new TaxiServiceCallback() { @Override public void onSuccess(BaseData data) { if (null != data && 0 == data.code @@ -489,8 +489,8 @@ public class MogoOCHTaxiModelNew { // 取消待服务中订单 public void cancelOrderById(final String orderNo, int reasonType, String reason) { - OCHTaxiServiceManagerNew.getInstance().cancelOrder(mContext, orderNo, reasonType, reason, - new OCHTaxiServiceCallback() { + TaxiServiceManager.getInstance().cancelOrder(mContext, orderNo, reasonType, reason, + new TaxiServiceCallback() { @Override public void onSuccess(BaseData data) { if (null != data && 0 == data.code) { @@ -513,8 +513,8 @@ public class MogoOCHTaxiModelNew { return; } final String orderNo = mCurrentOCHOrder.orderNo; - OCHTaxiServiceManagerNew.getInstance().queryOrderRouteInfo(mContext, orderNo, - new OCHTaxiServiceCallback() { + TaxiServiceManager.getInstance().queryOrderRouteInfo(mContext, orderNo, + new TaxiServiceCallback() { @Override public void onSuccess(OrderQueryRouteInfoRespBean data) { if (null != data && 0 == data.code @@ -534,8 +534,8 @@ public class MogoOCHTaxiModelNew { // 获取全部订单列表 public void queryOrdersList(int page, int size) { - OCHTaxiServiceManagerNew.getInstance().queryOrdersList(mContext, page, size, - new OCHTaxiServiceCallback() { + TaxiServiceManager.getInstance().queryOrdersList(mContext, page, size, + new TaxiServiceCallback() { @Override public void onSuccess(OrdersListQueryRespBean data) { if (null != data && 0 == data.code) { @@ -558,8 +558,8 @@ public class MogoOCHTaxiModelNew { * 注：只有在本地缓存mNewBookingOrder为null时（执行完抢单or司机关闭改单），才更新新到待抢单 */ public void queryNewBookingOrder() { - OCHTaxiServiceManagerNew.getInstance().queryNewBookingOrder(mContext, - new OCHTaxiServiceCallback() { + TaxiServiceManager.getInstance().queryNewBookingOrder(mContext, + new TaxiServiceCallback() { @Override public void onSuccess(OrdersNewBookingQueryRespBean data) { if (data != null && data.code == 0 @@ -585,13 +585,13 @@ public class MogoOCHTaxiModelNew { // 仅限于获取到新待抢单且需要展示时查询该单信息：（queryOrderById接口可以查询属于该车的单、未派的单） private void queryNewBookingContent(final String orderNo) { - OCHTaxiServiceManagerNew.getInstance().queryOrderById(mContext, orderNo, - new OCHTaxiServiceCallback() { + TaxiServiceManager.getInstance().queryOrderById(mContext, orderNo, + new TaxiServiceCallback() { @Override public void onSuccess(OrderQueryRespBean data) { if (data != null && data.code == 0 && data.data != null && data.data.orderNo.equals(orderNo) - && data.data.orderType == OrderTypeEnum.Reserved.getType()) { + && data.data.orderType == TaxiOrderTypeEnum.Reserved.getType()) { mNewBookingOrder = data.data; mPrevOrderNo = data.data.orderNo; if (mOrderStatusCallback != null) { @@ -616,15 +616,15 @@ public class MogoOCHTaxiModelNew { return; } final String orderNo = mNewBookingOrder.orderNo; - OCHTaxiServiceManagerNew.getInstance().grabOrder(mContext, orderNo, - new OCHTaxiServiceCallback() { + TaxiServiceManager.getInstance().grabOrder(mContext, orderNo, + new TaxiServiceCallback() { @Override public void onSuccess(OrderGrabRespBean data) { if (data != null && data.code == 0 && mNewBookingOrder != null && mNewBookingOrder.orderNo.equals(orderNo)) { if (mOrderStatusCallback != null) { mOrderStatusCallback.onGrabOrderExecuteDone(); - OCHTaxiModelLoopManager.getInstance().startGrabResultLoop(); + TaxiModelLoopManager.getInstance().startGrabResultLoop(); } } } @@ -639,18 +639,18 @@ public class MogoOCHTaxiModelNew { // 查询抢单结果 public void queryOrderGrabStatus() { if (mNewBookingOrder == null) { - OCHTaxiModelLoopManager.getInstance().stopGrabResultLoop(); + TaxiModelLoopManager.getInstance().stopGrabResultLoop(); if (mOrderStatusCallback != null) { mOrderStatusCallback.onGrabOrderFailed(null); } return; } final String orderNo = mNewBookingOrder.orderNo; - OCHTaxiServiceManagerNew.getInstance().queryOrderGrabStatus(mContext, orderNo, - new OCHTaxiServiceCallback() { + TaxiServiceManager.getInstance().queryOrderGrabStatus(mContext, orderNo, + new TaxiServiceCallback() { @Override public void onSuccess(OrderGrabStatusQueryRespBean data) { - //OCHTaxiModelLoopManager.getInstance().stopGrabResultLoop(); + //TaxiModelLoopManager.getInstance().stopGrabResultLoop(); if (data != null && data.code == 0 && mNewBookingOrder != null && mNewBookingOrder.orderNo.equals(orderNo)) { if (data.data.grabStatus == 0) { @@ -672,7 +672,7 @@ public class MogoOCHTaxiModelNew { mOrderStatusCallback.onGrabOrderFailed(null); } } - OCHTaxiModelLoopManager.getInstance().stopGrabResultLoop(); + TaxiModelLoopManager.getInstance().stopGrabResultLoop(); cancelNewBookingOrder(); } @@ -685,8 +685,8 @@ public class MogoOCHTaxiModelNew { // 车机端上传心跳数据（只在出车状态时上传） public void runCarHeartbeat() { - OCHTaxiServiceManagerNew.getInstance().runCarHeartbeat(mContext, mLongitude, mLatitude, - new OCHTaxiServiceCallback() { + TaxiServiceManager.getInstance().runCarHeartbeat(mContext, mLongitude, mLatitude, + new TaxiServiceCallback() { @Override public void onSuccess(BaseData data) { @@ -701,8 +701,8 @@ public class MogoOCHTaxiModelNew { // 查询司机服务数据 public void queryDriverServiceData() { - OCHTaxiServiceManagerNew.getInstance().queryDriverServiceData(mContext, - new OCHTaxiServiceCallback() { + TaxiServiceManager.getInstance().queryDriverServiceData(mContext, + new TaxiServiceCallback() { @Override public void onSuccess(DriverServiceDataRespBean data) { if (data != null && data.code == 0 @@ -732,12 +732,12 @@ public class MogoOCHTaxiModelNew { } // 获取当前订单状态 - public OrderStatusEnum getCurOrderStatus() { - OrderQueryRespBean.Result order = MogoOCHTaxiModelNew.getInstance().getCurrentOCHOrder(); + public TaxiOrderStatusEnum getCurOrderStatus() { + OrderQueryRespBean.Result order = TaxiModel.getInstance().getCurrentOCHOrder(); if (order == null) { - return OrderStatusEnum.None; + return TaxiOrderStatusEnum.None; } - return OrderStatusEnum.valueOf(order.orderStatus); + return TaxiOrderStatusEnum.valueOf(order.orderStatus); } //更新本地currentOrder信息，并保存订单到本地避免车机重启丢失数据 @@ -746,10 +746,10 @@ public class MogoOCHTaxiModelNew { return; } mCurrentOCHOrder = data; - SharedPrefsMgr.getInstance(mContext).putString(OCHTaxiConst.SP_KEY_OCH_TAXI_ORDER, + SharedPrefsMgr.getInstance(mContext).putString(TaxiConst.SP_KEY_OCH_TAXI_ORDER, GsonUtil.jsonFromObject(data)); if (FunctionBuildConfig.isDemoMode - && mCurrentOCHOrder.orderStatus == OrderStatusEnum.OnTheWayToEnd.getCode()) { + && mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToEnd.getCode()) { // 当美化模式（演示模式）开启时: 订单对应自动驾驶开启后，置true FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true; CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为true（更新本地order信息）"); @@ -759,7 +759,7 @@ public class MogoOCHTaxiModelNew { //清除订单信息 public void clearCurrentOCHOrder() { mCurrentOCHOrder = null; - SharedPrefsMgr.getInstance(mContext).remove(OCHTaxiConst.SP_KEY_OCH_TAXI_ORDER); + SharedPrefsMgr.getInstance(mContext).remove(TaxiConst.SP_KEY_OCH_TAXI_ORDER); if (FunctionBuildConfig.isDemoMode) { // 当美化模式（演示模式）开启时: 取消或订单已完成时，置false FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false; @@ -807,7 +807,7 @@ public class MogoOCHTaxiModelNew { CallerLogger.INSTANCE.d(M_TAXI + TAG, "start autopilot with parameter: %s", GsonUtil.jsonFromObject(parameters) + " ,startSiteName=" + mCurrentOCHOrder.startSiteAddr + " ,endSiteName=" + mCurrentOCHOrder.endSiteAddr); - OchTaxiAnalyticsUtil.triggerStartServiceEvent(false, + TaxiAnalyticsUtil.triggerStartServiceEvent(false, mCurrentOCHOrder.startSiteAddr, mCurrentOCHOrder.endSiteAddr, mCurrentOCHOrder.orderNo); if (DebugConfig.isDebug()) { @@ -840,7 +840,7 @@ public class MogoOCHTaxiModelNew { startLon, startLat, location.getLongitude(), location.getLatitude()); - if (DebugConfig.isDebug() && mCurrentOCHOrder.orderStatus == OrderStatusEnum.OnTheWayToStart.getCode()) { + if (DebugConfig.isDebug() && mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToStart.getCode()) { // TipToast.shortTip("距离上车点：" + Double.valueOf(distance).intValue()); } @@ -849,14 +849,14 @@ public class MogoOCHTaxiModelNew { // mOrderStatusCallback.onCurrentOrderDistToStartChanged((long) distance, 0); // } - if (distance > OCHTaxiConst.ARRIVE_AT_START_STATION_DISTANCE) { + if (distance > TaxiConst.ARRIVE_AT_START_STATION_DISTANCE) { distance = CoordinateUtils.calculateLineDistance(startLon, startLat, CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lon(), CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lat()); } - if (distance <= OCHTaxiConst.ARRIVE_AT_START_STATION_DISTANCE) { - updateOCHOrderStatus(OrderStatusEnum.ArriveAtStart); + if (distance <= TaxiConst.ARRIVE_AT_START_STATION_DISTANCE) { + updateOCHOrderStatus(TaxiOrderStatusEnum.ArriveAtStart); return; } } @@ -926,7 +926,7 @@ public class MogoOCHTaxiModelNew { public void onCarLocationChanged2(Location location) { //位置变化时，通过围栏判断是否到达x点 if (location != null && checkCurrentOCHOrder()) { - if (getCurOrderStatus() == OrderStatusEnum.OnTheWayToStart) { + if (getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToStart) { judgeStartStation(location); } // else if (getCurOrderStatus() == OrderStatusEnum.OnTheWayToEndStation) { @@ -946,20 +946,20 @@ public class MogoOCHTaxiModelNew { */ public void setArriveAtStartStation() { if (mCurrentOCHOrder == null - || mCurrentOCHOrder.orderStatus != OrderStatusEnum.OnTheWayToStart.getCode()) { + || mCurrentOCHOrder.orderStatus != TaxiOrderStatusEnum.OnTheWayToStart.getCode()) { TipToast.shortTip("订单状态不匹配该操作！"); return; } - updateOCHOrderStatus(OrderStatusEnum.ArriveAtStart); + updateOCHOrderStatus(TaxiOrderStatusEnum.ArriveAtStart); } public void setArriveAtEndStation() { if (mCurrentOCHOrder == null - || mCurrentOCHOrder.orderStatus != OrderStatusEnum.OnTheWayToEnd.getCode()) { + || mCurrentOCHOrder.orderStatus != TaxiOrderStatusEnum.OnTheWayToEnd.getCode()) { TipToast.shortTip("订单状态不匹配该操作！"); return; } - updateOCHOrderStatus(OrderStatusEnum.ArriveAtEnd); + updateOCHOrderStatus(TaxiOrderStatusEnum.ArriveAtEnd); } /** @@ -968,10 +968,10 @@ public class MogoOCHTaxiModelNew { public void setOnTheWayToEndStation() { if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); if (mCurrentOCHOrder == null - || mCurrentOCHOrder.orderStatus != OrderStatusEnum.ArriveAtStart.getCode()) { + || mCurrentOCHOrder.orderStatus != TaxiOrderStatusEnum.ArriveAtStart.getCode()) { TipToast.shortTip("订单状态不匹配该操作！"); } - updateOCHOrderStatus(OrderStatusEnum.OnTheWayToEnd); + updateOCHOrderStatus(TaxiOrderStatusEnum.OnTheWayToEnd); } private final IMoGoAutopilotStatusListener mGoAutopilotStatusListener = new IMoGoAutopilotStatusListener() { @@ -989,13 +989,13 @@ public class MogoOCHTaxiModelNew { if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); if (mCurrentOCHOrder != null - && getCurOrderStatus() == OrderStatusEnum.ArriveAtStart + && getCurOrderStatus() == TaxiOrderStatusEnum.ArriveAtStart && state != mPrevAPStatus) { // 当高频返回autopilot 2时，不重复调用订单状态变更 mPrevAPStatus = state; // 每个状态单独赋值，解决无订单时已经是2的状态导致的新订单来时无法进入此逻辑更新状态 - updateOCHOrderStatus(OrderStatusEnum.OnTheWayToEnd); + updateOCHOrderStatus(TaxiOrderStatusEnum.OnTheWayToEnd); - OchTaxiAnalyticsUtil.triggerStartServiceEvent(true, + TaxiAnalyticsUtil.triggerStartServiceEvent(true, mCurrentOCHOrder.startSiteAddr, mCurrentOCHOrder.endSiteAddr, mCurrentOCHOrder.orderNo); if (FunctionBuildConfig.isDemoMode) { @@ -1008,7 +1008,7 @@ public class MogoOCHTaxiModelNew { mPrevAPStatus = state; if (FunctionBuildConfig.isDemoMode && checkCurrentOCHOrder() - && getCurOrderStatus() == OrderStatusEnum.OnTheWayToEnd) { + && getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd) { // 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态 return; } @@ -1017,7 +1017,7 @@ public class MogoOCHTaxiModelNew { mPrevAPStatus = state; if (FunctionBuildConfig.isDemoMode && checkCurrentOCHOrder() - && getCurOrderStatus() == OrderStatusEnum.OnTheWayToEnd) { + && getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd) { // 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态 return; } @@ -1035,13 +1035,13 @@ public class MogoOCHTaxiModelNew { CallerLogger.INSTANCE.i(M_TAXI + TAG, "onAutopilotArriveAtStation = " + data.toString()); if (data == null || !checkCurrentOCHOrder() - || (getCurOrderStatus() == OrderStatusEnum.ArriveAtEnd)) { + || (getCurOrderStatus() == TaxiOrderStatusEnum.ArriveAtEnd)) { return; } if (DebugConfig.isDebug()) { // TipToast.shortTip("到达目的地"); } - updateOCHOrderStatus(OrderStatusEnum.ArriveAtEnd); + updateOCHOrderStatus(TaxiOrderStatusEnum.ArriveAtEnd); } }; private final IMoGoAutopilotPlanningListener moGoAutopilotPlanningListener = new IMoGoAutopilotPlanningListener() { @@ -1069,8 +1069,8 @@ public class MogoOCHTaxiModelNew { if (null == mCurrentOCHOrder) return; List points = CoordinateCalculateRouteUtil.coordinateConverterWgsToGcjList(mContext,models); - OCHTaxiServiceManagerNew.getInstance().updateOrderRoute(mContext, mCurrentOCHOrder.orderNo - , points, new OCHTaxiServiceCallback() { + TaxiServiceManager.getInstance().updateOrderRoute(mContext, mCurrentOCHOrder.orderNo + , points, new TaxiServiceCallback() { @Override public void onSuccess(BaseData data) { @@ -1125,7 +1125,7 @@ public class MogoOCHTaxiModelNew { lastSumLength = CoordinateCalculateRouteUtil.calculateRouteSumLength(lastPoints); } - double lastTime = lastSumLength / OCHTaxiConst.TAXI_AVERAGE_SPEED * 3.6 ; //秒 + double lastTime = lastSumLength / TaxiConst.TAXI_AVERAGE_SPEED * 3.6 ; //秒 Logger.d(M_TAXI + "dynamicCalculateRouteInfo" , "---lastSumLength: "+lastSumLength+"----lastTime : "+lastTime); @@ -1142,8 +1142,8 @@ public class MogoOCHTaxiModelNew { */ private void queryOrderRouteList(String orderNo) { if (mCurrentOCHOrder != null){ - OCHTaxiServiceManagerNew.getInstance().queryOrderRoute(mContext, orderNo, - new OCHTaxiServiceCallback() { + TaxiServiceManager.getInstance().queryOrderRoute(mContext, orderNo, + new TaxiServiceCallback() { @Override public void onSuccess(QueryOrderRouteResp data) { if (data != null && data.data != null){ @@ -1167,10 +1167,10 @@ public class MogoOCHTaxiModelNew { public void startOrStopCalculateRouteInfo(boolean isStart) { CallerLogger.INSTANCE.d(M_TAXI + TAG, "startOrStopOrderLoop() " + isStart); if (isStart) { - OCHTaxiModelLoopManager.getInstance().startCalculateRouteInfoLoop(); + TaxiModelLoopManager.getInstance().startCalculateRouteInfoLoop(); } else { mRoutePoints.clear(); - OCHTaxiModelLoopManager.getInstance().stopCalculateRouteInfLoop(); + TaxiModelLoopManager.getInstance().stopCalculateRouteInfLoop(); } } @@ -1181,8 +1181,8 @@ public class MogoOCHTaxiModelNew { */ private void reportOrderRemain(long lastSumLength, long duration) {// 米/分钟 if (mCurrentOCHOrder == null) return; - OCHTaxiServiceManagerNew.getInstance().reportOrderRemain(mContext, mCurrentOCHOrder.orderNo - , lastSumLength, duration, new OCHTaxiServiceCallback() { + TaxiServiceManager.getInstance().reportOrderRemain(mContext, mCurrentOCHOrder.orderNo + , lastSumLength, duration, new TaxiServiceCallback() { @Override public void onSuccess(BaseData data) { diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/OCHTaxiModelLoopManager.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java similarity index 74% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/OCHTaxiModelLoopManager.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java index b0bac1f31f..32b07a27bc 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/OCHTaxiModelLoopManager.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java @@ -4,7 +4,7 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAX import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.och.taxi.constant.OCHTaxiConst; +import com.mogo.och.taxi.constant.TaxiConst; import java.util.concurrent.TimeUnit; @@ -18,15 +18,15 @@ import io.reactivex.schedulers.Schedulers; * * 管理轮询逻辑（订单轮询、新单轮询、新单抢单结果轮询等等） */ -public class OCHTaxiModelLoopManager { +public class TaxiModelLoopManager { - private static final String TAG = OCHTaxiModelLoopManager.class.getSimpleName(); + private static final String TAG = TaxiModelLoopManager.class.getSimpleName(); private static final class SingletonHolder { - private static final OCHTaxiModelLoopManager INSTANCE = new OCHTaxiModelLoopManager(); + private static final TaxiModelLoopManager INSTANCE = new TaxiModelLoopManager(); } - public static OCHTaxiModelLoopManager getInstance() { + public static TaxiModelLoopManager getInstance() { return SingletonHolder.INSTANCE; } @@ -41,12 +41,12 @@ public class OCHTaxiModelLoopManager { return; } CallerLogger.INSTANCE.i(M_TAXI + TAG, "startInAndWaitOrdersLoop()"); - mInAndWaitServiceDisposable = Observable.interval(OCHTaxiConst.LOOP_DELAY, - OCHTaxiConst.LOOP_PERIOD_2S, TimeUnit.MILLISECONDS) + mInAndWaitServiceDisposable = Observable.interval(TaxiConst.LOOP_DELAY, + TaxiConst.LOOP_PERIOD_2S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(aLong -> MogoOCHTaxiModelNew.getInstance().queryInAndWaitOrders()); + .subscribe(aLong -> TaxiModel.getInstance().queryInAndWaitOrders()); } public void stopInAndWaitOrdersLoop() { @@ -62,12 +62,12 @@ public class OCHTaxiModelLoopManager { return; } CallerLogger.INSTANCE.i(M_TAXI + TAG, "startNewBookingOrderLoop()"); - mNewBookingOrderDisposable = Observable.interval(OCHTaxiConst.LOOP_DELAY, - OCHTaxiConst.LOOP_PERIOD_1S, TimeUnit.MILLISECONDS) + mNewBookingOrderDisposable = Observable.interval(TaxiConst.LOOP_DELAY, + TaxiConst.LOOP_PERIOD_1S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(aLong -> MogoOCHTaxiModelNew.getInstance().queryNewBookingOrder()); + .subscribe(aLong -> TaxiModel.getInstance().queryNewBookingOrder()); } public void stopNewBookingOrderLoop() { @@ -83,12 +83,12 @@ public class OCHTaxiModelLoopManager { return; } CallerLogger.INSTANCE.i(M_TAXI + TAG, "startGrabResultLoop()"); - mGrabResultDisposable = Observable.interval(OCHTaxiConst.LOOP_DELAY, - OCHTaxiConst.LOOP_PERIOD_1S, TimeUnit.MILLISECONDS) + mGrabResultDisposable = Observable.interval(TaxiConst.LOOP_DELAY, + TaxiConst.LOOP_PERIOD_1S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(aLong -> MogoOCHTaxiModelNew.getInstance().queryOrderGrabStatus()); + .subscribe(aLong -> TaxiModel.getInstance().queryOrderGrabStatus()); } public void stopGrabResultLoop() { @@ -104,12 +104,12 @@ public class OCHTaxiModelLoopManager { return; } CallerLogger.INSTANCE.i(M_TAXI + TAG, "startHeartbeatLoop()"); - mHeartbeatDisposable = Observable.interval(OCHTaxiConst.LOOP_DELAY, - OCHTaxiConst.LOOP_PERIOD_60S, TimeUnit.MILLISECONDS) + mHeartbeatDisposable = Observable.interval(TaxiConst.LOOP_DELAY, + TaxiConst.LOOP_PERIOD_60S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(aLong -> MogoOCHTaxiModelNew.getInstance().runCarHeartbeat()); + .subscribe(aLong -> TaxiModel.getInstance().runCarHeartbeat()); } public void stopHeartbeatLoop() { @@ -125,12 +125,12 @@ public class OCHTaxiModelLoopManager { return; } CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "startCalculateRouteInfoLoop()"); - mCalculateRouteDisposable = Observable.interval(OCHTaxiConst.LOOP_DELAY, - OCHTaxiConst.LOOP_CALCULATEROUTE_2S, TimeUnit.MILLISECONDS) + mCalculateRouteDisposable = Observable.interval(TaxiConst.LOOP_DELAY, + TaxiConst.LOOP_CALCULATEROUTE_2S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(aLong -> MogoOCHTaxiModelNew.getInstance().dynamicCalculateRouteInfo()); + .subscribe(aLong -> TaxiModel.getInstance().dynamicCalculateRouteInfo()); } public void stopCalculateRouteInfLoop() { diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceApiNew.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceApiNew.java similarity index 99% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceApiNew.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceApiNew.java index b47fd6aadd..734138f74c 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceApiNew.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceApiNew.java @@ -34,7 +34,7 @@ import retrofit2.http.Query; * * 网约车-出租车接口定义 */ -interface OCHTaxiServiceApiNew { +interface TaxiServiceApiNew { /** * 查询全部服务中/待服务订单（没有的时候返回code 0，空列表） diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceCallback.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceCallback.java similarity index 83% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceCallback.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceCallback.java index 2a015c2d7c..2f3e2ed507 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceCallback.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceCallback.java @@ -6,7 +6,7 @@ package com.mogo.och.taxi.network; * * 修改订单状态回调接口 */ -public interface OCHTaxiServiceCallback< T > { +public interface TaxiServiceCallback< T > { void onSuccess(T data); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceManagerNew.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java similarity index 87% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceManagerNew.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java index 86ee65d526..8d5bc8c7d3 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceManagerNew.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.java @@ -30,7 +30,7 @@ import com.mogo.och.taxi.bean.OrdersListQueryRespBean; import com.mogo.och.taxi.bean.OrdersNewBookingQueryRespBean; import com.mogo.och.taxi.bean.QueryOrderRouteResp; import com.mogo.och.taxi.bean.UpdateOrderDisAndTimeReqBean; -import com.mogo.och.taxi.constant.OCHTaxiConst; +import com.mogo.och.taxi.constant.TaxiConst; import java.util.List; @@ -40,22 +40,22 @@ import io.reactivex.schedulers.Schedulers; /** * Created by pangfan on 2021/8/19 */ -public class OCHTaxiServiceManagerNew { - private static final String TAG = OCHTaxiServiceManagerNew.class.getSimpleName(); +public class TaxiServiceManager { + private static final String TAG = TaxiServiceManager.class.getSimpleName(); private static final class SingletonHolder { - private static final OCHTaxiServiceManagerNew INSTANCE = new OCHTaxiServiceManagerNew(); + private static final TaxiServiceManager INSTANCE = new TaxiServiceManager(); } - public static OCHTaxiServiceManagerNew getInstance() { + public static TaxiServiceManager getInstance() { return SingletonHolder.INSTANCE; } - private OCHTaxiServiceApiNew mOCHTaxiServiceApi; + private TaxiServiceApiNew mOCHTaxiServiceApi; - private OCHTaxiServiceManagerNew() { + private TaxiServiceManager() { if (mOCHTaxiServiceApi == null){ - mOCHTaxiServiceApi = MoGoRetrofitFactory.getInstance(OCHTaxiConst.getBaseUrl()).create(OCHTaxiServiceApiNew.class); + mOCHTaxiServiceApi = MoGoRetrofitFactory.getInstance(TaxiConst.getBaseUrl()).create(TaxiServiceApiNew.class); } } @@ -65,7 +65,7 @@ public class OCHTaxiServiceManagerNew { * @param callback */ public void queryOrdersInAndWaitService(Context context, - OCHTaxiServiceCallback callback) { + TaxiServiceCallback callback) { mOCHTaxiServiceApi.queryOrdersInAndWaitService(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,MoGoAiCloudClientConfig.getInstance().getSn()) @@ -80,7 +80,7 @@ public class OCHTaxiServiceManagerNew { * @param callback */ public void queryNewBookingOrder(Context context, - OCHTaxiServiceCallback callback) { + TaxiServiceCallback callback) { mOCHTaxiServiceApi.queryNewBookingOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,MoGoAiCloudClientConfig.getInstance().getSn()) @@ -96,7 +96,7 @@ public class OCHTaxiServiceManagerNew { * @param callback */ public void grabOrder(Context context, String orderNo, - OCHTaxiServiceCallback callback) { + TaxiServiceCallback callback) { mOCHTaxiServiceApi.grabOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderGrabReqBean( @@ -113,7 +113,7 @@ public class OCHTaxiServiceManagerNew { * @param callback */ public void queryOrderGrabStatus(Context context, String orderNo, - OCHTaxiServiceCallback callback) { + TaxiServiceCallback callback) { mOCHTaxiServiceApi.queryOrderGrabStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderGrabReqBean( @@ -130,7 +130,7 @@ public class OCHTaxiServiceManagerNew { * @param callback */ public void queryOrderRouteInfo(Context context, String orderNo, - OCHTaxiServiceCallback callback) { + TaxiServiceCallback callback) { mOCHTaxiServiceApi.queryOrderRouteInfo(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderQueryRouteInfoReqBean( @@ -148,7 +148,7 @@ public class OCHTaxiServiceManagerNew { * @deprecated v2.1_0930需求中暂不再使用此接口 */ public void queryOrderById(Context context, String orderNo, - OCHTaxiServiceCallback callback) { + TaxiServiceCallback callback) { mOCHTaxiServiceApi.queryOrderById(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderQueryReqBean( @@ -166,7 +166,7 @@ public class OCHTaxiServiceManagerNew { * @deprecated v2.1_0930需求中暂不再使用此接口 */ public void queryOrderInService(Context context, - OCHTaxiServiceCallback callback) { + TaxiServiceCallback callback) { mOCHTaxiServiceApi.queryOrderInService(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,MoGoAiCloudClientConfig.getInstance().getSn()) @@ -178,13 +178,13 @@ public class OCHTaxiServiceManagerNew { /** * 司机取消订单 * @param context - * @param orderId + * @param orderNo * @param cancelType * @param cancelReason * @param callback */ public void cancelOrder(Context context, String orderNo, int cancelType, String cancelReason, - OCHTaxiServiceCallback callback) { + TaxiServiceCallback callback) { mOCHTaxiServiceApi.cancelOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderCancelReqBean( @@ -202,7 +202,7 @@ public class OCHTaxiServiceManagerNew { * @param callback */ public void queryOrdersList(Context context, int page, int size, - OCHTaxiServiceCallback callback) { + TaxiServiceCallback callback) { mOCHTaxiServiceApi.queryOrdersList(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrdersListQueryReqBean( @@ -220,7 +220,7 @@ public class OCHTaxiServiceManagerNew { * @param callback */ public void updateOrderStatus(Context context, String orderNo, int orderStatus, - OCHTaxiServiceCallback callback) { + TaxiServiceCallback callback) { mOCHTaxiServiceApi.updateOrderStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderStatusUpdateReqBean( @@ -237,7 +237,7 @@ public class OCHTaxiServiceManagerNew { * @param callback */ public void updateDriverServiceStatus(Context context, int status, - OCHTaxiServiceCallback callback) { + TaxiServiceCallback callback) { mOCHTaxiServiceApi.updateDriverServiceStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new DriverStatusUpdateReqBean( @@ -253,7 +253,7 @@ public class OCHTaxiServiceManagerNew { * @param callback */ public void queryDriverServiceStatus(Context context, - OCHTaxiServiceCallback callback) { + TaxiServiceCallback callback) { mOCHTaxiServiceApi.queryDriverServiceStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,MoGoAiCloudClientConfig.getInstance().getSn()) @@ -270,7 +270,7 @@ public class OCHTaxiServiceManagerNew { * @param callback */ public void runCarHeartbeat(Context context, double lon, double lat, - OCHTaxiServiceCallback callback) { + TaxiServiceCallback callback) { mOCHTaxiServiceApi.runCarHeartbeat(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new CarHeartbeatReqBean( @@ -286,7 +286,7 @@ public class OCHTaxiServiceManagerNew { * @param callback */ public void queryDriverServiceData(Context context, - OCHTaxiServiceCallback callback) { + TaxiServiceCallback callback) { mOCHTaxiServiceApi.queryServiceData(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,MoGoAiCloudClientConfig.getInstance().getSn()) @@ -302,7 +302,7 @@ public class OCHTaxiServiceManagerNew { * @param callback */ public void updateOrderRoute(Context context, String orderNo, List points, - OCHTaxiServiceCallback callback){ + TaxiServiceCallback callback){ mOCHTaxiServiceApi.updateOrderRoute(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderRouteUpdateReqBean(orderNo,points)) @@ -319,8 +319,8 @@ public class OCHTaxiServiceManagerNew { * @param duration * @param callback */ - public void reportOrderRemain(Context context, String orderNo,long distance, long duration - ,OCHTaxiServiceCallback callback){ + public void reportOrderRemain(Context context, String orderNo, long distance, long duration + , TaxiServiceCallback callback){ mOCHTaxiServiceApi.reportOrderRemain(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() @@ -336,7 +336,7 @@ public class OCHTaxiServiceManagerNew { * @param orderNo * @param callback */ - public void queryOrderRoute(Context context, String orderNo,OCHTaxiServiceCallback callback) { + public void queryOrderRoute(Context context, String orderNo, TaxiServiceCallback callback) { mOCHTaxiServiceApi.queryOrderRoute(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,orderNo) @@ -346,7 +346,7 @@ public class OCHTaxiServiceManagerNew { } private SubscribeImpl getSubscribeImpl( - Context context, OCHTaxiServiceCallback callback, String apiName) { + Context context, TaxiServiceCallback callback, String apiName) { return new SubscribeImpl(RequestOptions.create(context)) { @Override public void onSuccess(T o) { diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/OCHTaxiPresenter.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java similarity index 66% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/OCHTaxiPresenter.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java index eb64a5ff78..7c15f98ab6 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/OCHTaxiPresenter.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java @@ -15,15 +15,15 @@ import com.mogo.commons.mvp.Presenter; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.och.taxi.constant.OrderStatusEnum; +import com.mogo.och.taxi.constant.TaxiOrderStatusEnum; import com.mogo.och.taxi.bean.OrderQueryRespBean; import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean; -import com.mogo.och.taxi.callback.IOCHTaxiADASStatusCallback; -import com.mogo.och.taxi.callback.IOCHTaxiCarStatusCallback; -import com.mogo.och.taxi.callback.IOCHTaxiControllerStatusCallback; -import com.mogo.och.taxi.callback.IOCHTaxiOrderStatusCallback; -import com.mogo.och.taxi.model.MogoOCHTaxiModelNew; -import com.mogo.och.taxi.ui.OCHTaxiFragment; +import com.mogo.och.taxi.callback.ITaxiADASStatusCallback; +import com.mogo.och.taxi.callback.ITaxiCarStatusCallback; +import com.mogo.och.taxi.callback.ITaxiControllerStatusCallback; +import com.mogo.och.taxi.callback.ITaxiOrderStatusCallback; +import com.mogo.och.taxi.model.TaxiModel; +import com.mogo.och.taxi.ui.TaxiFragment; import org.jetbrains.annotations.NotNull; @@ -35,14 +35,14 @@ import java.util.List; * * 描述 */ -public class OCHTaxiPresenter extends Presenter implements IOCHTaxiADASStatusCallback, - IOCHTaxiCarStatusCallback, IOCHTaxiOrderStatusCallback, IOCHTaxiControllerStatusCallback { +public class TaxiPresenter extends Presenter implements ITaxiADASStatusCallback, + ITaxiCarStatusCallback, ITaxiOrderStatusCallback, ITaxiControllerStatusCallback { - private static final String TAG = OCHTaxiPresenter.class.getSimpleName(); + private static final String TAG = TaxiPresenter.class.getSimpleName(); - public OCHTaxiPresenter(OCHTaxiFragment view) { + public TaxiPresenter(TaxiFragment view) { super(view); - MogoOCHTaxiModelNew.getInstance().init(AbsMogoApplication.getApp()); + TaxiModel.getInstance().init(AbsMogoApplication.getApp()); initListeners(); } @@ -57,23 +57,23 @@ public class OCHTaxiPresenter extends Presenter implements IOCH super.onDestroy( owner ); releaseListeners(); - MogoOCHTaxiModelNew.getInstance().release(); + TaxiModel.getInstance().release(); } private void initListeners() { - MogoOCHTaxiModelNew.getInstance().setADASStatusCallback(this); - MogoOCHTaxiModelNew.getInstance().setCarStatusCallback(this); - MogoOCHTaxiModelNew.getInstance().setControllerStatusCallback(this); - MogoOCHTaxiModelNew.getInstance().setOrderStatusCallback(this); -// MogoOCHTaxiModelNew.getInstance().setMoGoAutopilotPlanningListener(this); + TaxiModel.getInstance().setADASStatusCallback(this); + TaxiModel.getInstance().setCarStatusCallback(this); + TaxiModel.getInstance().setControllerStatusCallback(this); + TaxiModel.getInstance().setOrderStatusCallback(this); +// TaxiModel.getInstance().setMoGoAutopilotPlanningListener(this); } private void releaseListeners() { - MogoOCHTaxiModelNew.getInstance().setADASStatusCallback(null); - MogoOCHTaxiModelNew.getInstance().setCarStatusCallback(null); - MogoOCHTaxiModelNew.getInstance().setControllerStatusCallback(null); - MogoOCHTaxiModelNew.getInstance().setOrderStatusCallback(null); -// MogoOCHTaxiModelNew.getInstance().setMoGoAutopilotPlanningListener(null); + TaxiModel.getInstance().setADASStatusCallback(null); + TaxiModel.getInstance().setCarStatusCallback(null); + TaxiModel.getInstance().setControllerStatusCallback(null); + TaxiModel.getInstance().setOrderStatusCallback(null); +// TaxiModel.getInstance().setMoGoAutopilotPlanningListener(null); } private void runOnUIThread( Runnable executor ) { @@ -89,57 +89,57 @@ public class OCHTaxiPresenter extends Presenter implements IOCH // 开启自动驾驶 public void startAutoPilot() { - MogoOCHTaxiModelNew.getInstance().startAutoPilot(); + TaxiModel.getInstance().startAutoPilot(); } // 更新出车/收车状态 public void updateCarStatus() { - MogoOCHTaxiModelNew.getInstance().updateCarStatus(); + TaxiModel.getInstance().updateCarStatus(); } // 更新当前订单状态（当前订单状态流转） - public void updateCurOrderStatus(OrderStatusEnum status) { - MogoOCHTaxiModelNew.getInstance().updateOCHOrderStatus(status); + public void updateCurOrderStatus(TaxiOrderStatusEnum status) { + TaxiModel.getInstance().updateOCHOrderStatus(status); } // 获取当前订单状态 - public OrderStatusEnum getCurOrderStatus() { - return MogoOCHTaxiModelNew.getInstance().getCurOrderStatus(); + public TaxiOrderStatusEnum getCurOrderStatus() { + return TaxiModel.getInstance().getCurOrderStatus(); } // 取消当前订单 public void cancelCurOrder(int reasonType, String reason) { - MogoOCHTaxiModelNew.getInstance().cancelCurrentOrder(reasonType, reason); + TaxiModel.getInstance().cancelCurrentOrder(reasonType, reason); } // 取消待服务中订单 public void cancelOrderById(String orderNo, int reasonType, String reason) { - MogoOCHTaxiModelNew.getInstance().cancelOrderById(orderNo, reasonType, reason); + TaxiModel.getInstance().cancelOrderById(orderNo, reasonType, reason); } // 查询当前订单route信息：预估时间、里程等 public void queryCurOrderRouteInfo() { - MogoOCHTaxiModelNew.getInstance().queryCurOrderRouteInfo(); + TaxiModel.getInstance().queryCurOrderRouteInfo(); } // 获取全部订单列表 public void queryOrdersList(int page, int size) { - MogoOCHTaxiModelNew.getInstance().queryOrdersList(page, size); + TaxiModel.getInstance().queryOrdersList(page, size); } // 执行抢单动作 public void grabOrder() { - MogoOCHTaxiModelNew.getInstance().grabOrder(); + TaxiModel.getInstance().grabOrder(); } // 关闭新到预约单 public void cancelNewBookingOrder() { - MogoOCHTaxiModelNew.getInstance().cancelNewBookingOrder(); + TaxiModel.getInstance().cancelNewBookingOrder(); } // 查询司机服务数据 public void queryDriverServiceData() { - MogoOCHTaxiModelNew.getInstance().queryDriverServiceData(); + TaxiModel.getInstance().queryDriverServiceData(); } @Override @@ -186,13 +186,13 @@ public class OCHTaxiPresenter extends Presenter implements IOCH @Override public void onCurrentOrderStatusChanged(OrderQueryRespBean.Result order) { CallerLogger.INSTANCE.d(M_TAXI + TAG,"order = "+order.toString()); - if (OrderStatusEnum.OnTheWayToEnd.getCode() == order.orderStatus){ - MogoOCHTaxiModelNew.getInstance().startDynamicCalculateRouteInfo(); + if (TaxiOrderStatusEnum.OnTheWayToEnd.getCode() == order.orderStatus){ + TaxiModel.getInstance().startDynamicCalculateRouteInfo(); } - if (OrderStatusEnum.ArriveAtEnd.getCode() == order.orderStatus || - OrderStatusEnum.Cancel.getCode() == order.orderStatus || - OrderStatusEnum.JourneyCompleted.getCode() == order.orderStatus){ - MogoOCHTaxiModelNew.getInstance().startOrStopCalculateRouteInfo(false); + if (TaxiOrderStatusEnum.ArriveAtEnd.getCode() == order.orderStatus || + TaxiOrderStatusEnum.Cancel.getCode() == order.orderStatus || + TaxiOrderStatusEnum.JourneyCompleted.getCode() == order.orderStatus){ + TaxiModel.getInstance().startOrStopCalculateRouteInfo(false); } mView.updateCurrentOrderStatusChanged(order); } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseOchTaxiTabFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java similarity index 98% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseOchTaxiTabFragment.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java index 000bbc5051..7ff19da6fb 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseOchTaxiTabFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java @@ -57,7 +57,7 @@ import record_cache.RecordPanelOuterClass; * * @author tongchenfei */ -public abstract class BaseOchTaxiTabFragment> extends MvpFragment implements IMogoMapListener, IMoGoAutopilotIdentifyListener { +public abstract class BaseTaxiTabFragment> extends MvpFragment implements IMogoMapListener, IMoGoAutopilotIdentifyListener { private static final String TAG = "BaseOchFragment"; private LinearLayout ctvAutopilotStatus; @@ -76,7 +76,7 @@ public abstract class BaseOchTaxiTabFragment距离 " + "- -" + " 公里，" // + "用时 " + "- -" + " 分钟"; // mDistanceAndTime.setText(Html.fromHtml(strHtml2)); - } else if (OrderStatusEnum.OnTheWayToEnd.getCode() == order.orderStatus) { + } else if (TaxiOrderStatusEnum.OnTheWayToEnd.getCode() == order.orderStatus) { CallerLogger.INSTANCE.d(M_TAXI + TAG, "已经去往终点"); mContentModule3.setVisibility(View.GONE); mContentModule2.setVisibility(View.VISIBLE); @@ -190,7 +190,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem mTitleTV2.setText("送乘客至"); mStationTv2.setText(order.endSiteAddr); - } else if (OrderStatusEnum.ArriveAtStart.getCode() == order.orderStatus) { + } else if (TaxiOrderStatusEnum.ArriveAtStart.getCode() == order.orderStatus) { CallerLogger.INSTANCE.d(M_TAXI + TAG, "已经达到起点"); mContentModule2.setVisibility(View.GONE); mContentModule3.setVisibility(View.VISIBLE); @@ -205,8 +205,8 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem mOrderServerStatus.setTextColor(Color.parseColor("#FFFFFF")); mOrderServerStatus.setClickable(true); Calendar currentCale = DateTimeUtils.getCurrentDateTime(); - String currentHM = OchTaxiUtils.formatCalendarToString(currentCale, OchTaxiUtils.TAXI_HH_mm); - String currentDay = OchTaxiUtils.formatCalendarToString(currentCale, OchTaxiUtils.TAXI_yyyy_MM_dd); + String currentHM = TaxiDateTimeUtil.formatCalendarToString(currentCale, TaxiDateTimeUtil.TAXI_HH_mm); + String currentDay = TaxiDateTimeUtil.formatCalendarToString(currentCale, TaxiDateTimeUtil.TAXI_yyyy_MM_dd); String strHtml11 = "已于
" + "" + currentHM + "" + "" + " " + "到达乘客上车地点"; @@ -218,16 +218,16 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem mStationTv32.setText(order.endSiteAddr); currentCale.add(Calendar.MINUTE, 10); String strHtml13 = ""; - if (currentDay.equals(OchTaxiUtils.formatCalendarToString(currentCale, OchTaxiUtils.TAXI_yyyy_MM_dd))) { + if (currentDay.equals(TaxiDateTimeUtil.formatCalendarToString(currentCale, TaxiDateTimeUtil.TAXI_yyyy_MM_dd))) { strHtml13 = "免费等待至 " - + "" + OchTaxiUtils.formatCalendarToString(currentCale, OchTaxiUtils.TAXI_HH_mm) + ""; + + "" + TaxiDateTimeUtil.formatCalendarToString(currentCale, TaxiDateTimeUtil.TAXI_HH_mm) + ""; } else { strHtml13 = "免费等待至" - + "" + OchTaxiUtils.formatCalendarToString(currentCale, OchTaxiUtils.TAXI_MM_dd_HH_mm) + ""; + + "" + TaxiDateTimeUtil.formatCalendarToString(currentCale, TaxiDateTimeUtil.TAXI_MM_dd_HH_mm) + ""; } mDistanceAndTime3.setText(Html.fromHtml(strHtml13)); - } else if (MogoOCHTaxiModelNew.getInstance().checkCurrentOCHOrder()) { + } else if (TaxiModel.getInstance().checkCurrentOCHOrder()) { CallerLogger.INSTANCE.d(M_TAXI + TAG, "前往乘客上车地点"); mContentModule2.setVisibility(View.GONE); mContentModule3.setVisibility(View.VISIBLE); @@ -249,17 +249,17 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem // + "接乘客"; mStationTv31.setText(order.startSiteAddr); Calendar currentCale = DateTimeUtils.getCurrentDateTime(); - Calendar startCale = OchTaxiUtils.formatLongToCalendar(order.bookingTime); - String currentDay = OchTaxiUtils.formatCalendarToString(currentCale, OchTaxiUtils.TAXI_yyyy_MM_dd); - String startDay = OchTaxiUtils.formatCalendarToString(startCale, OchTaxiUtils.TAXI_yyyy_MM_dd); + Calendar startCale = TaxiDateTimeUtil.formatLongToCalendar(order.bookingTime); + String currentDay = TaxiDateTimeUtil.formatCalendarToString(currentCale, TaxiDateTimeUtil.TAXI_yyyy_MM_dd); + String startDay = TaxiDateTimeUtil.formatCalendarToString(startCale, TaxiDateTimeUtil.TAXI_yyyy_MM_dd); String strHtml1 = ""; if (currentDay.equals(startDay)) { strHtml1 = "乘客将于
" - + "" + OchTaxiUtils.formatCalendarToString(startCale, OchTaxiUtils.TAXI_HH_mm) + "" + + "" + TaxiDateTimeUtil.formatCalendarToString(startCale, TaxiDateTimeUtil.TAXI_HH_mm) + "" + " 用车"; } else { strHtml1 = "乘客将于
" - + "" + OchTaxiUtils.formatCalendarToString(startCale, OchTaxiUtils.TAXI_MM_dd_HH_mm) + "" + + "" + TaxiDateTimeUtil.formatCalendarToString(startCale, TaxiDateTimeUtil.TAXI_MM_dd_HH_mm) + "" + " 用车"; } mOrderOtherContent3.setText(Html.fromHtml(strHtml1)); @@ -301,7 +301,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem dis = String.valueOf(Math.round(meters)); }else { disUnit = "公里"; - dis = OchTaxiUtils.formatLong((double)meters / 1000); + dis = TaxiDateTimeUtil.formatLong((double)meters / 1000); } } String strHtml2 = "里程 " + "" + dis + "" + " "+disUnit+"" @@ -334,7 +334,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem if (routeInfo.distanceToEnd > 0){ - dis = OchTaxiUtils.formatLong( (double) distance/ 1000); + dis = TaxiDateTimeUtil.formatLong( (double) distance/ 1000); } String strHtml2 = "距离 " + "" + dis + "" + " 公里" @@ -355,7 +355,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem private void startOrEndService(String step) { if (step.equals(getResources().getString(R.string.module_och_taxi_order_server_end))) {//点击了完成服务，结束订单并更新订单信息 // isHaveBeingOrder(false); - mTaxiFragment.completeOrderService(OrderStatusEnum.JourneyCompleted); + mTaxiFragment.completeOrderService(TaxiOrderStatusEnum.JourneyCompleted); showNotice(getResources().getString(R.string.module_och_taxi_order_server_completed_tip)); return; } else if (step.equals(getResources().getString(R.string.module_och_taxi_order_server_start))) {//点击服务，开启自动驾驶 @@ -369,14 +369,14 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem CallerLogger.INSTANCE.d(M_TAXI + TAG, "status==" + status); mCurrentOrder = order; mActivity.runOnUiThread(() -> { - if (status == OrderStatusEnum.None.getCode() || status == OrderStatusEnum.Cancel.getCode() || status == OrderStatusEnum.JourneyCompleted.getCode()) { + if (status == TaxiOrderStatusEnum.None.getCode() || status == TaxiOrderStatusEnum.Cancel.getCode() || status == TaxiOrderStatusEnum.JourneyCompleted.getCode()) { isHaveBeingOrder(false); mCurrentOrder = null; } else { isHaveBeingOrder(true); } if (status != saveOrderState) { - OrderStatusEnum ochStatus = OrderStatusEnum.valueOf(status); + TaxiOrderStatusEnum ochStatus = TaxiOrderStatusEnum.valueOf(status); switch (ochStatus) { case OnTheWayToStart: mOrderCancel.setVisibility(View.VISIBLE); @@ -384,8 +384,8 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem mTtsLessThan200Tip = 0; startNaviToStartStation(false, mOrderStartStationLat, mOrderStartStationLng); showOrHideNavi(true); - setOrRemoveMapMaker(true, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint); - setOrRemoveMapMaker(true,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint); + setOrRemoveMapMaker(true, TaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint); + setOrRemoveMapMaker(true, TaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint); break; case Cancel: mCurrentOrder = null; @@ -393,23 +393,23 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem mOrderCancel.setVisibility(View.VISIBLE); showNotice(mActivity.getString(R.string.module_och_taxi_order_cancel)); showOrHideNavi(false); - setOrRemoveMapMaker(false, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint); - setOrRemoveMapMaker(false,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint); + setOrRemoveMapMaker(false, TaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint); + setOrRemoveMapMaker(false, TaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint); break; case ArriveAtStart: mTtsLessThan200Tip = 0; mOrderCancel.setVisibility(View.VISIBLE); showNotice(mActivity.getString(R.string.module_och_taxi_order_status_ph_text)); showOrHideNavi(false); - setOrRemoveMapMaker(true, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint); - setOrRemoveMapMaker(true,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint); + setOrRemoveMapMaker(true, TaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint); + setOrRemoveMapMaker(true, TaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint); break; case OnTheWayToEnd: // showNotice("欢迎使用蘑菇智行"); mOrderCancel.setVisibility(View.VISIBLE); showOrHideNavi(false); - setOrRemoveMapMaker(false, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint); - setOrRemoveMapMaker(true,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint); + setOrRemoveMapMaker(false, TaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint); + setOrRemoveMapMaker(true, TaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint); break; case ArriveAtEnd: mCurrentOrder = null; @@ -417,8 +417,8 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem mOrderCancel.setVisibility(View.GONE); showNotice(mActivity.getString(R.string.module_och_taxi_order_auto_arrive_end_tip)); showOrHideNavi(false); - setOrRemoveMapMaker(false, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint); - setOrRemoveMapMaker(false,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint); + setOrRemoveMapMaker(false, TaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint); + setOrRemoveMapMaker(false, TaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint); break; case JourneyCompleted: mCurrentOrder = null; @@ -463,7 +463,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem break; } } else if (v.getId() == R.id.module_och_taxi_order_cancel_iv) { - new OCHTaxiOrderCancelDialog(mTaxiFragment, mActivity, mOrderNo, saveOrderState).show(); + new TaxiOrderCancelDialog(mTaxiFragment, mActivity, mOrderNo, saveOrderState).show(); } else if (v.getId() == R.id.module_och_taxi_navi_iv) { // TODO: 2021/11/30 打开去往乘客上车点的导航页面 if (mTaxiFragment != null) { @@ -486,8 +486,8 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem public void onCurrentOrderCancelDone() { //去除起终点 if (mCurrentOrder != null){ - setOrRemoveMapMaker(false, OCHTaxiConst.TAXI_START_MAP_MAKER,mCurrentOrder.startSitePoint); - setOrRemoveMapMaker(false,OCHTaxiConst.TAXI_END_MAP_MAKER,mCurrentOrder.endSitePoint); + setOrRemoveMapMaker(false, TaxiConst.TAXI_START_MAP_MAKER,mCurrentOrder.startSitePoint); + setOrRemoveMapMaker(false, TaxiConst.TAXI_END_MAP_MAKER,mCurrentOrder.endSitePoint); } //提交取消订单后的回调 TipToast.tip("订单取消成功"); @@ -528,7 +528,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem UiThreadHandler.postDelayed(new Runnable() { @Override public void run() { - if (saveOrderState == OrderStatusEnum.OnTheWayToStart.getCode()) { + if (saveOrderState == TaxiOrderStatusEnum.OnTheWayToStart.getCode()) { startNaviToStartStation(false, mOrderStartStationLat, mOrderStartStationLng); } } @@ -536,7 +536,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem UiThreadHandler.postDelayed(new Runnable() { @Override public void run() { - if (saveOrderState == OrderStatusEnum.OnTheWayToStart.getCode()) { + if (saveOrderState == TaxiOrderStatusEnum.OnTheWayToStart.getCode()) { if (mNaviIcon.getVisibility() == View.GONE) { mNaviIcon.setVisibility(View.VISIBLE); } @@ -558,7 +558,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem +station.get(1)+",longitude="+station.get(0)); MogoMarkerOptions options = new MogoMarkerOptions() - .owner(OCHTaxiConst.TYPE_MARKER_TAXI_ORDER) + .owner(TaxiConst.TYPE_MARKER_TAXI_ORDER) .anchor(0.5f, 0.5f) .set3DMode(true) .gps(true) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java similarity index 91% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java index efda226b61..edb8c2bdaa 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java @@ -16,11 +16,11 @@ import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.module.common.MogoApisHandler; import com.mogo.och.taxi.R; -import com.mogo.och.taxi.constant.OrderStatusEnum; +import com.mogo.och.taxi.constant.TaxiOrderStatusEnum; import com.mogo.och.taxi.bean.OrderQueryRespBean; import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean; -import com.mogo.och.taxi.model.MogoOCHTaxiModelNew; -import com.mogo.och.taxi.presenter.OCHTaxiPresenter; +import com.mogo.och.taxi.model.TaxiModel; +import com.mogo.och.taxi.presenter.TaxiPresenter; import com.mogo.och.taxi.utils.PinYinUtil; import org.json.JSONArray; @@ -39,22 +39,22 @@ import mogo.telematics.pad.MessagePad; * * 网约车-出租车UI */ -public class OCHTaxiFragment extends BaseOchTaxiTabFragment implements OCHTaxiView { +public class TaxiFragment extends BaseTaxiTabFragment implements ITaxiView { - public static final String TAG = "OCHTaxiFragment"; + public static final String TAG = "TaxiFragment"; - public static OCHTaxiFragment newInstance() { + public static TaxiFragment newInstance() { Bundle args = new Bundle(); - OCHTaxiFragment fragment = new OCHTaxiFragment(); + TaxiFragment fragment = new TaxiFragment(); fragment.setArguments(args); return fragment; } - private OCHTaxiGrabOrderFragment grabOrderFragment; - private OCHTaxiServerOrdersFragment serverOrdersFragment; - private WeakReference personalDialogFragment = null; + private TaxiGrabOrderFragment grabOrderFragment; + private TaxiServerOrdersFragment serverOrdersFragment; + private WeakReference personalDialogFragment = null; protected double mCurLatitude = 0.0; protected double mCurLongitude = 0.0; @@ -66,7 +66,7 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment(new OCHTaxiPersonalDialogFragment(this)); + personalDialogFragment = new WeakReference<>(new TaxiPersonalDialogFragment(this)); personalDialogFragment.get().show(getActivity().getSupportFragmentManager(), "service_data"); } @@ -197,7 +197,7 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment ordersList) { if (null == personalDialogFragment) - personalDialogFragment = new WeakReference<>(new OCHTaxiPersonalDialogFragment(this)); + personalDialogFragment = new WeakReference<>(new TaxiPersonalDialogFragment(this)); personalDialogFragment.get().onOrdersListPageRefresh(ordersList); } @@ -346,14 +346,14 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment { - MogoOCHTaxiModelNew.getInstance().setArriveAtStartStation(); + TaxiModel.getInstance().setArriveAtStartStation(); }); findViewById(R.id.test_bar_to_end).setOnClickListener(v -> { - MogoOCHTaxiModelNew.getInstance().setArriveAtEndStation(); + TaxiModel.getInstance().setArriveAtEndStation(); }); findViewById(R.id.test_bar_on_the_way_to_end).setOnClickListener(v -> { showNotice("自动驾驶已启动，请系好安全带"); - MogoOCHTaxiModelNew.getInstance().setOnTheWayToEndStation(); + TaxiModel.getInstance().setOnTheWayToEndStation(); testRouteInfoUpload(); }); } @@ -548,8 +548,8 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment 时 " + "" + minuteData + " 分"; viewHolder.operationDataTv.setText(Html.fromHtml(data)); viewHolder.operationDataTitle.setText("今日在线时长"); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiOrderCancelDialog.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java similarity index 72% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiOrderCancelDialog.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java index 0cdd1359a1..9d425de002 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiOrderCancelDialog.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java @@ -22,16 +22,16 @@ import androidx.annotation.RequiresApi; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; -import com.mogo.och.taxi.constant.OrderStatusEnum; +import com.mogo.och.taxi.constant.TaxiOrderStatusEnum; import com.mogo.och.taxi.R; -import com.mogo.och.taxi.constant.OrderCancelReasons; +import com.mogo.och.taxi.constant.TaxiOrderCancelReasons; import java.lang.ref.WeakReference; /** * @author: wangmingjun * @date: 2021/8/18 */ -public class OCHTaxiOrderCancelDialog extends AlertDialog implements View.OnClickListener,AdapterView.OnItemClickListener { +public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickListener,AdapterView.OnItemClickListener { private static final String TAG = "OCHTaxiOrderCancelDial"; protected WeakReference contextWeakReference; @@ -42,10 +42,10 @@ public class OCHTaxiOrderCancelDialog extends AlertDialog implements View.OnClic private ContentAdapter mContentAdapter; private int mOrderStatus;//1：预约单，其他为即时单的状态， 主要是控制乘客上车 乘客下车这几个选项的显示 private String[] mContentArrays; - private WeakReference mOchTaxiFragmentWeak; + private WeakReference mOchTaxiFragmentWeak; private String mOrderNo; - protected OCHTaxiOrderCancelDialog(OCHTaxiFragment fragment, Context context, String orderNo, int orderStatus) { + protected TaxiOrderCancelDialog(TaxiFragment fragment, Context context, String orderNo, int orderStatus) { super(context,R.style.OrderCancelDialog); mOrderNo = orderNo; mOchTaxiFragmentWeak = new WeakReference<>(fragment); @@ -56,41 +56,41 @@ public class OCHTaxiOrderCancelDialog extends AlertDialog implements View.OnClic private void initReasonArray() { if (1 == mOrderStatus) { - mContentArrays = new String[]{OrderCancelReasons.BookPassengerCancel.getMsg(), OrderCancelReasons.CarBroken.getMsg(), - OrderCancelReasons.BookJourneyConflict.getMsg(), OrderCancelReasons.BatteryLow.getMsg(), - OrderCancelReasons.BookOther.getMsg()}; + mContentArrays = new String[]{TaxiOrderCancelReasons.BookPassengerCancel.getMsg(), TaxiOrderCancelReasons.CarBroken.getMsg(), + TaxiOrderCancelReasons.BookJourneyConflict.getMsg(), TaxiOrderCancelReasons.BatteryLow.getMsg(), + TaxiOrderCancelReasons.BookOther.getMsg()}; return; } - OrderStatusEnum ochStatus = OrderStatusEnum.valueOf(mOrderStatus); + TaxiOrderStatusEnum ochStatus = TaxiOrderStatusEnum.valueOf(mOrderStatus); switch (ochStatus) { case OnTheWayToStart: - mContentArrays = new String[]{OrderCancelReasons.CarBroken.getMsg(), OrderCancelReasons.DeviceBroken.getMsg(), - OrderCancelReasons.BatteryLow.getMsg(), OrderCancelReasons.DriverIsIll.getMsg()}; + mContentArrays = new String[]{TaxiOrderCancelReasons.CarBroken.getMsg(), TaxiOrderCancelReasons.DeviceBroken.getMsg(), + TaxiOrderCancelReasons.BatteryLow.getMsg(), TaxiOrderCancelReasons.DriverIsIll.getMsg()}; break; case ArriveAtStart: - mContentArrays = new String[]{OrderCancelReasons.CarBroken.getMsg(), OrderCancelReasons.DeviceBroken.getMsg(), - OrderCancelReasons.BatteryLow.getMsg(), OrderCancelReasons.DriverIsIll.getMsg(), - OrderCancelReasons.PassengerNotArrive.getMsg()}; + mContentArrays = new String[]{TaxiOrderCancelReasons.CarBroken.getMsg(), TaxiOrderCancelReasons.DeviceBroken.getMsg(), + TaxiOrderCancelReasons.BatteryLow.getMsg(), TaxiOrderCancelReasons.DriverIsIll.getMsg(), + TaxiOrderCancelReasons.PassengerNotArrive.getMsg()}; break; case OnTheWayToEnd: case ArriveAtEnd: - mContentArrays = new String[]{OrderCancelReasons.CarBroken.getMsg(), OrderCancelReasons.DeviceBroken.getMsg(), - OrderCancelReasons.BatteryLow.getMsg(), OrderCancelReasons.DriverIsIll.getMsg(), OrderCancelReasons.PassengerStopOver.getMsg()}; + mContentArrays = new String[]{TaxiOrderCancelReasons.CarBroken.getMsg(), TaxiOrderCancelReasons.DeviceBroken.getMsg(), + TaxiOrderCancelReasons.BatteryLow.getMsg(), TaxiOrderCancelReasons.DriverIsIll.getMsg(), TaxiOrderCancelReasons.PassengerStopOver.getMsg()}; break; default: - mContentArrays = new String[]{OrderCancelReasons.CarBroken.getMsg(), OrderCancelReasons.DeviceBroken.getMsg(), - OrderCancelReasons.BatteryLow.getMsg(), OrderCancelReasons.DriverIsIll.getMsg(), - OrderCancelReasons.PassengerNotArrive.getMsg(), OrderCancelReasons.PassengerStopOver.getMsg()}; + mContentArrays = new String[]{TaxiOrderCancelReasons.CarBroken.getMsg(), TaxiOrderCancelReasons.DeviceBroken.getMsg(), + TaxiOrderCancelReasons.BatteryLow.getMsg(), TaxiOrderCancelReasons.DriverIsIll.getMsg(), + TaxiOrderCancelReasons.PassengerNotArrive.getMsg(), TaxiOrderCancelReasons.PassengerStopOver.getMsg()}; break; } } - protected OCHTaxiOrderCancelDialog(Context context, boolean cancelable, OnCancelListener cancelListener) { + protected TaxiOrderCancelDialog(Context context, boolean cancelable, OnCancelListener cancelListener) { super(context, cancelable, cancelListener); } - protected OCHTaxiOrderCancelDialog(Context context, int themeResId) { + protected TaxiOrderCancelDialog(Context context, int themeResId) { super(context, themeResId); } @@ -128,11 +128,11 @@ public class OCHTaxiOrderCancelDialog extends AlertDialog implements View.OnClic @Override public void onClick(View v) { if (v.getId() == R.id.order_cancel_commit_tv) {//bt commit - if (!TextUtils.isEmpty(mCurrentReason) && OrderCancelReasons.getType(mCurrentReason) != 0) { + if (!TextUtils.isEmpty(mCurrentReason) && TaxiOrderCancelReasons.getType(mCurrentReason) != 0) { if (1 == mOrderStatus){//预约单 - mOchTaxiFragmentWeak.get().cancelOrderById(mOrderNo,OrderCancelReasons.getType(mCurrentReason),mCurrentReason); + mOchTaxiFragmentWeak.get().cancelOrderById(mOrderNo, TaxiOrderCancelReasons.getType(mCurrentReason),mCurrentReason); }else {//即时单 - mOchTaxiFragmentWeak.get().cancelCurOrder(OrderCancelReasons.getType(mCurrentReason),mCurrentReason); + mOchTaxiFragmentWeak.get().cancelCurOrder(TaxiOrderCancelReasons.getType(mCurrentReason),mCurrentReason); } dismiss(); }else { diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiPersonalDialogFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java similarity index 93% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiPersonalDialogFragment.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java index 88437c70ac..d89ea427ed 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiPersonalDialogFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java @@ -31,11 +31,11 @@ import androidx.viewpager.widget.ViewPager; import com.google.android.material.tabs.TabLayout; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.och.taxi.constant.OrderStatusEnum; +import com.mogo.och.taxi.constant.TaxiOrderStatusEnum; import com.mogo.och.taxi.R; import com.mogo.och.taxi.bean.OrderQueryRespBean; -import com.mogo.och.taxi.constant.OrderTypeEnum; -import com.mogo.och.taxi.utils.OchTaxiUtils; +import com.mogo.och.taxi.constant.TaxiOrderTypeEnum; +import com.mogo.och.taxi.utils.TaxiDateTimeUtil; import java.util.ArrayList; import java.util.Calendar; @@ -48,7 +48,7 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAX * @author: wangmingjun * @date: 2021/8/18 */ -public class OCHTaxiPersonalDialogFragment extends DialogFragment implements View.OnClickListener { +public class TaxiPersonalDialogFragment extends DialogFragment implements View.OnClickListener { private final static String TAG = "OCHTaxiOrdersDialog"; @@ -62,16 +62,16 @@ public class OCHTaxiPersonalDialogFragment extends DialogFragment implements Vie private ConstraintLayout mNoDatas; private List orders = new ArrayList<>(); private String[] mTabTitles = {"在线时长","订单完成数"}; - private List fragments = new ArrayList<>(); + private List fragments = new ArrayList<>(); private int mNextPage = 0; private int mPerPageSize = 10; - private static OCHTaxiFragment mTaxiFragment; + private static TaxiFragment mTaxiFragment; private static boolean serverHadNoData = false; - public OCHTaxiPersonalDialogFragment(){ + public TaxiPersonalDialogFragment(){ } - public OCHTaxiPersonalDialogFragment(OCHTaxiFragment taxiFragment){ + public TaxiPersonalDialogFragment(TaxiFragment taxiFragment){ mTaxiFragment = taxiFragment; } @Nullable @@ -141,11 +141,11 @@ public class OCHTaxiPersonalDialogFragment extends DialogFragment implements Vie if (0 == i){ mOperationTab.addTab(tab,true); changeOperationTabLayoutTabUI(tab,true); - fragments.add(OCHTaxiOperationDatasFragment.newInstance(getActivity(),0)); + fragments.add(TaxiOperationDatasFragment.newInstance(getActivity(),0)); }else if (1 == i){ mOperationTab.addTab(tab); changeOperationTabLayoutTabUI(tab,false); - fragments.add(OCHTaxiOperationDatasFragment.newInstance(getActivity(),1)); + fragments.add(TaxiOperationDatasFragment.newInstance(getActivity(),1)); } } mOperationTab.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { @@ -302,7 +302,7 @@ public class OCHTaxiPersonalDialogFragment extends DialogFragment implements Vie if (null == queryRespBean) return; if (holder instanceof DayGroupViewHolder){ DayGroupViewHolder groupViewHolder = (DayGroupViewHolder)holder; - groupViewHolder.dayGroupTv.setText(OchTaxiUtils.getYMDTime(queryRespBean.createTime)); + groupViewHolder.dayGroupTv.setText(TaxiDateTimeUtil.getYMDTime(queryRespBean.createTime)); bindOrderDetailData(queryRespBean,groupViewHolder.orderTimeTv,groupViewHolder.startStationTv,groupViewHolder.endStationTv, groupViewHolder.orderStatusBt,groupViewHolder.orderTypeBt,groupViewHolder.orderNumTv); if (isNoLineItem(position)){ @@ -343,9 +343,9 @@ public class OCHTaxiPersonalDialogFragment extends DialogFragment implements Vie if (position == 0){ return DAY_GROUP_ITEM; } - String currentDate = OchTaxiUtils.getYMDTime(orders.get(position).createTime);//获取当前订单时间 + String currentDate = TaxiDateTimeUtil.getYMDTime(orders.get(position).createTime);//获取当前订单时间 int prevIndex = position - 1; - String preDate = OchTaxiUtils.getYMDTime(orders.get(prevIndex).createTime); + String preDate = TaxiDateTimeUtil.getYMDTime(orders.get(prevIndex).createTime); boolean isDifferent = !preDate.equals(currentDate);//前一个订单的日期跟第二个订单的日期是否一致 return isDifferent ? DAY_GROUP_ITEM : ORDER_DETAIL_ITEM;//一样订单详情， 不一样新添加分组 } @@ -354,9 +354,9 @@ public class OCHTaxiPersonalDialogFragment extends DialogFragment implements Vie if (position == orders.size() -1){ return false; }else { - String currentDate = OchTaxiUtils.getYMDTime(orders.get(position).createTime);//获取当前订单时间 + String currentDate = TaxiDateTimeUtil.getYMDTime(orders.get(position).createTime);//获取当前订单时间 int nextIndex = position + 1; - String preDate = OchTaxiUtils.getYMDTime(orders.get(nextIndex).createTime); + String preDate = TaxiDateTimeUtil.getYMDTime(orders.get(nextIndex).createTime); boolean isDifferent = preDate.equals(currentDate);//订单跟后一个订单是否是同一天 return isDifferent;//一样有划分线， 不一样没有划分线 } @@ -372,7 +372,7 @@ public class OCHTaxiPersonalDialogFragment extends DialogFragment implements Vie Button orderStatusBt, Button orderTypeBt, TextView orderNumTv){ Calendar calendar= Calendar.getInstance(); calendar.setTimeInMillis(queryRespBean.createTime); - orderTimeTv.setText(OchTaxiUtils.formatCalendarToString(calendar,OchTaxiUtils.TAXI_HH_mm)); + orderTimeTv.setText(TaxiDateTimeUtil.formatCalendarToString(calendar, TaxiDateTimeUtil.TAXI_HH_mm)); startStationTv.setText(queryRespBean.startSiteAddr); endStationTv.setText(queryRespBean.endSiteAddr); orderStatusBt.setText(getOrderStatus(queryRespBean.orderStatus,orderStatusBt)); @@ -382,7 +382,7 @@ public class OCHTaxiPersonalDialogFragment extends DialogFragment implements Vie @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) private String getOrderStatus(int status, Button button){ - OrderStatusEnum orderStatus = OrderStatusEnum.valueOf(status); + TaxiOrderStatusEnum orderStatus = TaxiOrderStatusEnum.valueOf(status); switch (orderStatus){ case JourneyCompleted: button.setBackground(context.getDrawable(R.drawable.taxi_order_button_status_canceled_bg)); @@ -398,7 +398,7 @@ public class OCHTaxiPersonalDialogFragment extends DialogFragment implements Vie @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) private String getOrderType(int type, Button button){ - if (type == OrderTypeEnum.Reserved.getType()){ + if (type == TaxiOrderTypeEnum.Reserved.getType()){ button.setBackground(context.getDrawable(R.drawable.taxi_order_button_type_reserver_bg)); return "预约单"; }else{ diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiRadiuImageView.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiRadiusImageView.java similarity index 92% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiRadiuImageView.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiRadiusImageView.java index 1b562e89f4..9f61645c94 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiRadiuImageView.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiRadiusImageView.java @@ -16,7 +16,7 @@ import com.mogo.och.taxi.R; * @author: wangmingjun * @date: 2021/9/29 */ -public class OCHTaxiRadiuImageView extends AppCompatImageView { +public class TaxiRadiusImageView extends AppCompatImageView { private float width, height; private int defaultRadius = 0; private int radius; @@ -26,17 +26,17 @@ public class OCHTaxiRadiuImageView extends AppCompatImageView { private int leftBottomRadius; - public OCHTaxiRadiuImageView(Context context) { + public TaxiRadiusImageView(Context context) { this(context, null); init(context, null); } - public OCHTaxiRadiuImageView(Context context, AttributeSet attrs) { + public TaxiRadiusImageView(Context context, AttributeSet attrs) { this(context, attrs, 0); init(context, attrs); } - public OCHTaxiRadiuImageView(Context context, AttributeSet attrs, int defStyleAttr) { + public TaxiRadiusImageView(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); init(context, attrs); } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiReserveOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrdersFragment.java similarity index 89% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiReserveOrdersFragment.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrdersFragment.java index f42945b3c7..249d6d896d 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiReserveOrdersFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrdersFragment.java @@ -17,7 +17,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.och.taxi.R; import com.mogo.och.taxi.bean.OrderQueryRespBean; -import com.mogo.och.taxi.utils.OchTaxiUtils; +import com.mogo.och.taxi.utils.TaxiDateTimeUtil; import java.util.ArrayList; import java.util.Calendar; @@ -30,7 +30,7 @@ import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE; * @date: 2021/9/2 * 待服务订单列表 */ -public class OCHTaxiReserveOrdersFragment extends BaseTaxiUIFragment { +public class TaxiReserveOrdersFragment extends BaseTaxiUIFragment { private RecyclerView mRecyclerView; private TextView mNodataTv; @@ -38,15 +38,15 @@ public class OCHTaxiReserveOrdersFragment extends BaseTaxiUIFragment { private View mBootRefreshNoDataView; private List mDatas = new ArrayList<>(); private ToBeServedOrdersAdapter mAdapter; - private static OCHTaxiFragment mTaxiFragment; + private static TaxiFragment mTaxiFragment; private static Activity mActivity; private boolean isUpwardSliding = false; - public static OCHTaxiReserveOrdersFragment newInstance(Activity activity, OCHTaxiFragment taxiFragment){ + public static TaxiReserveOrdersFragment newInstance(Activity activity, TaxiFragment taxiFragment){ mActivity = activity; mTaxiFragment = taxiFragment; Bundle args = new Bundle(); - OCHTaxiReserveOrdersFragment fragment = new OCHTaxiReserveOrdersFragment(); + TaxiReserveOrdersFragment fragment = new TaxiReserveOrdersFragment(); fragment.setArguments( args ); return fragment; } @@ -129,16 +129,16 @@ public class OCHTaxiReserveOrdersFragment extends BaseTaxiUIFragment { if (datas != null && datas.size() >0 ){ ToBeServedOrdersViewHolder viewHolder = (ToBeServedOrdersViewHolder)holder; OrderQueryRespBean.Result order = datas.get(position); - Calendar calendar = OchTaxiUtils.formatLongToCalendar(order.bookingTime); - if (OchTaxiUtils.compareDateIsCurrentDay(calendar)){ - viewHolder.orderTime.setText("用车时间：今天"+OchTaxiUtils.formatCalendarToString(calendar,OchTaxiUtils.TAXI_HH_mm)); + Calendar calendar = TaxiDateTimeUtil.formatLongToCalendar(order.bookingTime); + if (TaxiDateTimeUtil.compareDateIsCurrentDay(calendar)){ + viewHolder.orderTime.setText("用车时间：今天"+ TaxiDateTimeUtil.formatCalendarToString(calendar, TaxiDateTimeUtil.TAXI_HH_mm)); }else { - viewHolder.orderTime.setText("用车时间："+OchTaxiUtils.formatCalendarToString(calendar,OchTaxiUtils.TAXI_MM_dd_HH_mm)); + viewHolder.orderTime.setText("用车时间："+ TaxiDateTimeUtil.formatCalendarToString(calendar, TaxiDateTimeUtil.TAXI_MM_dd_HH_mm)); } viewHolder.orderCancel.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new OCHTaxiOrderCancelDialog(mTaxiFragment,context,order.orderNo,1).show(); + new TaxiOrderCancelDialog(mTaxiFragment,context,order.orderNo,1).show(); } }); viewHolder.startStation.setText(order.startSiteAddr); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiServerOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java similarity index 91% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiServerOrdersFragment.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java index 01e156ac38..f396603a95 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiServerOrdersFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java @@ -33,15 +33,15 @@ import java.util.List; * * 网约车-出租车UI */ -public class OCHTaxiServerOrdersFragment extends BaseTaxiUIFragment { +public class TaxiServerOrdersFragment extends BaseTaxiUIFragment { - public static final String TAG = "OCHTaxiFragment"; + public static final String TAG = "TaxiFragment"; - public static OCHTaxiServerOrdersFragment newInstance() { + public static TaxiServerOrdersFragment newInstance() { Bundle args = new Bundle(); - OCHTaxiServerOrdersFragment fragment = new OCHTaxiServerOrdersFragment(); + TaxiServerOrdersFragment fragment = new TaxiServerOrdersFragment(); fragment.setArguments( args ); return fragment; } @@ -51,8 +51,8 @@ public class OCHTaxiServerOrdersFragment extends BaseTaxiUIFragment { private ViewPager mTaxiOrderPager; private String[] mTabTitles = {"进行中","待服务"}; private List fragments = new ArrayList<>(); - private OCHTaxiBeingServerdOrdersFragment beingServerdOrdersFragment = null; - private OCHTaxiReserveOrdersFragment reserveOrdersFragment = null; + private TaxiBeingServerdOrdersFragment beingServerdOrdersFragment = null; + private TaxiReserveOrdersFragment reserveOrdersFragment = null; @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) @Override @@ -82,12 +82,12 @@ public class OCHTaxiServerOrdersFragment extends BaseTaxiUIFragment { if (0 == i){ mTaxiOrderTab.addTab(tab,true); changeTabLayoutTabUI(tab,true); - beingServerdOrdersFragment = OCHTaxiBeingServerdOrdersFragment.newInstance(getActivity(),(OCHTaxiFragment) getParentFragment()); + beingServerdOrdersFragment = TaxiBeingServerdOrdersFragment.newInstance(getActivity(),(TaxiFragment) getParentFragment()); fragments.add(beingServerdOrdersFragment); }else if (1 == i){ mTaxiOrderTab.addTab(tab); changeTabLayoutTabUI(tab,false); - reserveOrdersFragment = OCHTaxiReserveOrdersFragment.newInstance(getActivity(),(OCHTaxiFragment) getParentFragment()); + reserveOrdersFragment = TaxiReserveOrdersFragment.newInstance(getActivity(),(TaxiFragment) getParentFragment()); fragments.add(reserveOrdersFragment); } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/OchTaxiAnalyticsUtil.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsUtil.java similarity index 63% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/OchTaxiAnalyticsUtil.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsUtil.java index cc07f8f052..346ad51879 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/OchTaxiAnalyticsUtil.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsUtil.java @@ -8,7 +8,7 @@ import com.mogo.eagle.core.data.app.AppConfigInfo; import com.mogo.eagle.core.function.call.analytics.AnalyticsManager; import com.mogo.eagle.core.utilcode.util.DateTimeUtils; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.och.taxi.constant.OCHTaxiConst; +import com.mogo.och.taxi.constant.TaxiConst; import java.util.HashMap; import java.util.Map; @@ -18,7 +18,7 @@ import java.util.Map; * * Created on 2022/3/24 */ -public class OchTaxiAnalyticsUtil { +public class TaxiAnalyticsUtil { /** * 触发'开始服务'埋点流程： @@ -34,19 +34,19 @@ public class OchTaxiAnalyticsUtil { System.currentTimeMillis(), DateTimeUtils.yyyy_MM_dd_HH_mm_ss); Map params = new HashMap<>(); - params.put(OCHTaxiConst.EVENT_PARAM_SN, sn); - params.put(OCHTaxiConst.EVENT_PARAM_PLATE_NUM, TextUtils.isEmpty(plateNum) ? "" : plateNum); - params.put(OCHTaxiConst.EVENT_PARAM_ENV_ONLINE, + params.put(TaxiConst.EVENT_PARAM_SN, sn); + params.put(TaxiConst.EVENT_PARAM_PLATE_NUM, TextUtils.isEmpty(plateNum) ? "" : plateNum); + params.put(TaxiConst.EVENT_PARAM_ENV_ONLINE, DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE ? true : false); - params.put(OCHTaxiConst.EVENT_PARAM_TIME, dateTime); - params.put(OCHTaxiConst.EVENT_PARAM_START_NAME, startName); - params.put(OCHTaxiConst.EVENT_PARAM_END_NAME, endName); - params.put(OCHTaxiConst.EVENT_PARAM_ORDER_NUMBER, orderNo); + params.put(TaxiConst.EVENT_PARAM_TIME, dateTime); + params.put(TaxiConst.EVENT_PARAM_START_NAME, startName); + params.put(TaxiConst.EVENT_PARAM_END_NAME, endName); + params.put(TaxiConst.EVENT_PARAM_ORDER_NUMBER, orderNo); Runnable runnable = () -> { // 15s内未开启，上报失败埋点 - params.put(OCHTaxiConst.EVENT_PARAM_START_RESULT, false); - AnalyticsManager.INSTANCE.track(OCHTaxiConst.EVENT_KEY_START_SERVICE, params); + params.put(TaxiConst.EVENT_PARAM_START_RESULT, false); + AnalyticsManager.INSTANCE.track(TaxiConst.EVENT_KEY_START_SERVICE, params); }; if (send) { @@ -54,10 +54,10 @@ public class OchTaxiAnalyticsUtil { if (runnable != null && UiThreadHandler.getsUiHandler().hasCallbacks(runnable)) { UiThreadHandler.removeCallbacks(runnable); } - params.put(OCHTaxiConst.EVENT_PARAM_START_RESULT, true); - AnalyticsManager.INSTANCE.track(OCHTaxiConst.EVENT_KEY_START_SERVICE, params); + params.put(TaxiConst.EVENT_PARAM_START_RESULT, true); + AnalyticsManager.INSTANCE.track(TaxiConst.EVENT_KEY_START_SERVICE, params); } else { - UiThreadHandler.postDelayed(runnable, OCHTaxiConst.LOOP_PERIOD_15S); + UiThreadHandler.postDelayed(runnable, TaxiConst.LOOP_PERIOD_15S); } } } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/OchTaxiUtils.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiDateTimeUtil.java similarity index 94% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/OchTaxiUtils.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiDateTimeUtil.java index fc8747b6cd..da2cc3b86f 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/OchTaxiUtils.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiDateTimeUtil.java @@ -11,7 +11,7 @@ import java.util.Calendar; * @author: wangmingjun * @date: 2021/8/20 */ -public class OchTaxiUtils { +public class TaxiDateTimeUtil { public static final String TAXI_HH_mm = "HH:mm"; public static final String TAXI_MM_dd = "MM-dd"; @@ -32,8 +32,8 @@ public class OchTaxiUtils { public static boolean compareDateIsCurrentDay(Calendar targetCalendar){ Calendar currentCale = DateTimeUtils.getCurrentDateTime(); - String currentDay = formatCalendarToString(currentCale,OchTaxiUtils.TAXI_yyyy_MM_dd); - if (currentDay.equals(formatCalendarToString(targetCalendar,OchTaxiUtils.TAXI_yyyy_MM_dd))){ + String currentDay = formatCalendarToString(currentCale, TaxiDateTimeUtil.TAXI_yyyy_MM_dd); + if (currentDay.equals(formatCalendarToString(targetCalendar, TaxiDateTimeUtil.TAXI_yyyy_MM_dd))){ return true; }else { return false; diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_grab_view.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_grab_view.xml index f4c6717bbd..3f9ca0f376 100644 --- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_grab_view.xml +++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_grab_view.xml @@ -155,7 +155,7 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> -