diff --git a/OCH/facade/script/och.gradle b/OCH/facade/script/och.gradle index 3201d01e84..b611f2c467 100644 --- a/OCH/facade/script/och.gradle +++ b/OCH/facade/script/och.gradle @@ -35,37 +35,21 @@ project.dependencies { implementation project.project(':OCH:bus:passenger') implementation project.project(':OCH:shuttle:passenger') } else if (isCurrentDriver("T1T2")) { - if(isCurrentDriver("saas")){ - implementation project.project(':OCH:taxi:unmanned-driver') - } - if(isCurrentDriver("mogo")){ - implementation project.project(':OCH:taxi:driver') - } + implementation project.project(':OCH:taxi:driver') + implementation project.project(':OCH:taxi:unmanned-driver') } else if (isCurrentPassenger("T1T2")) { - if(isCurrentPassenger("saas")){ - implementation project.project(':OCH:taxi:unmanned-passenger') - } - if(isCurrentPassenger("mogo")){ - implementation project.project(':OCH:taxi:passenger') - } + implementation project.project(':OCH:taxi:unmanned-passenger') + implementation project.project(':OCH:taxi:passenger') } else if (isCurrentDriver("ALL")) { - if(isCurrentDriver("saas")){ - implementation project.project(':OCH:taxi:unmanned-driver') - } - if(isCurrentDriver("mogo")){ - implementation project.project(':OCH:taxi:driver') - } + implementation project.project(':OCH:taxi:unmanned-driver') + implementation project.project(':OCH:taxi:driver') implementation project.project(':OCH:bus:driver') implementation project.project(':OCH:charter:driver') implementation project.project(':OCH:shuttle:driver') implementation project.project(':OCH:sweeper:driver') } else if (isCurrentPassenger("ALL")) { - if(isCurrentPassenger("saas")){ - implementation project.project(':OCH:taxi:unmanned-passenger') - } - if(isCurrentPassenger("mogo")){ - implementation project.project(':OCH:taxi:passenger') - } + implementation project.project(':OCH:taxi:unmanned-passenger') + implementation project.project(':OCH:taxi:passenger') implementation project.project(':OCH:bus:passenger') implementation project.project(':OCH:charter:passenger') implementation project.project(':OCH:shuttle:passenger') diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomCheckView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomCheckView.kt index a9124b5ca2..a0535a3b29 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomCheckView.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomCheckView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.view.bottom +package com.mogo.och.taxi.passenger.ui.bottom import android.content.Context import android.util.AttributeSet diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_bottom_bar.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_bottom_bar.xml index 6853846cdb..5e6c2ec57b 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_bottom_bar.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_bottom_bar.xml @@ -48,7 +48,7 @@ android:layout_width="@dimen/dp_420" android:layout_height="@dimen/dp_160"/> - - - + package="com.mogo.och.unmanned.taxi"> ) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/callback/ITaxiTaskWithOrderCallback.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/callback/ITaxiTaskWithOrderCallback.kt similarity index 82% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/callback/ITaxiTaskWithOrderCallback.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/callback/ITaxiTaskWithOrderCallback.kt index d22671f0e2..9189b47248 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/callback/ITaxiTaskWithOrderCallback.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/callback/ITaxiTaskWithOrderCallback.kt @@ -1,7 +1,7 @@ -package com.mogo.och.taxi.callback +package com.mogo.och.unmanned.taxi.callback -import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean -import com.mogo.och.taxi.bean.TrajectoryListRespBean +import com.mogo.och.unmanned.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.unmanned.taxi.bean.TrajectoryListRespBean interface ITaxiTaskWithOrderCallback { fun onTaskWithOrderQuerySuccess(timeMillis: Long) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/OperationalOrderStatusEnum.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/OperationalOrderStatusEnum.kt similarity index 95% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/OperationalOrderStatusEnum.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/OperationalOrderStatusEnum.kt index a0d19fa27c..3dcd7fda61 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/OperationalOrderStatusEnum.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/OperationalOrderStatusEnum.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.constant +package com.mogo.och.unmanned.taxi.constant /** * Created on 2023/11/9 diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/StationTypeEnum.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/StationTypeEnum.kt similarity index 84% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/StationTypeEnum.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/StationTypeEnum.kt index e6d2ee8147..c9b8bbc44d 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/StationTypeEnum.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/StationTypeEnum.kt @@ -1,6 +1,6 @@ -package com.mogo.och.taxi.constant +package com.mogo.och.unmanned.taxi.constant -import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.unmanned.taxi.bean.QueryCurrentTaskRespBean /** * Created on 2023/11/9 diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaskStatusEnum.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaskStatusEnum.kt similarity index 91% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaskStatusEnum.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaskStatusEnum.kt index 68194bc3ea..3ad20d9f05 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaskStatusEnum.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaskStatusEnum.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.constant +package com.mogo.och.unmanned.taxi.constant /** * Created on 2023/8/7 * 0：空闲 1:获取任务 2:开始任务 3:到达目的地 diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaskTypeEnum.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaskTypeEnum.kt similarity index 88% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaskTypeEnum.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaskTypeEnum.kt index 9fbe236531..46be9cb57a 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaskTypeEnum.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaskTypeEnum.kt @@ -1,6 +1,6 @@ -package com.mogo.och.taxi.constant +package com.mogo.och.unmanned.taxi.constant -import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.unmanned.taxi.bean.QueryCurrentTaskRespBean /** * Created on 2023/8/7 diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiDriverEventConst.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiDriverEventConst.java similarity index 95% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiDriverEventConst.java rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiDriverEventConst.java index ed2c9f757d..fa09321f0f 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiDriverEventConst.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiDriverEventConst.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.constant; +package com.mogo.och.unmanned.taxi.constant; public interface TaxiDriverEventConst { diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiOpenOrderStatusEnum.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiOpenOrderStatusEnum.kt similarity index 92% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiOpenOrderStatusEnum.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiOpenOrderStatusEnum.kt index b583f28d3c..fc554c4d57 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiOpenOrderStatusEnum.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiOpenOrderStatusEnum.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.constant +package com.mogo.och.unmanned.taxi.constant /** * Created on 2022/08/19 diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiOrderCancelReasons.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiOrderCancelReasons.kt similarity index 97% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiOrderCancelReasons.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiOrderCancelReasons.kt index c55993eddf..22f2880d7a 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiOrderCancelReasons.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiOrderCancelReasons.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.constant +package com.mogo.och.unmanned.taxi.constant /** * 司机端取消订单的原因定义 diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiOrderStatusEnum.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiOrderStatusEnum.kt similarity index 96% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiOrderStatusEnum.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiOrderStatusEnum.kt index 1f703d0f2a..cbe2724f4d 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiOrderStatusEnum.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiOrderStatusEnum.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.constant +package com.mogo.och.unmanned.taxi.constant /** * Created on 2021/12/7 diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiOrderTypeEnum.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiOrderTypeEnum.kt similarity index 79% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiOrderTypeEnum.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiOrderTypeEnum.kt index 34b09c6cc7..5597aa6433 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiOrderTypeEnum.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiOrderTypeEnum.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.constant +package com.mogo.och.unmanned.taxi.constant /** * RoboTaxi订单类型声明 diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiUnmannedConst.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiUnmannedConst.kt similarity index 98% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiUnmannedConst.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiUnmannedConst.kt index 532662c104..48d36f3046 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiUnmannedConst.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiUnmannedConst.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.constant +package com.mogo.och.unmanned.taxi.constant /** * Created on 2021/12/6 diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiOperationalDataServiceApi.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiOperationalDataServiceApi.kt similarity index 92% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiOperationalDataServiceApi.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiOperationalDataServiceApi.kt index c8957592c4..14476c1eee 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiOperationalDataServiceApi.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiOperationalDataServiceApi.kt @@ -1,11 +1,11 @@ -package com.mogo.och.taxi.network +package com.mogo.och.unmanned.taxi.network import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.BaseData -import com.mogo.och.taxi.bean.QueryTaskRespBean -import com.mogo.och.taxi.bean.QueryOrdersRespBean -import com.mogo.och.taxi.bean.QueryServingDurationRespBean +import com.mogo.och.unmanned.taxi.bean.QueryTaskRespBean +import com.mogo.och.unmanned.taxi.bean.QueryOrdersRespBean +import com.mogo.och.unmanned.taxi.bean.QueryServingDurationRespBean import io.reactivex.Observable import retrofit2.http.GET import retrofit2.http.Header diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiOperationalDataServiceManager.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiOperationalDataServiceManager.kt similarity index 92% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiOperationalDataServiceManager.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiOperationalDataServiceManager.kt index 350483c41c..95902a4142 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiOperationalDataServiceManager.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiOperationalDataServiceManager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.network +package com.mogo.och.unmanned.taxi.network import android.content.Context import com.mogo.commons.storage.SharedPrefsMgr @@ -7,9 +7,9 @@ import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.network.OchCommonSubscribeImpl import com.mogo.och.common.module.network.interceptor.transformTry -import com.mogo.och.taxi.bean.QueryOrdersRespBean -import com.mogo.och.taxi.bean.QueryServingDurationRespBean -import com.mogo.och.taxi.bean.QueryTaskRespBean +import com.mogo.och.unmanned.taxi.bean.QueryOrdersRespBean +import com.mogo.och.unmanned.taxi.bean.QueryServingDurationRespBean +import com.mogo.och.unmanned.taxi.bean.QueryTaskRespBean /** * Created by pangfan on 2021/8/19 diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiRoutingServiceApi.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiRoutingServiceApi.kt similarity index 85% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiRoutingServiceApi.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiRoutingServiceApi.kt index 0d751a973e..646990216a 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiRoutingServiceApi.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiRoutingServiceApi.kt @@ -1,14 +1,14 @@ -package com.mogo.och.taxi.network +package com.mogo.och.unmanned.taxi.network import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.BaseData -import com.mogo.och.taxi.bean.EndGrayContrailTaskReq -import com.mogo.och.taxi.bean.QueryGrayContrailListRsp -import com.mogo.och.taxi.bean.QueryRoutingContrailByIdRsp -import com.mogo.och.taxi.bean.StartGrayContrailTaskReq -import com.mogo.och.taxi.bean.StartGrayContrailTaskRsp -import com.mogo.och.taxi.bean.SubmitGrayLineIssueLocationReq +import com.mogo.och.unmanned.taxi.bean.EndGrayContrailTaskReq +import com.mogo.och.unmanned.taxi.bean.QueryGrayContrailListRsp +import com.mogo.och.unmanned.taxi.bean.QueryRoutingContrailByIdRsp +import com.mogo.och.unmanned.taxi.bean.StartGrayContrailTaskReq +import com.mogo.och.unmanned.taxi.bean.StartGrayContrailTaskRsp +import com.mogo.och.unmanned.taxi.bean.SubmitGrayLineIssueLocationReq import io.reactivex.Observable import retrofit2.http.Body import retrofit2.http.GET diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiRoutingServiceManager.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiRoutingServiceManager.kt similarity index 88% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiRoutingServiceManager.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiRoutingServiceManager.kt index c0117cc65d..78cb50c32b 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiRoutingServiceManager.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiRoutingServiceManager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.network +package com.mogo.och.unmanned.taxi.network import android.content.Context import com.mogo.commons.storage.SharedPrefsMgr @@ -8,14 +8,14 @@ import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.network.OchCommonSubscribeImpl import com.mogo.och.common.module.network.interceptor.transformTry -import com.mogo.och.taxi.bean.EndGrayContrailTaskReq -import com.mogo.och.taxi.bean.GrayLineBean -import com.mogo.och.taxi.bean.QueryGrayContrailListRsp -import com.mogo.och.taxi.bean.QueryRoutingContrailByIdRsp -import com.mogo.och.taxi.bean.StartGrayAndQueryContrailRsp -import com.mogo.och.taxi.bean.StartGrayContrailTaskReq -import com.mogo.och.taxi.bean.StartGrayContrailTaskRsp -import com.mogo.och.taxi.bean.SubmitGrayLineIssueLocationReq +import com.mogo.och.unmanned.taxi.bean.EndGrayContrailTaskReq +import com.mogo.och.unmanned.taxi.bean.GrayLineBean +import com.mogo.och.unmanned.taxi.bean.QueryGrayContrailListRsp +import com.mogo.och.unmanned.taxi.bean.QueryRoutingContrailByIdRsp +import com.mogo.och.unmanned.taxi.bean.StartGrayAndQueryContrailRsp +import com.mogo.och.unmanned.taxi.bean.StartGrayContrailTaskReq +import com.mogo.och.unmanned.taxi.bean.StartGrayContrailTaskRsp +import com.mogo.och.unmanned.taxi.bean.SubmitGrayLineIssueLocationReq import io.reactivex.Observable object TaxiRoutingServiceManager { diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceApi.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiTaskWithOrderServiceApi.kt similarity index 86% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceApi.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiTaskWithOrderServiceApi.kt index 743f0b70fe..41b0622477 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceApi.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiTaskWithOrderServiceApi.kt @@ -1,21 +1,21 @@ -package com.mogo.och.taxi.network +package com.mogo.och.unmanned.taxi.network import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.BaseData -import com.mogo.och.taxi.bean.ArriveSiteReqBean -import com.mogo.och.taxi.bean.CancelOrderReqBean -import com.mogo.och.taxi.bean.TrajectoryListRespBean -import com.mogo.och.taxi.bean.JumpPassengerCheckReqBean -import com.mogo.och.taxi.bean.OrderCompletedReqBean -import com.mogo.och.taxi.bean.PrepareTaskReqBean -import com.mogo.och.taxi.bean.PrepareTaskRespBean -import com.mogo.och.taxi.bean.QueryCarOrderByNoReqBean -import com.mogo.och.taxi.bean.QueryCarOrderByNoRespBean -import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean -import com.mogo.och.taxi.bean.StartServiceReqBean -import com.mogo.och.taxi.bean.StartServiceRespBean -import com.mogo.och.taxi.bean.StartTaskReqBean +import com.mogo.och.unmanned.taxi.bean.ArriveSiteReqBean +import com.mogo.och.unmanned.taxi.bean.CancelOrderReqBean +import com.mogo.och.unmanned.taxi.bean.TrajectoryListRespBean +import com.mogo.och.unmanned.taxi.bean.JumpPassengerCheckReqBean +import com.mogo.och.unmanned.taxi.bean.OrderCompletedReqBean +import com.mogo.och.unmanned.taxi.bean.PrepareTaskReqBean +import com.mogo.och.unmanned.taxi.bean.PrepareTaskRespBean +import com.mogo.och.unmanned.taxi.bean.QueryCarOrderByNoReqBean +import com.mogo.och.unmanned.taxi.bean.QueryCarOrderByNoRespBean +import com.mogo.och.unmanned.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.unmanned.taxi.bean.StartServiceReqBean +import com.mogo.och.unmanned.taxi.bean.StartServiceRespBean +import com.mogo.och.unmanned.taxi.bean.StartTaskReqBean import io.reactivex.Observable import retrofit2.http.Body import retrofit2.http.GET diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceManager.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiTaskWithOrderServiceManager.kt similarity index 86% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceManager.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiTaskWithOrderServiceManager.kt index ee7a5ca1d3..99cc3a930e 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceManager.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/network/TaxiTaskWithOrderServiceManager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.network +package com.mogo.och.unmanned.taxi.network import android.content.Context import com.mogo.commons.storage.SharedPrefsMgr @@ -8,19 +8,19 @@ import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.network.OchCommonSubscribeImpl import com.mogo.och.common.module.network.interceptor.transformTry -import com.mogo.och.taxi.bean.ArriveSiteReqBean -import com.mogo.och.taxi.bean.CancelOrderReqBean -import com.mogo.och.taxi.bean.JumpPassengerCheckReqBean -import com.mogo.och.taxi.bean.OrderCompletedReqBean -import com.mogo.och.taxi.bean.PrepareTaskReqBean -import com.mogo.och.taxi.bean.PrepareTaskRespBean -import com.mogo.och.taxi.bean.QueryCarOrderByNoReqBean -import com.mogo.och.taxi.bean.QueryCarOrderByNoRespBean -import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean -import com.mogo.och.taxi.bean.StartServiceReqBean -import com.mogo.och.taxi.bean.StartServiceRespBean -import com.mogo.och.taxi.bean.StartTaskReqBean -import com.mogo.och.taxi.bean.TrajectoryListRespBean +import com.mogo.och.unmanned.taxi.bean.ArriveSiteReqBean +import com.mogo.och.unmanned.taxi.bean.CancelOrderReqBean +import com.mogo.och.unmanned.taxi.bean.JumpPassengerCheckReqBean +import com.mogo.och.unmanned.taxi.bean.OrderCompletedReqBean +import com.mogo.och.unmanned.taxi.bean.PrepareTaskReqBean +import com.mogo.och.unmanned.taxi.bean.PrepareTaskRespBean +import com.mogo.och.unmanned.taxi.bean.QueryCarOrderByNoReqBean +import com.mogo.och.unmanned.taxi.bean.QueryCarOrderByNoRespBean +import com.mogo.och.unmanned.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.unmanned.taxi.bean.StartServiceReqBean +import com.mogo.och.unmanned.taxi.bean.StartServiceRespBean +import com.mogo.och.unmanned.taxi.bean.StartTaskReqBean +import com.mogo.och.unmanned.taxi.bean.TrajectoryListRespBean /** * Created by pangfan on 2021/8/19 diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/BaseTaxiTabFragment.kt similarity index 98% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/BaseTaxiTabFragment.kt index ef8cb1a617..d4243b7660 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/BaseTaxiTabFragment.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.base +package com.mogo.och.unmanned.taxi.ui.base import android.animation.ObjectAnimator import android.annotation.SuppressLint @@ -35,12 +35,12 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.map.listener.IMogoMapListener import com.mogo.map.uicontroller.VisualAngleMode import com.mogo.och.common.module.wigets.StartAutopilotAnimationView -import com.mogo.och.taxi.R -import com.mogo.och.taxi.constant.TaxiUnmannedConst -import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.START_AUTOPILOT_ANIMATION_INTERVAL -import com.mogo.och.taxi.ui.debug.DebugView -import com.mogo.och.taxi.ui.navi.amap.TaxiAmapNaviFragment -import com.mogo.och.taxi.ui.navi.auto.TaxiRoutingNaviFragment +import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst +import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst.Companion.START_AUTOPILOT_ANIMATION_INTERVAL +import com.mogo.och.unmanned.taxi.ui.debug.DebugView +import com.mogo.och.unmanned.taxi.ui.navi.amap.TaxiAmapNaviFragment +import com.mogo.och.unmanned.taxi.ui.navi.auto.TaxiRoutingNaviFragment import kotlinx.android.synthetic.main.taxi_base_fragment.groupTestPanel import kotlinx.android.synthetic.main.taxi_base_fragment.mapBizView import kotlinx.android.synthetic.main.taxi_base_fragment.module_mogo_och_autopilot_status diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/ITaxiView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/ITaxiView.kt similarity index 75% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/ITaxiView.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/ITaxiView.kt index 783075f5b4..62a9cebe47 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/ITaxiView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/ITaxiView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.base; +package com.mogo.och.unmanned.taxi.ui.base; import com.mogo.commons.mvp.IView; diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt similarity index 96% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt index 053b65c513..10c7c8fe3b 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.base +package com.mogo.och.unmanned.taxi.ui.base import android.os.Bundle import android.text.TextUtils @@ -19,14 +19,14 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.biz.login.OpenOrderStatusEnum import com.mogo.och.common.module.utils.FlowBus -import com.mogo.och.taxi.R -import com.mogo.och.taxi.constant.TaxiDriverEventConst -import com.mogo.och.taxi.constant.TaxiOrderStatusEnum -import com.mogo.och.taxi.ui.operational.TaxiOperationalDialogFragment -import com.mogo.och.taxi.ui.routing.TaxiRoutingFragment -import com.mogo.och.taxi.ui.task.TaxiTaskModel -import com.mogo.och.taxi.ui.task.TaxiTaskTabFragment -import com.mogo.och.taxi.utils.TPRouteDataTestUtils +import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.constant.TaxiDriverEventConst +import com.mogo.och.unmanned.taxi.constant.TaxiOrderStatusEnum +import com.mogo.och.unmanned.taxi.ui.operational.TaxiOperationalDialogFragment +import com.mogo.och.unmanned.taxi.ui.routing.TaxiRoutingFragment +import com.mogo.och.unmanned.taxi.ui.task.TaxiTaskModel +import com.mogo.och.unmanned.taxi.ui.task.TaxiTaskTabFragment +import com.mogo.och.unmanned.taxi.utils.TPRouteDataTestUtils import kotlinx.android.synthetic.main.taxi_base_fragment.module_mogo_och_operation_status import kotlinx.android.synthetic.main.taxi_base_fragment.taxi_driver_role_tv import kotlinx.android.synthetic.main.taxi_panel.orderDebugView diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiPresenter.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiPresenter.java similarity index 94% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiPresenter.java rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiPresenter.java index 3f0c3169f4..49e6dd146d 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiPresenter.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiPresenter.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.base; +package com.mogo.och.unmanned.taxi.ui.base; import android.os.Looper; @@ -17,13 +17,16 @@ import com.mogo.och.common.module.biz.login.LoginStatusEnum; import com.mogo.och.common.module.biz.login.LoginStatusManager; import com.mogo.och.common.module.biz.login.OpenOrderStatusEnum; import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager; -import com.mogo.och.taxi.callback.ITaxiADASStatusCallback; -import com.mogo.och.taxi.callback.ITaxiControllerStatusCallback; -import com.mogo.och.taxi.callback.ITaxiOrderStatusCallback; +import com.mogo.och.unmanned.taxi.callback.ITaxiADASStatusCallback; +import com.mogo.och.unmanned.taxi.callback.ITaxiControllerStatusCallback; +import com.mogo.och.unmanned.taxi.callback.ITaxiOrderStatusCallback; import com.mogo.och.common.module.biz.login.RoleEnum; -import com.mogo.och.taxi.constant.TaxiUnmannedConst; -import com.mogo.och.taxi.ui.routing.TaxiRoutingModel; -import com.mogo.och.taxi.ui.task.TaxiTaskModel; +import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst; +import com.mogo.och.unmanned.taxi.ui.routing.TaxiRoutingModel; +import com.mogo.och.unmanned.taxi.ui.task.TaxiTaskModel; +import com.mogo.och.unmanned.taxi.callback.ITaxiADASStatusCallback; +import com.mogo.och.unmanned.taxi.callback.ITaxiControllerStatusCallback; +import com.mogo.och.unmanned.taxi.callback.ITaxiOrderStatusCallback; /** * @author congtaowang diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/common/AvoidLeakDialog.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/common/AvoidLeakDialog.kt similarity index 95% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/common/AvoidLeakDialog.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/common/AvoidLeakDialog.kt index af22409590..a2f4714704 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/common/AvoidLeakDialog.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/common/AvoidLeakDialog.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.common +package com.mogo.och.unmanned.taxi.ui.common import android.app.Dialog import android.content.Context diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/DebugView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/debug/DebugView.kt similarity index 96% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/DebugView.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/debug/DebugView.kt index ac805f8248..a4df15eb26 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/DebugView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/debug/DebugView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.debug +package com.mogo.och.unmanned.taxi.ui.debug import android.content.BroadcastReceiver import android.content.Context @@ -26,14 +26,14 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.util.AppUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.utils.DateTimeUtil -import com.mogo.och.taxi.R -import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean -import com.mogo.och.taxi.bean.TrajectoryListRespBean -import com.mogo.och.taxi.callback.ITaxiTaskWithOrderCallback -import com.mogo.och.taxi.constant.TaskStatusEnum -import com.mogo.och.taxi.constant.TaskTypeEnum -import com.mogo.och.taxi.constant.TaxiOrderStatusEnum -import com.mogo.och.taxi.ui.task.TaxiTaskModel +import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.unmanned.taxi.bean.TrajectoryListRespBean +import com.mogo.och.unmanned.taxi.callback.ITaxiTaskWithOrderCallback +import com.mogo.och.unmanned.taxi.constant.TaskStatusEnum +import com.mogo.och.unmanned.taxi.constant.TaskTypeEnum +import com.mogo.och.unmanned.taxi.constant.TaxiOrderStatusEnum +import com.mogo.och.unmanned.taxi.ui.task.TaxiTaskModel import kotlinx.android.synthetic.main.taxi_debug_order.view.btnContainer import kotlinx.android.synthetic.main.taxi_debug_order.view.currentBusinessModeTextView import kotlinx.android.synthetic.main.taxi_debug_order.view.currentCarStatus diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/amap/TaxiAmapNaviFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/navi/amap/TaxiAmapNaviFragment.kt similarity index 95% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/amap/TaxiAmapNaviFragment.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/navi/amap/TaxiAmapNaviFragment.kt index 65090b8871..2d1c1f5741 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/amap/TaxiAmapNaviFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/navi/amap/TaxiAmapNaviFragment.kt @@ -1,11 +1,11 @@ -package com.mogo.och.taxi.ui.navi.amap +package com.mogo.och.unmanned.taxi.ui.navi.amap import android.os.Bundle import com.mogo.commons.mvp.BaseFragment import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.common.module.map.AmapNaviToDestinationModel -import com.mogo.och.taxi.R +import com.mogo.och.unmanned.taxi.R import kotlinx.android.synthetic.main.taxi_amap_navi_view.navi_view /** diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/ITaxiMapDirectionView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/navi/auto/ITaxiMapDirectionView.kt similarity index 86% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/ITaxiMapDirectionView.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/navi/auto/ITaxiMapDirectionView.kt index fcd6580c74..6906a3a8c2 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/ITaxiMapDirectionView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/navi/auto/ITaxiMapDirectionView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.navi.auto +package com.mogo.och.unmanned.taxi.ui.navi.auto /** * @author: wangmingjun diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/RoutingNaviPresenter.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/navi/auto/RoutingNaviPresenter.java similarity index 90% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/RoutingNaviPresenter.java rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/navi/auto/RoutingNaviPresenter.java index 251a133779..4d60f2bc83 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/RoutingNaviPresenter.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/navi/auto/RoutingNaviPresenter.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.navi.auto; +package com.mogo.och.unmanned.taxi.ui.navi.auto; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI; @@ -13,8 +13,9 @@ import com.mogo.commons.mvp.Presenter; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.och.taxi.callback.IOCHTaxiAutopilotPlanningCallback; -import com.mogo.och.taxi.ui.task.TaxiTaskModel; +import com.mogo.och.unmanned.taxi.callback.IOCHTaxiAutopilotPlanningCallback; +import com.mogo.och.unmanned.taxi.ui.task.TaxiTaskModel; +import com.mogo.och.unmanned.taxi.ui.task.TaxiTaskModel; import java.util.List; diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/TaxiMapDirectionView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/navi/auto/TaxiMapDirectionView.kt similarity index 98% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/TaxiMapDirectionView.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/navi/auto/TaxiMapDirectionView.kt index 692760592f..d17ba99605 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/TaxiMapDirectionView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/navi/auto/TaxiMapDirectionView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.navi.auto +package com.mogo.och.unmanned.taxi.ui.navi.auto import android.content.Context import android.os.Bundle @@ -24,8 +24,8 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Liste import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.och.taxi.R -import com.mogo.och.taxi.utils.TaxiMapAssetStyleUtil +import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.utils.TaxiMapAssetStyleUtil /** * taxi司机端前往目的地小地图导航 diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/TaxiRoutingNaviFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/navi/auto/TaxiRoutingNaviFragment.kt similarity index 97% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/TaxiRoutingNaviFragment.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/navi/auto/TaxiRoutingNaviFragment.kt index aaa4bf3927..fc561fc693 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/TaxiRoutingNaviFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/navi/auto/TaxiRoutingNaviFragment.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.navi.auto +package com.mogo.och.unmanned.taxi.ui.navi.auto import android.os.Bundle import com.amap.api.maps.model.LatLng @@ -7,7 +7,7 @@ import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.taxi.R +import com.mogo.och.unmanned.taxi.R /** * @author: wangmingjun diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/OperationalDataItemView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/OperationalDataItemView.kt similarity index 96% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/OperationalDataItemView.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/OperationalDataItemView.kt index 342b466060..5f2ea2dea2 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/OperationalDataItemView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/OperationalDataItemView.kt @@ -1,11 +1,11 @@ -package com.mogo.och.taxi.ui.operational +package com.mogo.och.unmanned.taxi.ui.operational import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.utilcode.kotlin.onClick -import com.mogo.och.taxi.R +import com.mogo.och.unmanned.taxi.R import kotlinx.android.synthetic.main.taxi_operational_data_item_view.view.operationDataContent1Tv import kotlinx.android.synthetic.main.taxi_operational_data_item_view.view.operationDataContentTv import kotlinx.android.synthetic.main.taxi_operational_data_item_view.view.operationDataUnit1Tv diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/OperationalDataUIState.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/OperationalDataUIState.kt similarity index 77% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/OperationalDataUIState.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/OperationalDataUIState.kt index edb73c4845..18a5c2ec9d 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/OperationalDataUIState.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/OperationalDataUIState.kt @@ -1,10 +1,10 @@ -package com.mogo.och.taxi.ui.operational +package com.mogo.och.unmanned.taxi.ui.operational import com.mogo.eagle.core.data.BaseData -import com.mogo.och.taxi.base.IUiState -import com.mogo.och.taxi.bean.QueryOrdersRespBean -import com.mogo.och.taxi.bean.QueryServingDurationRespBean -import com.mogo.och.taxi.bean.QueryTaskRespBean +import com.mogo.och.unmanned.taxi.base.IUiState +import com.mogo.och.unmanned.taxi.bean.QueryOrdersRespBean +import com.mogo.och.unmanned.taxi.bean.QueryServingDurationRespBean +import com.mogo.och.unmanned.taxi.bean.QueryTaskRespBean /** * @author: wangmingjun diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/OperationalDataUiIntent.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/OperationalDataUiIntent.kt similarity index 86% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/OperationalDataUiIntent.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/OperationalDataUiIntent.kt index dac38c7d81..e4b81e5208 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/OperationalDataUiIntent.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/OperationalDataUiIntent.kt @@ -1,6 +1,6 @@ -package com.mogo.och.taxi.ui.operational +package com.mogo.och.unmanned.taxi.ui.operational -import com.mogo.och.taxi.base.IUiIntent +import com.mogo.och.unmanned.taxi.base.IUiIntent /** * @author: wangmingjun diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaskOrOrderAdapter.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/TaskOrOrderAdapter.kt similarity index 96% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaskOrOrderAdapter.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/TaskOrOrderAdapter.kt index b3b00b84fc..03f2d82fd5 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaskOrOrderAdapter.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/TaskOrOrderAdapter.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.operational +package com.mogo.och.unmanned.taxi.ui.operational import android.annotation.SuppressLint import android.content.Context @@ -14,13 +14,13 @@ import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.view.SpacesItemDecoration import com.mogo.och.common.module.utils.DateTimeUtil -import com.mogo.och.taxi.R -import com.mogo.och.taxi.bean.OrderTaskDetailStationBean -import com.mogo.och.taxi.bean.QueryOrdersRespBean -import com.mogo.och.taxi.bean.QueryTaskRespBean -import com.mogo.och.taxi.constant.OperationalOrderStatusEnum -import com.mogo.och.taxi.constant.StationTypeEnum -import com.mogo.och.taxi.constant.TaxiOrderStatusEnum +import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.bean.OrderTaskDetailStationBean +import com.mogo.och.unmanned.taxi.bean.QueryOrdersRespBean +import com.mogo.och.unmanned.taxi.bean.QueryTaskRespBean +import com.mogo.och.unmanned.taxi.constant.OperationalOrderStatusEnum +import com.mogo.och.unmanned.taxi.constant.StationTypeEnum +import com.mogo.och.unmanned.taxi.constant.TaxiOrderStatusEnum /** * @author: wangmingjun diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaxiOperationalDataViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/TaxiOperationalDataViewModel.kt similarity index 95% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaxiOperationalDataViewModel.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/TaxiOperationalDataViewModel.kt index ea9f0af4c6..d68b08887f 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaxiOperationalDataViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/TaxiOperationalDataViewModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.operational +package com.mogo.och.unmanned.taxi.ui.operational import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -8,13 +8,13 @@ import com.mogo.eagle.core.utilcode.util.NetworkUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager -import com.mogo.och.taxi.R -import com.mogo.och.taxi.base.BaseViewModel -import com.mogo.och.taxi.base.IUiIntent -import com.mogo.och.taxi.bean.QueryOrdersRespBean -import com.mogo.och.taxi.bean.QueryServingDurationRespBean -import com.mogo.och.taxi.bean.QueryTaskRespBean -import com.mogo.och.taxi.network.TaxiOperationalDataServiceManager +import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.base.BaseViewModel +import com.mogo.och.unmanned.taxi.base.IUiIntent +import com.mogo.och.unmanned.taxi.bean.QueryOrdersRespBean +import com.mogo.och.unmanned.taxi.bean.QueryServingDurationRespBean +import com.mogo.och.unmanned.taxi.bean.QueryTaskRespBean +import com.mogo.och.unmanned.taxi.network.TaxiOperationalDataServiceManager /** * @author: wangmingjun diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaxiOperationalDialogFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/TaxiOperationalDialogFragment.kt similarity index 96% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaxiOperationalDialogFragment.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/TaxiOperationalDialogFragment.kt index 49780af52c..512440c415 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaxiOperationalDialogFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/TaxiOperationalDialogFragment.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.operational +package com.mogo.och.unmanned.taxi.ui.operational import android.app.Dialog import android.content.Context @@ -18,15 +18,15 @@ import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.common.module.utils.DateTimeUtil -import com.mogo.och.taxi.R -import com.mogo.och.taxi.bean.OrderTaskDetailStationBean -import com.mogo.och.taxi.ui.common.AvoidLeakDialog -import com.mogo.och.taxi.bean.QueryOrdersRespBean -import com.mogo.och.taxi.bean.QueryServingDurationRespBean -import com.mogo.och.taxi.bean.QueryTaskRespBean -import com.mogo.och.taxi.constant.StationTypeEnum -import com.mogo.och.taxi.constant.TaskTypeEnum -import com.mogo.och.taxi.ui.task.TaxiCurrentTaskFragment +import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.bean.OrderTaskDetailStationBean +import com.mogo.och.unmanned.taxi.ui.common.AvoidLeakDialog +import com.mogo.och.unmanned.taxi.bean.QueryOrdersRespBean +import com.mogo.och.unmanned.taxi.bean.QueryServingDurationRespBean +import com.mogo.och.unmanned.taxi.bean.QueryTaskRespBean +import com.mogo.och.unmanned.taxi.constant.StationTypeEnum +import com.mogo.och.unmanned.taxi.constant.TaskTypeEnum +import com.mogo.och.unmanned.taxi.ui.task.TaxiCurrentTaskFragment import kotlinx.android.synthetic.main.taxi_operational_data_view.dayCompletedOrdersView import kotlinx.android.synthetic.main.taxi_operational_data_view.dayTotalOrdersView import kotlinx.android.synthetic.main.taxi_operational_data_view.itemDayTv diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineActivity.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingChooseLineActivity.kt similarity index 96% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineActivity.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingChooseLineActivity.kt index e9c72c0f2a..6a7b72c481 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineActivity.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingChooseLineActivity.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.routing +package com.mogo.och.unmanned.taxi.ui.routing import android.graphics.Point import android.os.Bundle @@ -14,10 +14,10 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.view.SpacesItemDecoration import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.utils.FlowBus -import com.mogo.och.taxi.R -import com.mogo.och.taxi.bean.GrayLineBean -import com.mogo.och.taxi.constant.TaxiDriverEventConst -import com.mogo.och.taxi.ui.debug.DebugView +import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.bean.GrayLineBean +import com.mogo.och.unmanned.taxi.constant.TaxiDriverEventConst +import com.mogo.och.unmanned.taxi.ui.debug.DebugView import kotlinx.android.synthetic.main.routing_choose_task_activity.btnChooseLineSubmit import kotlinx.android.synthetic.main.routing_choose_task_activity.btnClose import kotlinx.android.synthetic.main.routing_choose_task_activity.chooseLineListView diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineAdapter.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingChooseLineAdapter.kt similarity index 96% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineAdapter.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingChooseLineAdapter.kt index 501cc62945..57c1e5128d 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineAdapter.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingChooseLineAdapter.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.routing +package com.mogo.och.unmanned.taxi.ui.routing import android.content.Context import android.graphics.Color @@ -7,8 +7,8 @@ import android.view.View import android.view.ViewGroup import androidx.appcompat.widget.AppCompatTextView import androidx.recyclerview.widget.RecyclerView -import com.mogo.och.taxi.R -import com.mogo.och.taxi.bean.GrayLineBean +import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.bean.GrayLineBean class TaxiRoutingChooseLineAdapter( private val mContext: Context, diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineItemOpenAnimator.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingChooseLineItemOpenAnimator.java similarity index 99% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineItemOpenAnimator.java rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingChooseLineItemOpenAnimator.java index 323ec5e83a..a63a94090d 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineItemOpenAnimator.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingChooseLineItemOpenAnimator.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.routing; +package com.mogo.och.unmanned.taxi.ui.routing; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingChooseLineViewModel.kt similarity index 89% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineViewModel.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingChooseLineViewModel.kt index f6f733248e..62869d5bf7 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingChooseLineViewModel.kt @@ -1,13 +1,13 @@ -package com.mogo.och.taxi.ui.routing +package com.mogo.och.unmanned.taxi.ui.routing import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ToastUtils -import com.mogo.och.taxi.base.BaseViewModel -import com.mogo.och.taxi.base.IUiIntent -import com.mogo.och.taxi.bean.GrayLineBean -import com.mogo.och.taxi.bean.StartGrayAndQueryContrailRsp -import com.mogo.och.taxi.callback.ITaxiRoutingCallback -import com.mogo.och.taxi.ui.debug.DebugView +import com.mogo.och.unmanned.taxi.base.BaseViewModel +import com.mogo.och.unmanned.taxi.base.IUiIntent +import com.mogo.och.unmanned.taxi.bean.GrayLineBean +import com.mogo.och.unmanned.taxi.bean.StartGrayAndQueryContrailRsp +import com.mogo.och.unmanned.taxi.callback.ITaxiRoutingCallback +import com.mogo.och.unmanned.taxi.ui.debug.DebugView class TaxiRoutingChooseLineViewModel : BaseViewModel(), ITaxiRoutingCallback { diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFeedbackDialog.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingFeedbackDialog.kt similarity index 96% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFeedbackDialog.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingFeedbackDialog.kt index dfd851184e..b24e18b4bb 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFeedbackDialog.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingFeedbackDialog.kt @@ -1,11 +1,11 @@ -package com.mogo.och.taxi.ui.routing +package com.mogo.och.unmanned.taxi.ui.routing import android.content.Context import android.widget.ImageView import android.widget.TextView import androidx.lifecycle.LifecycleObserver import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog -import com.mogo.och.taxi.R +import com.mogo.och.unmanned.taxi.R class TaxiRoutingFeedbackDialog : BaseFloatDialog, LifecycleObserver { diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingFragment.kt similarity index 97% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragment.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingFragment.kt index 9b910b80b8..d911191245 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingFragment.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.routing +package com.mogo.och.unmanned.taxi.ui.routing import android.os.Bundle import android.view.View @@ -15,12 +15,12 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.map.AmapNaviToDestinationModel import com.mogo.och.common.module.map.ICommonNaviChangedCallback import com.mogo.och.common.module.utils.FlowBus -import com.mogo.och.taxi.R -import com.mogo.och.taxi.bean.EndGrayTaskFeedbackType -import com.mogo.och.taxi.constant.TaxiDriverEventConst -import com.mogo.och.taxi.constant.TaxiUnmannedConst -import com.mogo.och.taxi.utils.MapMakerManager -import com.mogo.och.taxi.utils.TaskUtils +import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.bean.EndGrayTaskFeedbackType +import com.mogo.och.unmanned.taxi.constant.TaxiDriverEventConst +import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst +import com.mogo.och.unmanned.taxi.utils.MapMakerManager +import com.mogo.och.unmanned.taxi.utils.TaskUtils import kotlinx.android.synthetic.main.routing_fragment.btnChooseTask import kotlinx.android.synthetic.main.routing_fragment.btnFinishTask import kotlinx.android.synthetic.main.routing_fragment.btnStartTask diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragmentViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingFragmentViewModel.kt similarity index 95% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragmentViewModel.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingFragmentViewModel.kt index 839d5a5bb6..d6518ee662 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragmentViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingFragmentViewModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.routing +package com.mogo.och.unmanned.taxi.ui.routing import android.content.Context import android.content.Intent @@ -9,12 +9,12 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.map.AmapNaviToDestinationModel -import com.mogo.och.taxi.base.BaseViewModel -import com.mogo.och.taxi.base.IUiIntent -import com.mogo.och.taxi.bean.GrayLineBean -import com.mogo.och.taxi.bean.StartGrayAndQueryContrailRsp -import com.mogo.och.taxi.callback.ITaxiRoutingCallback -import com.mogo.och.taxi.ui.debug.DebugView +import com.mogo.och.unmanned.taxi.base.BaseViewModel +import com.mogo.och.unmanned.taxi.base.IUiIntent +import com.mogo.och.unmanned.taxi.bean.GrayLineBean +import com.mogo.och.unmanned.taxi.bean.StartGrayAndQueryContrailRsp +import com.mogo.och.unmanned.taxi.callback.ITaxiRoutingCallback +import com.mogo.och.unmanned.taxi.ui.debug.DebugView class TaxiRoutingFragmentViewModel : BaseViewModel(), ITaxiRoutingCallback { diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingLoadingDialog.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingLoadingDialog.kt similarity index 95% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingLoadingDialog.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingLoadingDialog.kt index 2b7c726e84..5f1e714142 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingLoadingDialog.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingLoadingDialog.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.routing +package com.mogo.och.unmanned.taxi.ui.routing import android.animation.ObjectAnimator import android.content.Context @@ -6,7 +6,7 @@ import android.view.animation.LinearInterpolator import androidx.lifecycle.LifecycleObserver import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog import com.mogo.eagle.core.utilcode.util.ToastUtils -import com.mogo.och.taxi.R +import com.mogo.och.unmanned.taxi.R import kotlinx.android.synthetic.main.dialog_routing_loading.dialog_loading_text import kotlinx.android.synthetic.main.dialog_routing_loading.dialog_loading_view diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingModel.kt similarity index 96% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingModel.kt index b4a02d84c4..35a9986d17 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.routing +package com.mogo.och.unmanned.taxi.ui.routing import android.content.Context import android.text.TextUtils @@ -26,19 +26,19 @@ import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatu import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager import com.mogo.och.common.module.utils.OCHThreadPoolManager -import com.mogo.och.taxi.bean.ContrailBean -import com.mogo.och.taxi.bean.EndGrayContrailTaskReq -import com.mogo.och.taxi.bean.EndGrayTaskFeedbackType -import com.mogo.och.taxi.bean.GrayLineBean -import com.mogo.och.taxi.bean.QueryGrayContrailListRsp -import com.mogo.och.taxi.bean.StartGrayAndQueryContrailRsp -import com.mogo.och.taxi.bean.SubmitGrayLineIssueLocationReq -import com.mogo.och.taxi.callback.ITaxiControllerStatusCallback -import com.mogo.och.taxi.callback.ITaxiOrderStatusCallback -import com.mogo.och.taxi.callback.ITaxiRoutingCallback -import com.mogo.och.taxi.constant.TaxiUnmannedConst -import com.mogo.och.taxi.network.TaxiRoutingServiceManager -import com.mogo.och.taxi.ui.debug.DebugView +import com.mogo.och.unmanned.taxi.bean.ContrailBean +import com.mogo.och.unmanned.taxi.bean.EndGrayContrailTaskReq +import com.mogo.och.unmanned.taxi.bean.EndGrayTaskFeedbackType +import com.mogo.och.unmanned.taxi.bean.GrayLineBean +import com.mogo.och.unmanned.taxi.bean.QueryGrayContrailListRsp +import com.mogo.och.unmanned.taxi.bean.StartGrayAndQueryContrailRsp +import com.mogo.och.unmanned.taxi.bean.SubmitGrayLineIssueLocationReq +import com.mogo.och.unmanned.taxi.callback.ITaxiControllerStatusCallback +import com.mogo.och.unmanned.taxi.callback.ITaxiOrderStatusCallback +import com.mogo.och.unmanned.taxi.callback.ITaxiRoutingCallback +import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst +import com.mogo.och.unmanned.taxi.network.TaxiRoutingServiceManager +import com.mogo.och.unmanned.taxi.ui.debug.DebugView import java.util.concurrent.ConcurrentHashMap object TaxiRoutingModel { diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingUiIntent.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingUiIntent.kt similarity index 83% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingUiIntent.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingUiIntent.kt index 6a39b3f763..664ea3d369 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingUiIntent.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingUiIntent.kt @@ -1,8 +1,8 @@ -package com.mogo.och.taxi.ui.routing +package com.mogo.och.unmanned.taxi.ui.routing -import com.mogo.och.taxi.base.IUiIntent -import com.mogo.och.taxi.bean.EndGrayTaskFeedbackType -import com.mogo.och.taxi.bean.GrayLineBean +import com.mogo.och.unmanned.taxi.base.IUiIntent +import com.mogo.och.unmanned.taxi.bean.EndGrayTaskFeedbackType +import com.mogo.och.unmanned.taxi.bean.GrayLineBean sealed class TaxiRoutingUiIntent : IUiIntent { diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingUiState.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingUiState.kt similarity index 81% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingUiState.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingUiState.kt index 9aef55856b..c455353503 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingUiState.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingUiState.kt @@ -1,8 +1,8 @@ -package com.mogo.och.taxi.ui.routing +package com.mogo.och.unmanned.taxi.ui.routing -import com.mogo.och.taxi.base.IUiState -import com.mogo.och.taxi.bean.ContrailBean -import com.mogo.och.taxi.bean.GrayLineBean +import com.mogo.och.unmanned.taxi.base.IUiState +import com.mogo.och.unmanned.taxi.bean.ContrailBean +import com.mogo.och.unmanned.taxi.bean.GrayLineBean data class TaxiRoutingUiState(val routingUiState: RoutingUIState) : IUiState diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaskUiIntent.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaskUiIntent.kt similarity index 86% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaskUiIntent.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaskUiIntent.kt index ebfc321f27..58572fdb60 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaskUiIntent.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaskUiIntent.kt @@ -1,6 +1,6 @@ -package com.mogo.och.taxi.ui.task +package com.mogo.och.unmanned.taxi.ui.task -import com.mogo.och.taxi.base.IUiIntent +import com.mogo.och.unmanned.taxi.base.IUiIntent /** * @author: wangmingjun diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaskUiState.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaskUiState.kt similarity index 80% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaskUiState.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaskUiState.kt index 192297a0ee..8630a75b54 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaskUiState.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaskUiState.kt @@ -1,8 +1,8 @@ -package com.mogo.och.taxi.ui.task +package com.mogo.och.unmanned.taxi.ui.task -import com.mogo.och.taxi.base.IUiState -import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean -import com.mogo.och.taxi.bean.StartServiceRespBean +import com.mogo.och.unmanned.taxi.base.IUiState +import com.mogo.och.unmanned.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.unmanned.taxi.bean.StartServiceRespBean data class UnmannedState(val taskWithOrderUIState: TaskWithOrderUIState) : IUiState diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskFragment.kt similarity index 97% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskFragment.kt index f7aa4113b9..49bae99a58 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.task +package com.mogo.och.unmanned.taxi.ui.task import android.graphics.Color import android.graphics.drawable.GradientDrawable @@ -29,19 +29,19 @@ import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.FlowBus import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.common.module.wigets.OCHCommitDialog -import com.mogo.och.taxi.R -import com.mogo.och.taxi.bean.OrderDetail -import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean -import com.mogo.och.taxi.bean.StartServiceRespBean -import com.mogo.och.taxi.constant.TaskStatusEnum -import com.mogo.och.taxi.constant.TaskTypeEnum -import com.mogo.och.taxi.constant.TaxiDriverEventConst -import com.mogo.och.taxi.constant.TaxiOrderStatusEnum -import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.TAXI_END_MAP_MAKER -import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.TAXI_START_MAP_MAKER -import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.TYPE_MARKER_TAXI_ORDER -import com.mogo.och.taxi.utils.MapMakerManager -import com.mogo.och.taxi.utils.TaskUtils +import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.bean.OrderDetail +import com.mogo.och.unmanned.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.unmanned.taxi.bean.StartServiceRespBean +import com.mogo.och.unmanned.taxi.constant.TaskStatusEnum +import com.mogo.och.unmanned.taxi.constant.TaskTypeEnum +import com.mogo.och.unmanned.taxi.constant.TaxiDriverEventConst +import com.mogo.och.unmanned.taxi.constant.TaxiOrderStatusEnum +import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst.Companion.TAXI_END_MAP_MAKER +import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst.Companion.TAXI_START_MAP_MAKER +import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst.Companion.TYPE_MARKER_TAXI_ORDER +import com.mogo.och.unmanned.taxi.utils.MapMakerManager +import com.mogo.och.unmanned.taxi.utils.TaskUtils import kotlinx.android.synthetic.main.task_fragment_current.cancelOrder import kotlinx.android.synthetic.main.task_fragment_current.endPoint import kotlinx.android.synthetic.main.task_fragment_current.endStationName diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskViewModel.kt similarity index 95% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskViewModel.kt index e57c36b2f5..818fca55e1 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskViewModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.task +package com.mogo.och.unmanned.taxi.ui.task import com.mogo.commons.AbsMogoApplication import com.mogo.commons.module.status.MogoStatusManager @@ -20,21 +20,21 @@ import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager import com.mogo.och.common.module.utils.ToastUtilsOch import com.mogo.och.common.module.voice.VoiceNotice -import com.mogo.och.taxi.R -import com.mogo.och.taxi.base.BaseViewModel -import com.mogo.och.taxi.base.IUiIntent -import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean -import com.mogo.och.taxi.bean.StartServiceRespBean -import com.mogo.och.taxi.bean.TrajectoryListRespBean -import com.mogo.och.taxi.callback.ITaxiCarServiceCallback -import com.mogo.och.taxi.callback.ITaxiTaskWithOrderCallback -import com.mogo.och.taxi.constant.TaskStatusEnum -import com.mogo.och.taxi.constant.TaskTypeEnum -import com.mogo.och.taxi.constant.TaxiOrderStatusEnum -import com.mogo.och.taxi.constant.TaxiUnmannedConst -import com.mogo.och.taxi.network.TaxiTaskWithOrderServiceManager -import com.mogo.och.taxi.ui.debug.DebugView -import com.mogo.och.taxi.utils.TaxiTrajectoryManager +import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.base.BaseViewModel +import com.mogo.och.unmanned.taxi.base.IUiIntent +import com.mogo.och.unmanned.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.unmanned.taxi.bean.StartServiceRespBean +import com.mogo.och.unmanned.taxi.bean.TrajectoryListRespBean +import com.mogo.och.unmanned.taxi.callback.ITaxiCarServiceCallback +import com.mogo.och.unmanned.taxi.callback.ITaxiTaskWithOrderCallback +import com.mogo.och.unmanned.taxi.constant.TaskStatusEnum +import com.mogo.och.unmanned.taxi.constant.TaskTypeEnum +import com.mogo.och.unmanned.taxi.constant.TaxiOrderStatusEnum +import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst +import com.mogo.och.unmanned.taxi.network.TaxiTaskWithOrderServiceManager +import com.mogo.och.unmanned.taxi.ui.debug.DebugView +import com.mogo.och.unmanned.taxi.utils.TaxiTrajectoryManager /** * @author: wangmingjun diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiNextTaskFragment.kt similarity index 92% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiNextTaskFragment.kt index 1951dbf795..cef28b81e6 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiNextTaskFragment.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.task +package com.mogo.och.unmanned.taxi.ui.task import android.graphics.Color import android.graphics.drawable.GradientDrawable @@ -9,12 +9,12 @@ import com.mogo.commons.mvp.BaseFragment import com.mogo.eagle.core.function.main.MainMoGoApplication import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.och.taxi.R -import com.mogo.och.taxi.bean.OrderDetail -import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean -import com.mogo.och.taxi.constant.TaskStatusEnum -import com.mogo.och.taxi.constant.TaskTypeEnum -import com.mogo.och.taxi.utils.TaskUtils +import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.bean.OrderDetail +import com.mogo.och.unmanned.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.unmanned.taxi.constant.TaskStatusEnum +import com.mogo.och.unmanned.taxi.constant.TaskTypeEnum +import com.mogo.och.unmanned.taxi.utils.TaskUtils import kotlinx.android.synthetic.main.task_fragment_current.cancelOrder import kotlinx.android.synthetic.main.task_fragment_current.endStationName import kotlinx.android.synthetic.main.task_fragment_current.mCurrentTaskLayout diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiOrderCancelDialog.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiOrderCancelDialog.java similarity index 96% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiOrderCancelDialog.java rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiOrderCancelDialog.java index 58d8a05621..2b6f62a4b5 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiOrderCancelDialog.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiOrderCancelDialog.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.task; +package com.mogo.och.unmanned.taxi.ui.task; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI; @@ -22,9 +22,11 @@ import android.widget.TextView; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.ToastUtils; -import com.mogo.och.taxi.R; -import com.mogo.och.taxi.constant.TaxiOrderCancelReasons; -import com.mogo.och.taxi.constant.TaxiOrderStatusEnum; +import com.mogo.och.unmanned.taxi.R; +import com.mogo.och.unmanned.taxi.constant.TaxiOrderCancelReasons; +import com.mogo.och.unmanned.taxi.constant.TaxiOrderStatusEnum; +import com.mogo.och.unmanned.taxi.constant.TaxiOrderCancelReasons; +import com.mogo.och.unmanned.taxi.constant.TaxiOrderStatusEnum; import java.lang.ref.WeakReference; diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt similarity index 98% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt index ebd3871368..bffa58de8f 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.task +package com.mogo.och.unmanned.taxi.ui.task import android.content.Context import android.net.ConnectivityManager @@ -58,27 +58,27 @@ import com.mogo.och.common.module.map.AmapNaviToDestinationModel import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil.coordinateConverterWgsToGcjLocations import com.mogo.och.common.module.utils.OCHThreadPoolManager import com.mogo.och.common.module.voice.VoiceNotice -import com.mogo.och.taxi.bean.PrepareTaskRespBean -import com.mogo.och.taxi.bean.QueryCarOrderByNoRespBean -import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean -import com.mogo.och.taxi.bean.StartServiceRespBean -import com.mogo.och.taxi.bean.TrajectoryListRespBean -import com.mogo.och.taxi.callback.IOCHTaxiAutopilotPlanningCallback -import com.mogo.och.taxi.callback.ITaxiADASStatusCallback -import com.mogo.och.taxi.callback.ITaxiCarServiceCallback -import com.mogo.och.taxi.callback.ITaxiControllerStatusCallback -import com.mogo.och.taxi.callback.ITaxiOrderStatusCallback -import com.mogo.och.taxi.callback.ITaxiTaskWithOrderCallback -import com.mogo.och.taxi.constant.TaskStatusEnum -import com.mogo.och.taxi.constant.TaskTypeEnum -import com.mogo.och.taxi.constant.TaxiOrderStatusEnum -import com.mogo.och.taxi.constant.TaxiUnmannedConst -import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.BUSINESSTYPE -import com.mogo.och.taxi.network.TaxiTaskWithOrderServiceManager -import com.mogo.och.taxi.ui.debug.DebugView -import com.mogo.och.taxi.utils.RxJavaUtils -import com.mogo.och.taxi.utils.TaxiAnalyticsManager -import com.mogo.och.taxi.utils.TaxiTrajectoryManager +import com.mogo.och.unmanned.taxi.bean.PrepareTaskRespBean +import com.mogo.och.unmanned.taxi.bean.QueryCarOrderByNoRespBean +import com.mogo.och.unmanned.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.unmanned.taxi.bean.StartServiceRespBean +import com.mogo.och.unmanned.taxi.bean.TrajectoryListRespBean +import com.mogo.och.unmanned.taxi.callback.IOCHTaxiAutopilotPlanningCallback +import com.mogo.och.unmanned.taxi.callback.ITaxiADASStatusCallback +import com.mogo.och.unmanned.taxi.callback.ITaxiCarServiceCallback +import com.mogo.och.unmanned.taxi.callback.ITaxiControllerStatusCallback +import com.mogo.och.unmanned.taxi.callback.ITaxiOrderStatusCallback +import com.mogo.och.unmanned.taxi.callback.ITaxiTaskWithOrderCallback +import com.mogo.och.unmanned.taxi.constant.TaskStatusEnum +import com.mogo.och.unmanned.taxi.constant.TaskTypeEnum +import com.mogo.och.unmanned.taxi.constant.TaxiOrderStatusEnum +import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst +import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst.Companion.BUSINESSTYPE +import com.mogo.och.unmanned.taxi.network.TaxiTaskWithOrderServiceManager +import com.mogo.och.unmanned.taxi.ui.debug.DebugView +import com.mogo.och.unmanned.taxi.utils.RxJavaUtils +import com.mogo.och.unmanned.taxi.utils.TaxiAnalyticsManager +import com.mogo.och.unmanned.taxi.utils.TaxiTrajectoryManager import com.zhjt.mogo.adas.data.AdasConstants import com.zhjt.service.chain.ChainLog import io.reactivex.Observable diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskTabFragment.kt similarity index 97% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskTabFragment.kt index 5d0d0300d8..01663e996a 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskTabFragment.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.ui.task +package com.mogo.och.unmanned.taxi.ui.task import android.graphics.Color import android.graphics.Typeface @@ -16,9 +16,9 @@ import com.mogo.commons.mvp.BaseFragment import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.common.module.utils.FlowBus -import com.mogo.och.taxi.R -import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean -import com.mogo.och.taxi.constant.TaxiDriverEventConst +import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.unmanned.taxi.constant.TaxiDriverEventConst import kotlinx.android.synthetic.main.taxi_server_orders_panel.module_och_taxi_tab import kotlinx.android.synthetic.main.taxi_server_orders_panel.module_och_taxi_view_pager import kotlinx.android.synthetic.main.taxi_server_orders_panel.wait_order_num diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/MapMakerManager.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/MapMakerManager.kt similarity index 98% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/MapMakerManager.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/MapMakerManager.kt index 497a978f18..ab5901c9cc 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/MapMakerManager.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/MapMakerManager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.utils +package com.mogo.och.unmanned.taxi.utils import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/RxJavaUtils.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/RxJavaUtils.kt similarity index 98% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/RxJavaUtils.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/RxJavaUtils.kt index b93958f704..77bdcce617 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/RxJavaUtils.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/RxJavaUtils.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.utils +package com.mogo.och.unmanned.taxi.utils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import io.reactivex.exceptions.UndeliverableException diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TPRouteDataTestUtils.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TPRouteDataTestUtils.java similarity index 99% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TPRouteDataTestUtils.java rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TPRouteDataTestUtils.java index 35ed50851a..f3c4e54014 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TPRouteDataTestUtils.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TPRouteDataTestUtils.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.utils; +package com.mogo.och.unmanned.taxi.utils; import org.json.JSONArray; import org.json.JSONException; diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaskUtils.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaskUtils.kt similarity index 98% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaskUtils.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaskUtils.kt index 1e35ef8de7..b1fb456b4b 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaskUtils.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaskUtils.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.utils +package com.mogo.och.unmanned.taxi.utils import android.text.Spanned import androidx.core.text.HtmlCompat diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaxiAnalyticsManager.java similarity index 98% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaxiAnalyticsManager.java index ebc7184d6d..a893501332 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaxiAnalyticsManager.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.utils; +package com.mogo.och.unmanned.taxi.utils; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI; import android.text.TextUtils; @@ -13,7 +13,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.DateTimeUtils; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager; -import com.mogo.och.taxi.constant.TaxiUnmannedConst; +import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst; import java.util.HashMap; diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiMapAssetStyleUtil.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaxiMapAssetStyleUtil.java similarity index 97% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiMapAssetStyleUtil.java rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaxiMapAssetStyleUtil.java index 4e991eda96..252ba3a7c2 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiMapAssetStyleUtil.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaxiMapAssetStyleUtil.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.utils; +package com.mogo.och.unmanned.taxi.utils; import android.content.Context; diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaxiTrajectoryManager.java similarity index 97% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaxiTrajectoryManager.java index bf51220493..a6765abf80 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaxiTrajectoryManager.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.utils; +package com.mogo.och.unmanned.taxi.utils; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI; @@ -9,13 +9,13 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.GsonUtils; import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager; -import com.mogo.och.taxi.bean.OrderDetail; -import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean; -import com.mogo.och.taxi.bean.TrajectoryListRespBean; -import com.mogo.och.taxi.constant.TaskStatusEnum; -import com.mogo.och.taxi.constant.TaxiUnmannedConst; -import com.mogo.och.taxi.ui.debug.DebugView; -import com.mogo.och.taxi.ui.task.TaxiTaskModel; +import com.mogo.och.unmanned.taxi.bean.OrderDetail; +import com.mogo.och.unmanned.taxi.bean.QueryCurrentTaskRespBean; +import com.mogo.och.unmanned.taxi.bean.TrajectoryListRespBean; +import com.mogo.och.unmanned.taxi.constant.TaskStatusEnum; +import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst; +import com.mogo.och.unmanned.taxi.ui.debug.DebugView; +import com.mogo.och.unmanned.taxi.ui.task.TaxiTaskModel; import java.util.ArrayList; import java.util.Arrays; diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_operational_data_view.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_operational_data_view.xml index a3834256a0..1ad75457e7 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_operational_data_view.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_operational_data_view.xml @@ -45,7 +45,7 @@ app:layout_constraintLeft_toLeftOf="@+id/line" app:layout_constraintTop_toBottomOf="@+id/operationDataTitle"> - - - - - - diff --git a/OCH/taxi/unmanned-passenger/src/main/AndroidManifest.xml b/OCH/taxi/unmanned-passenger/src/main/AndroidManifest.xml index 667dac6a6b..af1348c218 100644 --- a/OCH/taxi/unmanned-passenger/src/main/AndroidManifest.xml +++ b/OCH/taxi/unmanned-passenger/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="com.mogo.och.unmanned.taxi.passenger"> - * Created by zhangpan on 2019-10-18. - * Description: - * - */ -@IntDef(NORMAL, SMOOTH, WORM, COLOR, SCALE) -@kotlin.annotation.Retention(AnnotationRetention.SOURCE) -@Target(AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.FIELD) -annotation class AIndicatorSlideMode diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/TaxiUnmannedPassengerProvider.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/TaxiUnmannedPassengerProvider.kt similarity index 86% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/TaxiUnmannedPassengerProvider.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/TaxiUnmannedPassengerProvider.kt index 2666692b1c..47507dfda8 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/TaxiUnmannedPassengerProvider.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/TaxiUnmannedPassengerProvider.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger +package com.mogo.och.unmanned.passenger import android.content.Context import android.view.View @@ -7,10 +7,10 @@ import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.common.module.constant.OchCommonConst -import com.mogo.och.common.module.biz.provider.CommonService import com.mogo.och.common.module.biz.provider.CommonServiceImpl -import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment -import com.mogo.och.taxi.passenger.ui.statusview.StatusBarView +import com.mogo.och.unmanned.passenger.ui.TaxiPassengerBaseFragment +import com.mogo.och.unmanned.passenger.ui.statusview.StatusBarView + /** * @author congtaowang diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerBaseRespBean.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerBaseRespBean.java similarity index 81% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerBaseRespBean.java rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerBaseRespBean.java index 817e735e93..d3b0cef254 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerBaseRespBean.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerBaseRespBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.bean; +package com.mogo.och.unmanned.passenger.bean; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerCheckPhoneUpdateOrderReqBean.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerCheckPhoneUpdateOrderReqBean.java similarity index 90% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerCheckPhoneUpdateOrderReqBean.java rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerCheckPhoneUpdateOrderReqBean.java index c0e94c3bf2..e04b9b290a 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerCheckPhoneUpdateOrderReqBean.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerCheckPhoneUpdateOrderReqBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.bean; +package com.mogo.och.unmanned.passenger.bean; /** * Created by pangfan on 2021/8/19 diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerGetTrajectoryByLineIdRespBean.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerGetTrajectoryByLineIdRespBean.java similarity index 97% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerGetTrajectoryByLineIdRespBean.java rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerGetTrajectoryByLineIdRespBean.java index cb37b3d52f..ae97586c91 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerGetTrajectoryByLineIdRespBean.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerGetTrajectoryByLineIdRespBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.bean; +package com.mogo.och.unmanned.passenger.bean; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryReqBean.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrderQueryReqBean.java similarity index 87% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryReqBean.java rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrderQueryReqBean.java index 59efb4da9d..7ce10c0fa0 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryReqBean.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrderQueryReqBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.bean; +package com.mogo.och.unmanned.passenger.bean; /** * Created by pangfan on 2021/8/19 diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrderQueryRespBean.java similarity index 84% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrderQueryRespBean.java index 04fdc7b19b..bfe1df7d7c 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrderQueryRespBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.bean; +package com.mogo.och.unmanned.passenger.bean; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java similarity index 98% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java index a780bbff01..f38755a0c2 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.bean; +package com.mogo.och.unmanned.passenger.bean; import com.mogo.eagle.core.data.BaseData; import com.mogo.och.taxi.passenger.ui.model.order.BaseOrderBean; diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerStartReqBean.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerStartReqBean.java similarity index 89% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerStartReqBean.java rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerStartReqBean.java index 86ef45ca09..58cf5da494 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerStartReqBean.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerStartReqBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.bean; +package com.mogo.och.unmanned.passenger.bean; /** * Created by pangfan on 2021/8/19 diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerVideoPlay.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerVideoPlay.kt similarity index 69% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerVideoPlay.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerVideoPlay.kt index d5ae6a96c6..da6e23a8e8 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerVideoPlay.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerVideoPlay.kt @@ -1,3 +1,3 @@ -package com.mogo.och.taxi.passenger.bean +package com.mogo.och.unmanned.passenger.bean class TaxiPassengerVideoPlay(var url: String, var imageUrl: String, var title: String, var type: Int) \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt similarity index 69% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt index 96ac523006..6821f3cf27 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt @@ -1,7 +1,4 @@ -package com.mogo.och.taxi.passenger.callback - -import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean -import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean +package com.mogo.och.unmanned.passenger.callback /** * Created on 2021/9/8 diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/constant/TaxiPassengerConst.kt similarity index 98% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/constant/TaxiPassengerConst.kt index 75e78bedbe..6419299b02 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/constant/TaxiPassengerConst.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.constant +package com.mogo.och.unmanned.passenger.constant /** * Created on 2021/12/6 diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt similarity index 96% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt index 6f2c23c870..d7f0dd1487 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.model +package com.mogo.och.unmanned.passenger.model import com.alibaba.android.arouter.utils.TextUtils import com.elegant.network.utils.GsonUtil @@ -8,7 +8,6 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager -import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ToastUtils @@ -19,11 +18,11 @@ import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManage import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.voice.VoiceNotice -import com.mogo.och.taxi.passenger.bean.TaxiPassengerBaseRespBean -import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst import com.mogo.och.taxi.passenger.ui.model.order.TaxiPassengerOrderStatusEnum -import com.mogo.och.taxi.passenger.network.TaxiPassengerServiceManager -import com.mogo.och.taxi.passenger.utils.TaxiPassengerAnalyticsManager +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerBaseRespBean +import com.mogo.och.unmanned.passenger.constant.TaxiPassengerConst +import com.mogo.och.unmanned.passenger.network.TaxiPassengerServiceManager +import com.mogo.och.unmanned.passenger.utils.TaxiPassengerAnalyticsManager import java.lang.StringBuilder object AutopilotManager : IOchAutopilotStatusListener { diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt similarity index 95% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt index 698db0af90..1d956f25ea 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.model +package com.mogo.och.unmanned.passenger.model import android.annotation.SuppressLint import android.content.Context @@ -29,19 +29,19 @@ import com.mogo.och.common.module.manager.loop.LoopInfo import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.voice.VoiceNotice -import com.mogo.och.taxi.passenger.bean.TaxiPassengerBaseRespBean -import com.mogo.och.taxi.passenger.bean.TaxiPassengerGetTrajectoryByLineIdRespBean -import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean -import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean -import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback -import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst -import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst.Companion.TaskType_NONE -import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst.Companion.TaskType_VIRTUAL import com.mogo.och.taxi.passenger.ui.model.order.TaxiPassengerOrderStatusEnum import com.mogo.och.taxi.passenger.ui.model.order.TaxiPassengerOrderStatusEnum.Companion.valueOf -import com.mogo.och.taxi.passenger.network.TaxiPassengerServiceManager import com.mogo.och.taxi.passenger.ui.model.order.OrderModel -import com.mogo.och.taxi.passenger.utils.TaxiPassengerAnalyticsManager +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerBaseRespBean +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerGetTrajectoryByLineIdRespBean +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerOrderQueryRespBean +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean +import com.mogo.och.unmanned.passenger.callback.IOCHTaxiPassengerOrderStatusCallback +import com.mogo.och.unmanned.passenger.constant.TaxiPassengerConst +import com.mogo.och.unmanned.passenger.constant.TaxiPassengerConst.Companion.TaskType_NONE +import com.mogo.och.unmanned.passenger.constant.TaxiPassengerConst.Companion.TaskType_VIRTUAL +import com.mogo.och.unmanned.passenger.network.TaxiPassengerServiceManager +import com.mogo.och.unmanned.passenger.utils.TaxiPassengerAnalyticsManager import java.util.concurrent.ConcurrentHashMap /** diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/network/TaxiPassengerServiceApi.kt similarity index 84% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/network/TaxiPassengerServiceApi.kt index c5eb87dd0a..4fc66c9f4a 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/network/TaxiPassengerServiceApi.kt @@ -1,14 +1,14 @@ -package com.mogo.och.taxi.passenger.network +package com.mogo.och.unmanned.passenger.network import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.storage.SharedPrefsMgr -import com.mogo.och.taxi.passenger.bean.TaxiPassengerBaseRespBean -import com.mogo.och.taxi.passenger.bean.TaxiPassengerCheckPhoneUpdateOrderReqBean -import com.mogo.och.taxi.passenger.bean.TaxiPassengerGetTrajectoryByLineIdRespBean -import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryReqBean -import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean -import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean -import com.mogo.och.taxi.passenger.bean.TaxiPassengerStartReqBean +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerBaseRespBean +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerCheckPhoneUpdateOrderReqBean +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerGetTrajectoryByLineIdRespBean +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerOrderQueryReqBean +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerOrderQueryRespBean +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerStartReqBean import io.reactivex.Observable import retrofit2.http.Body import retrofit2.http.GET diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/network/TaxiPassengerServiceManager.kt similarity index 89% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/network/TaxiPassengerServiceManager.kt index dce17155e1..2139fe50c0 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/network/TaxiPassengerServiceManager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.network +package com.mogo.och.unmanned.passenger.network import android.content.Context import com.mogo.commons.AbsMogoApplication @@ -10,13 +10,13 @@ import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.network.OchCommonSubscribeImpl import com.mogo.och.common.module.network.interceptor.transformTry -import com.mogo.och.taxi.passenger.bean.TaxiPassengerBaseRespBean -import com.mogo.och.taxi.passenger.bean.TaxiPassengerCheckPhoneUpdateOrderReqBean -import com.mogo.och.taxi.passenger.bean.TaxiPassengerGetTrajectoryByLineIdRespBean -import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryReqBean -import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean -import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean -import com.mogo.och.taxi.passenger.bean.TaxiPassengerStartReqBean +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerBaseRespBean +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerCheckPhoneUpdateOrderReqBean +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerGetTrajectoryByLineIdRespBean +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerOrderQueryReqBean +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerOrderQueryRespBean +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerStartReqBean import io.reactivex.Observable /** diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt similarity index 93% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt index 9b071036df..0753d362b2 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.presenter +package com.mogo.och.unmanned.passenger.presenter import androidx.lifecycle.LifecycleOwner import com.mogo.commons.AbsMogoApplication @@ -8,14 +8,14 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager -import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean -import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean import com.mogo.och.taxi.passenger.ui.model.order.TaxiPassengerOrderStatusEnum -import com.mogo.och.taxi.passenger.model.TaxiPassengerModel -import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment import com.mogo.och.taxi.passenger.ui.model.order.BaseOrderBean import com.mogo.och.taxi.passenger.ui.model.order.OrderListener import com.mogo.och.taxi.passenger.ui.model.order.OrderModel +import com.mogo.och.unmanned.passenger.callback.IOCHTaxiPassengerOrderStatusCallback +import com.mogo.och.unmanned.passenger.model.TaxiPassengerModel +import com.mogo.och.unmanned.passenger.ui.TaxiPassengerBaseFragment /** * @author: wangmingjun diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt similarity index 97% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt index 56c7932740..e7f94b5c94 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui +package com.mogo.och.unmanned.passenger.ui import android.animation.Animator import android.animation.AnimatorSet @@ -21,14 +21,14 @@ import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.manager.xiaozhi.ZhiStateManager import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.voice.VoiceNotice -import com.mogo.och.taxi.passenger.R -import com.mogo.och.taxi.passenger.presenter.BaseTaxiPassengerPresenter -import com.mogo.och.taxi.passenger.ui.arrived.ArrivedView +import com.mogo.och.unmanned.taxi.passenger.R import com.mogo.och.taxi.passenger.ui.bar.LeftBarView -import com.mogo.och.taxi.passenger.ui.bottom.BottomBar -import com.mogo.och.taxi.passenger.ui.checkstartautopilot.ChekAndStartAutopilotView import com.mogo.och.taxi.passenger.ui.bar.RightBarView -import com.mogo.och.taxi.passenger.ui.statusview.StatusBarView +import com.mogo.och.unmanned.passenger.presenter.BaseTaxiPassengerPresenter +import com.mogo.och.unmanned.passenger.ui.arrived.ArrivedView +import com.mogo.och.unmanned.passenger.ui.bottom.BottomBar +import com.mogo.och.unmanned.passenger.ui.checkstartautopilot.ChekAndStartAutopilotView +import com.mogo.och.unmanned.passenger.ui.statusview.StatusBarView import io.reactivex.disposables.Disposable import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.arrivedView import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.bottom @@ -180,7 +180,7 @@ class TaxiPassengerBaseFragment() : } }) - arrivedView.arrivedVisilityChangeListenr = object :ArrivedView.ArrivedVisilityChangeListenr{ + arrivedView.arrivedVisilityChangeListenr = object : ArrivedView.ArrivedVisilityChangeListenr{ override fun isShow(show: Boolean) { CallerLogger.d(M_TAXI_P + TAG, "arrived ${show}") if(arrivedView.visibility==View.GONE&&chekAndStartAutopilotView.visibility==View.GONE){ diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerTaxiView.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerTaxiView.java similarity index 78% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerTaxiView.java rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerTaxiView.java index 502d981399..839b0fc903 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerTaxiView.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerTaxiView.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui; +package com.mogo.och.unmanned.passenger.ui; import com.mogo.commons.mvp.IView; diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/ArrivedView.kt similarity index 96% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/ArrivedView.kt index a0707f8001..2343b811ee 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/ArrivedView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.arrived +package com.mogo.och.unmanned.passenger.ui.arrived import android.animation.Animator import android.animation.AnimatorListenerAdapter @@ -16,9 +16,9 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.common.module.manager.xiaozhi.ZhiViewmanager import com.mogo.och.common.module.utils.BigFrameAnimatorContainer import com.mogo.och.common.module.utils.RxUtils -import com.mogo.och.taxi.passenger.R -import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment -import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout +import com.mogo.och.unmanned.passenger.ui.TaxiPassengerBaseFragment +import com.mogo.och.unmanned.passenger.widget.WindowRelativeLayout +import com.mogo.och.unmanned.taxi.passenger.R import io.reactivex.disposables.Disposable import kotlinx.android.synthetic.main.taxt_u_p_arrived_end_panel.view.aciv_bg import kotlinx.android.synthetic.main.taxt_u_p_arrived_end_panel.view.aciv_close diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/ArrivedViewModel.kt similarity index 92% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedViewModel.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/ArrivedViewModel.kt index 5b70eafb52..ac1994c46b 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/ArrivedViewModel.kt @@ -1,9 +1,9 @@ -package com.mogo.och.taxi.passenger.ui.arrived +package com.mogo.och.unmanned.passenger.ui.arrived import androidx.lifecycle.ViewModel import com.mogo.och.common.module.manager.distance.IDistanceListener import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager -import com.mogo.och.taxi.passenger.model.TaxiPassengerModel +import com.mogo.och.unmanned.passenger.model.TaxiPassengerModel class ArrivedViewModel : ViewModel(), IDistanceListener { diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/RightRearCamView.kt similarity index 98% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/RightRearCamView.kt index a60c102356..e56952e288 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/RightRearCamView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.arrived +package com.mogo.och.unmanned.passenger.ui.arrived import android.content.Context import android.graphics.Bitmap @@ -16,7 +16,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider -import com.mogo.och.taxi.passenger.R +import com.mogo.och.unmanned.taxi.passenger.R import kotlinx.android.synthetic.main.taxt_u_p_right_rear_cam.view.actv_cam_position_group import kotlinx.android.synthetic.main.taxt_u_p_right_rear_cam.view.v_video_right_rear diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/bottom/BottomBar.kt similarity index 96% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/bottom/BottomBar.kt index 66a536c7e5..fff921dc45 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/bottom/BottomBar.kt @@ -1,10 +1,10 @@ -package com.mogo.och.taxi.passenger.ui.bottom +package com.mogo.och.unmanned.passenger.ui.bottom import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout -import com.mogo.och.taxi.passenger.R +import com.mogo.och.unmanned.taxi.passenger.R import kotlinx.android.synthetic.main.taxt_u_p_bottom_bar.view.actv_overmap import kotlinx.android.synthetic.main.taxt_u_p_bottom_bar.view.actv_video import kotlinx.android.synthetic.main.taxt_u_p_bottom_bar.view.actv_precisionmap diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomCheckView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/bottom/BottomCheckView.kt similarity index 97% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomCheckView.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/bottom/BottomCheckView.kt index 04bb90cad4..7a5b5258ad 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomCheckView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/bottom/BottomCheckView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.view.bottom +package com.mogo.och.unmanned.passenger.ui.bottom import android.content.Context import android.util.AttributeSet @@ -6,7 +6,7 @@ import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat -import com.mogo.och.taxi.passenger.R +import com.mogo.och.unmanned.taxi.passenger.R import kotlinx.android.synthetic.main.taxt_u_p_bottom_check.view.aciv_center_image import kotlinx.android.synthetic.main.taxt_u_p_bottom_check.view.actv_title diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt similarity index 97% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt index 21a3caa6e7..2208ab1b98 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.checkstartautopilot +package com.mogo.och.unmanned.passenger.ui.checkstartautopilot import android.animation.Animator import android.animation.AnimatorListenerAdapter @@ -19,9 +19,9 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.manager.xiaozhi.ZhiViewmanager import com.mogo.och.common.module.utils.BigFrameAnimatorContainer -import com.mogo.och.taxi.passenger.R -import com.mogo.och.taxi.passenger.model.TaxiPassengerModel -import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout +import com.mogo.och.unmanned.passenger.model.TaxiPassengerModel +import com.mogo.och.unmanned.passenger.widget.WindowRelativeLayout +import com.mogo.och.unmanned.taxi.passenger.R import kotlinx.android.synthetic.main.taxt_u_p_check_startautopilot.view.aciv_check_autopilot import kotlinx.android.synthetic.main.taxt_u_p_check_startautopilot.view.aciv_start_autopilt_success_ani import kotlinx.android.synthetic.main.taxt_u_p_check_startautopilot.view.aciv_start_autopilt_success_bg diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/ChekAndStartAutopilotViewModel.kt similarity index 95% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotViewModel.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/ChekAndStartAutopilotViewModel.kt index 888f729b85..ae6f91ec18 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/ChekAndStartAutopilotViewModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.checkstartautopilot +package com.mogo.och.unmanned.passenger.ui.checkstartautopilot import androidx.lifecycle.ViewModel import com.mogo.och.taxi.passenger.ui.model.order.TaxiPassengerOrderStatusEnum diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/check/CheckView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/check/CheckView.kt similarity index 95% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/check/CheckView.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/check/CheckView.kt index 25d3926962..21ddc6eb20 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/check/CheckView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/check/CheckView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.checkstartautopilot.check +package com.mogo.och.unmanned.passenger.ui.checkstartautopilot.check import android.content.Context import android.graphics.Typeface @@ -14,8 +14,8 @@ import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.common.module.utils.RxUtils -import com.mogo.och.taxi.passenger.R -import com.mogo.och.taxi.passenger.widget.NumberCheckView +import com.mogo.och.unmanned.passenger.widget.NumberCheckView +import com.mogo.och.unmanned.taxi.passenger.R import io.reactivex.disposables.Disposable import kotlinx.android.synthetic.main.taxt_u_p_check.view.numberCheckView import kotlinx.android.synthetic.main.taxt_u_p_check.view.tv_passenger_count diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/check/ChekViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/check/ChekViewModel.kt similarity index 88% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/check/ChekViewModel.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/check/ChekViewModel.kt index 369ff6493f..7266c2b287 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/check/ChekViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/check/ChekViewModel.kt @@ -1,7 +1,7 @@ -package com.mogo.och.taxi.passenger.ui.checkstartautopilot.check +package com.mogo.och.unmanned.passenger.ui.checkstartautopilot.check import androidx.lifecycle.ViewModel -import com.mogo.och.taxi.passenger.model.TaxiPassengerModel +import com.mogo.och.unmanned.passenger.model.TaxiPassengerModel class ChekViewModel : ViewModel() { diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt similarity index 97% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt index dc90081392..d0cf7e231a 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.checkstartautopilot.startautopilot +package com.mogo.och.unmanned.passenger.ui.checkstartautopilot.startautopilot import android.content.Context import android.util.AttributeSet @@ -12,8 +12,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.common.module.manager.device.data.DoorPosition import com.mogo.och.common.module.manager.device.data.DoorState import com.mogo.och.common.module.utils.FrameAnimatorContainer -import com.mogo.och.taxi.passenger.R -import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout +import com.mogo.och.unmanned.passenger.widget.WindowRelativeLayout +import com.mogo.och.unmanned.taxi.passenger.R import kotlinx.android.synthetic.main.taxt_u_p_start_autopilot_view.view.aciv_middle_car import kotlinx.android.synthetic.main.taxt_u_p_start_autopilot_view.view.actv_front_left_door import kotlinx.android.synthetic.main.taxt_u_p_start_autopilot_view.view.actv_front_right_door diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt similarity index 95% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt index 5310076b0f..f54f50c515 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.checkstartautopilot.startautopilot +package com.mogo.och.unmanned.passenger.ui.checkstartautopilot.startautopilot import androidx.lifecycle.ViewModel import com.mogo.commons.voice.AIAssist @@ -15,9 +15,9 @@ import com.mogo.och.common.module.manager.device.data.DoorPosition import com.mogo.och.common.module.manager.device.data.DoorState import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.voice.VoiceNotice -import com.mogo.och.taxi.passenger.R -import com.mogo.och.taxi.passenger.model.AutopilotManager -import com.mogo.och.taxi.passenger.model.TaxiPassengerModel +import com.mogo.och.unmanned.passenger.model.AutopilotManager +import com.mogo.och.unmanned.passenger.model.TaxiPassengerModel +import com.mogo.och.unmanned.taxi.passenger.R import io.reactivex.disposables.Disposable class StartAutopilotViewModel : ViewModel(), diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugEvent.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugEvent.kt new file mode 100644 index 0000000000..c3819fc803 --- /dev/null +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugEvent.kt @@ -0,0 +1,4 @@ +package com.mogo.och.unmanned.passenger.ui.debug + +class DebugEvent { +} \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugView.kt similarity index 92% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugView.kt index a1bc3599be..cb207abd34 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/debug/DebugView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.debug +package com.mogo.och.unmanned.passenger.ui.debug import android.content.Context import android.util.AttributeSet @@ -8,8 +8,8 @@ import androidx.fragment.app.FragmentActivity import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.util.ActivityUtils -import com.mogo.och.taxi.passenger.R -import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment +import com.mogo.och.unmanned.passenger.ui.TaxiPassengerBaseFragment +import com.mogo.och.unmanned.taxi.passenger.R import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_show_arrive import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_show_evaluate import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_show_order_info @@ -35,7 +35,7 @@ class DebugView @JvmOverloads constructor( visibility = GONE } - private var fragment:TaxiPassengerBaseFragment?=null + private var fragment: TaxiPassengerBaseFragment?=null override fun onAttachedToWindow() { super.onAttachedToWindow() diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/orderinfo/ItineraryView.kt similarity index 96% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/orderinfo/ItineraryView.kt index e4f5645eb9..c85830a99c 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/orderinfo/ItineraryView.kt @@ -1,13 +1,10 @@ -package com.mogo.och.taxi.passenger.ui.orderinfo +package com.mogo.och.unmanned.passenger.ui.orderinfo import android.content.Context import android.graphics.drawable.GradientDrawable import android.graphics.drawable.LayerDrawable import android.graphics.drawable.ScaleDrawable import android.os.Build -import android.os.Handler -import android.os.Looper -import android.os.Message import android.util.AttributeSet import android.view.Gravity import android.view.LayoutInflater @@ -15,8 +12,7 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner -import com.mogo.och.common.module.utils.RxUtils -import com.mogo.och.taxi.passenger.R +import com.mogo.och.unmanned.taxi.passenger.R import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_arrived_time import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_distance import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_distance_unit diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/orderinfo/OrderInfoViewModel.kt similarity index 93% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/orderinfo/OrderInfoViewModel.kt index 2f9db7c0e4..511e20ff62 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/orderinfo/OrderInfoViewModel.kt @@ -1,17 +1,17 @@ -package com.mogo.och.taxi.passenger.ui.orderinfo +package com.mogo.och.unmanned.passenger.ui.orderinfo import androidx.lifecycle.ViewModel import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.NumberFormatUtil -import com.mogo.och.taxi.passenger.R -import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback +import com.mogo.och.unmanned.taxi.passenger.R import com.mogo.och.taxi.passenger.ui.model.order.TaxiPassengerOrderStatusEnum -import com.mogo.och.taxi.passenger.model.TaxiPassengerModel import com.mogo.och.taxi.passenger.ui.model.order.BaseOrderBean import com.mogo.och.taxi.passenger.ui.model.order.OrderListener import com.mogo.och.taxi.passenger.ui.model.order.OrderModel +import com.mogo.och.unmanned.passenger.callback.IOCHTaxiPassengerOrderStatusCallback +import com.mogo.och.unmanned.passenger.model.TaxiPassengerModel import kotlin.math.ceil class OrderInfoViewModel: ViewModel(), IOCHTaxiPassengerOrderStatusCallback, OrderListener { diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/speed/SpeedView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/speed/SpeedView.kt similarity index 95% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/speed/SpeedView.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/speed/SpeedView.kt index 0a97755047..939ae142c8 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/speed/SpeedView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/speed/SpeedView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.speed +package com.mogo.och.unmanned.passenger.ui.speed import android.content.Context import android.os.Build @@ -9,7 +9,7 @@ import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.taxi.passenger.R +import com.mogo.och.unmanned.taxi.passenger.R import kotlinx.android.synthetic.main.taxt_u_p_speed.view.actv_speed_value import kotlin.math.abs diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/statusview/StatusBarView.kt similarity index 92% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/statusview/StatusBarView.kt index b19c0a37b4..8376b60a2f 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/statusview/StatusBarView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.statusview +package com.mogo.och.unmanned.passenger.ui.statusview import android.content.Context import android.os.SystemClock @@ -7,8 +7,6 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.constraintlayout.widget.ConstraintLayout import androidx.fragment.app.FragmentActivity -import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager @@ -17,8 +15,8 @@ import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager import com.mogo.och.common.module.manager.debug.DebugViewWatchDogFragment -import com.mogo.och.taxi.passenger.R -import com.mogo.och.taxi.passenger.ui.debug.DebugEvent +import com.mogo.och.unmanned.passenger.ui.debug.DebugEvent +import com.mogo.och.unmanned.taxi.passenger.R import kotlinx.android.synthetic.main.taxt_u_p_statusview.view.vShowDebugView import kotlinx.android.synthetic.main.taxt_u_p_statusview.view.iv_biz_icon import me.jessyan.autosize.utils.AutoSizeUtils diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/statusview/TaxiPBlueToothView.kt similarity index 95% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/statusview/TaxiPBlueToothView.kt index 463deba210..9e80940f8c 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/statusview/TaxiPBlueToothView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.statusview +package com.mogo.och.unmanned.passenger.ui.statusview import android.annotation.SuppressLint import android.content.Context @@ -7,7 +7,7 @@ import android.view.LayoutInflater import android.widget.RelativeLayout import com.mogo.eagle.core.function.api.devatools.mofang.IMoGoMoFangProvider import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager -import com.mogo.och.taxi.passenger.R +import com.mogo.och.unmanned.taxi.passenger.R import kotlinx.android.synthetic.main.taxt_u_p_blue_tooth.view.mofangView /** diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/systemsetting/TaxiPSettingView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/systemsetting/TaxiPSettingView.kt similarity index 98% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/systemsetting/TaxiPSettingView.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/systemsetting/TaxiPSettingView.kt index 868ddda43b..9b4c47c9cb 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/systemsetting/TaxiPSettingView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/systemsetting/TaxiPSettingView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.systemsetting +package com.mogo.och.unmanned.passenger.ui.systemsetting import android.annotation.SuppressLint import android.content.Context @@ -25,7 +25,7 @@ import com.mogo.eagle.core.function.call.setting.CallerRequestActivityHandleMana import com.mogo.eagle.core.utilcode.util.BrightnessUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.common.module.wigets.MineGradientDrawable -import com.mogo.och.taxi.passenger.R +import com.mogo.och.unmanned.taxi.passenger.R import kotlinx.android.synthetic.main.taxt_u_p_setting_view.view.sb_light_bar import kotlinx.android.synthetic.main.taxt_u_p_setting_view.view.sb_voice_bar import kotlinx.android.synthetic.main.taxt_u_p_setting_view.view.tvSoundPer diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FullVideoUtils.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/FullVideoUtils.kt similarity index 96% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FullVideoUtils.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/FullVideoUtils.kt index 5b3d3f8e87..0f5f1ad057 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FullVideoUtils.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/FullVideoUtils.kt @@ -1,10 +1,10 @@ -package com.mogo.och.taxi.passenger.ui.video +package com.mogo.och.unmanned.passenger.ui.video import android.annotation.SuppressLint import android.app.Activity import android.view.View import android.view.WindowManager -import com.mogo.och.taxi.passenger.widget.ConsultVideoPlayer +import com.mogo.och.unmanned.passenger.widget.ConsultVideoPlayer import com.shuyu.gsyvideoplayer.GSYVideoManager import java.lang.Exception diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/InfoVideoView.kt similarity index 90% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/InfoVideoView.kt index 8ac56ab8e6..0e7df5a5de 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/InfoVideoView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.video +package com.mogo.och.unmanned.passenger.ui.video import android.content.Context import android.graphics.Color @@ -17,16 +17,16 @@ import com.mogo.och.common.module.wigets.media.MediaDataSourceManager import com.mogo.och.common.module.wigets.media.MediaFileCacheManager import com.mogo.och.common.module.wigets.media.MediaItem import com.mogo.och.common.module.wigets.media.MediaPlayLogger -import com.mogo.och.taxi.passenger.R -import com.mogo.och.taxi.passenger.bean.TaxiPassengerVideoPlay -import com.mogo.och.taxi.passenger.ui.video.layoutmanage.CarouselLayoutManager -import com.mogo.och.taxi.passenger.ui.video.layoutmanage.CarouselZoomPostLayoutListener -import com.mogo.och.taxi.passenger.ui.video.layoutmanage.CenterScrollListener -import com.mogo.och.taxi.passenger.widget.ConsultVideoPlayer -import com.mogo.och.taxi.passenger.widget.indicator.IndicatorView -import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorOrientation -import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorSlideMode -import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorStyle +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerVideoPlay +import com.mogo.och.unmanned.taxi.passenger.R +import com.mogo.och.unmanned.passenger.ui.video.layoutmanage.CarouselLayoutManager +import com.mogo.och.unmanned.passenger.ui.video.layoutmanage.CarouselZoomPostLayoutListener +import com.mogo.och.unmanned.passenger.ui.video.layoutmanage.CenterScrollListener +import com.mogo.och.unmanned.passenger.widget.ConsultVideoPlayer +import com.mogo.och.unmanned.passenger.widget.indicator.IndicatorView +import com.mogo.och.unmanned.passenger.widget.indicator.enums.IndicatorOrientation +import com.mogo.och.unmanned.passenger.widget.indicator.enums.IndicatorSlideMode +import com.mogo.och.unmanned.passenger.widget.indicator.enums.IndicatorStyle import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.video.base.GSYVideoView import kotlin.math.floor @@ -164,7 +164,11 @@ internal class InfoVideoView @JvmOverloads constructor( } private fun initData() { - val carouselLayoutManager = CarouselLayoutManager(CarouselLayoutManager.HORIZONTAL, true) + val carouselLayoutManager = + CarouselLayoutManager( + CarouselLayoutManager.HORIZONTAL, + true + ) carouselLayoutManager.setPostLayoutListener(CarouselZoomPostLayoutListener()) carouselLayoutManager.maxVisibleItems = 1 indicatorView.notifyDataChanged(mediaList.size) @@ -221,7 +225,12 @@ internal class InfoVideoView @JvmOverloads constructor( } indicatorView.onPageScrolled(currentIndex, fl, 0) } - val recyclerVideoAdapter = RecyclerVideoAdapter(context, mediaList, rvVideoPlaylist) + val recyclerVideoAdapter = + RecyclerVideoAdapter( + context, + mediaList, + rvVideoPlaylist + ) recyclerVideoAdapter.setOnThumbImageClilckListener { val (_: Int, player) = getPlayer(carouselLayoutManager) if (player is ConsultVideoPlayer) { diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerItemVideoHolder.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/RecyclerItemVideoHolder.java similarity index 80% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerItemVideoHolder.java rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/RecyclerItemVideoHolder.java index f28610a727..02ab58b36e 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerItemVideoHolder.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/RecyclerItemVideoHolder.java @@ -1,12 +1,12 @@ -package com.mogo.och.taxi.passenger.ui.video; +package com.mogo.och.unmanned.passenger.ui.video; import android.content.Context; import android.view.View; import androidx.recyclerview.widget.RecyclerView; -import com.mogo.och.taxi.passenger.R; -import com.mogo.och.taxi.passenger.widget.ConsultVideoPlayer; +import com.mogo.och.unmanned.passenger.widget.ConsultVideoPlayer; +import com.mogo.och.unmanned.taxi.passenger.R; import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder; public class RecyclerItemVideoHolder extends RecyclerView.ViewHolder { diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/RecyclerVideoAdapter.java similarity index 96% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/RecyclerVideoAdapter.java index 4d9bac7f6d..561ba39358 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/RecyclerVideoAdapter.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.video; +package com.mogo.och.unmanned.passenger.ui.video; import android.content.Context; import android.view.LayoutInflater; @@ -12,8 +12,8 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.och.common.module.wigets.media.MediaItem; -import com.mogo.och.taxi.passenger.R; -import com.mogo.och.taxi.passenger.bean.TaxiPassengerVideoPlay; +import com.mogo.och.unmanned.passenger.bean.TaxiPassengerVideoPlay; +import com.mogo.och.unmanned.taxi.passenger.R; import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack; import java.util.List; diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselLayoutManager.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/layoutmanage/CarouselLayoutManager.java similarity index 99% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselLayoutManager.java rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/layoutmanage/CarouselLayoutManager.java index 326341e950..79ae877432 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselLayoutManager.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/layoutmanage/CarouselLayoutManager.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.video.layoutmanage; +package com.mogo.och.unmanned.passenger.ui.video.layoutmanage; import android.graphics.PointF; import android.os.Build; diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselZoomPostLayoutListener.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/layoutmanage/CarouselZoomPostLayoutListener.java similarity index 96% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselZoomPostLayoutListener.java rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/layoutmanage/CarouselZoomPostLayoutListener.java index 348cd70704..6afb092044 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselZoomPostLayoutListener.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/layoutmanage/CarouselZoomPostLayoutListener.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.video.layoutmanage; +package com.mogo.och.unmanned.passenger.ui.video.layoutmanage; import android.view.View; diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CenterScrollListener.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/layoutmanage/CenterScrollListener.java similarity index 96% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CenterScrollListener.java rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/layoutmanage/CenterScrollListener.java index 4b04e7b957..b465171499 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CenterScrollListener.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/layoutmanage/CenterScrollListener.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.video.layoutmanage; +package com.mogo.och.unmanned.passenger.ui.video.layoutmanage; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/ItemTransformation.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/layoutmanage/ItemTransformation.java similarity index 88% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/ItemTransformation.java rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/layoutmanage/ItemTransformation.java index c0851112ab..1b377882c8 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/ItemTransformation.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/layoutmanage/ItemTransformation.java @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.video.layoutmanage; +package com.mogo.och.unmanned.passenger.ui.video.layoutmanage; public class ItemTransformation { diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/utils/TaxiPassengerAnalyticsManager.kt similarity index 98% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/utils/TaxiPassengerAnalyticsManager.kt index 7d1daf1e0f..99d2234f4b 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/utils/TaxiPassengerAnalyticsManager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.utils +package com.mogo.och.unmanned.passenger.utils import android.text.TextUtils import com.mogo.commons.debug.DebugConfig @@ -12,7 +12,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ import com.mogo.eagle.core.utilcode.util.DateTimeUtils import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager import com.mogo.och.common.module.utils.RxUtils -import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst +import com.mogo.och.unmanned.passenger.constant.TaxiPassengerConst import io.reactivex.disposables.Disposable /** diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/ZoomDrawable.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/utils/ZoomDrawable.kt similarity index 94% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/ZoomDrawable.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/utils/ZoomDrawable.kt index 12776a6d7f..183f6d3174 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/ZoomDrawable.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/utils/ZoomDrawable.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.utils +package com.mogo.och.unmanned.passenger.utils import android.content.Context import android.graphics.* diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/ConsultVideoPlayer.kt similarity index 98% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/ConsultVideoPlayer.kt index 67b65239c3..c0ac16b9e8 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/ConsultVideoPlayer.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.widget +package com.mogo.och.unmanned.passenger.widget import android.app.Activity import android.content.Context @@ -22,10 +22,10 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider import com.mogo.och.common.module.manager.audiofocus.AudioFocusManager import com.mogo.och.common.module.wigets.media.MediaItem -import com.mogo.och.taxi.passenger.R -import com.mogo.och.taxi.passenger.ui.statusview.StatusBarView -import com.mogo.och.taxi.passenger.ui.video.FullVideoUtils -import com.mogo.och.taxi.passenger.utils.ZoomDrawable +import com.mogo.och.unmanned.taxi.passenger.R +import com.mogo.och.unmanned.passenger.ui.statusview.StatusBarView +import com.mogo.och.unmanned.passenger.ui.video.FullVideoUtils +import com.mogo.och.unmanned.passenger.utils.ZoomDrawable import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack import com.shuyu.gsyvideoplayer.utils.GSYVideoType import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/NumberCheckView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/NumberCheckView.kt similarity index 98% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/NumberCheckView.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/NumberCheckView.kt index ad55a1e411..49373bab12 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/NumberCheckView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/NumberCheckView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.widget +package com.mogo.och.unmanned.passenger.widget import android.content.Context import android.util.AttributeSet @@ -13,7 +13,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.voice.VoiceNotice -import com.mogo.och.taxi.passenger.R +import com.mogo.och.unmanned.taxi.passenger.R import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_back import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_eight import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_first diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/WindowRelativeLayout.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/WindowRelativeLayout.kt similarity index 95% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/WindowRelativeLayout.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/WindowRelativeLayout.kt index 31313e52f7..c26ad8c26a 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/WindowRelativeLayout.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/WindowRelativeLayout.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.widget +package com.mogo.och.unmanned.passenger.widget import android.content.Context import android.util.AttributeSet diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/IndicatorView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/IndicatorView.kt similarity index 77% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/IndicatorView.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/IndicatorView.kt index efaf362a21..9dcef43d9c 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/IndicatorView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/IndicatorView.kt @@ -1,15 +1,15 @@ -package com.mogo.och.taxi.passenger.widget.indicator +package com.mogo.och.unmanned.passenger.widget.indicator import android.content.Context import android.graphics.Canvas import android.util.AttributeSet -import com.mogo.och.taxi.passenger.widget.indicator.annotation.AIndicatorOrientation +import com.mogo.och.unmanned.passenger.widget.indicator.annotation.AIndicatorOrientation -import com.zhpan.indicator.base.BaseIndicatorView -import com.mogo.och.taxi.passenger.widget.indicator.drawer.DrawerProxy -import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorOrientation -import com.mogo.och.taxi.passenger.widget.indicator.option.AttrsController -import com.mogo.och.taxi.passenger.widget.indicator.option.IndicatorOptions +import com.mogo.och.unmanned.passenger.widget.indicator.base.BaseIndicatorView +import com.mogo.och.unmanned.passenger.widget.indicator.drawer.DrawerProxy +import com.mogo.och.unmanned.passenger.widget.indicator.enums.IndicatorOrientation +import com.mogo.och.unmanned.passenger.widget.indicator.option.AttrsController +import com.mogo.och.unmanned.passenger.widget.indicator.option.IndicatorOptions class IndicatorView @JvmOverloads constructor( context: Context, diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/annotation/AIndicatorOrientation.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/annotation/AIndicatorOrientation.kt similarity index 71% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/annotation/AIndicatorOrientation.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/annotation/AIndicatorOrientation.kt index 4e3ff14f56..fa93f87e08 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/annotation/AIndicatorOrientation.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/annotation/AIndicatorOrientation.kt @@ -1,7 +1,7 @@ -package com.mogo.och.taxi.passenger.widget.indicator.annotation +package com.mogo.och.unmanned.passenger.widget.indicator.annotation import androidx.annotation.IntDef -import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorOrientation +import com.mogo.och.unmanned.passenger.widget.indicator.enums.IndicatorOrientation /** * diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/annotation/AIndicatorSlideMode.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/annotation/AIndicatorSlideMode.kt new file mode 100644 index 0000000000..1d897b30e8 --- /dev/null +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/annotation/AIndicatorSlideMode.kt @@ -0,0 +1,19 @@ +package com.mogo.och.unmanned.passenger.widget.indicator.annotation + +import androidx.annotation.IntDef +import com.mogo.och.unmanned.passenger.widget.indicator.enums.IndicatorSlideMode.Companion.NORMAL +import com.mogo.och.unmanned.passenger.widget.indicator.enums.IndicatorSlideMode.Companion.SMOOTH +import com.mogo.och.unmanned.passenger.widget.indicator.enums.IndicatorSlideMode.Companion.WORM +import com.mogo.och.unmanned.passenger.widget.indicator.enums.IndicatorSlideMode.Companion.COLOR +import com.mogo.och.unmanned.passenger.widget.indicator.enums.IndicatorSlideMode.Companion.SCALE + +/** + * 
+ * Created by zhangpan on 2019-10-18.
+ * Description:
+
* + */ +@IntDef(NORMAL, SMOOTH, WORM, COLOR, SCALE) +@kotlin.annotation.Retention(AnnotationRetention.SOURCE) +@Target(AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.FIELD) +annotation class AIndicatorSlideMode diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/annotation/AIndicatorStyle.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/annotation/AIndicatorStyle.kt similarity index 70% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/annotation/AIndicatorStyle.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/annotation/AIndicatorStyle.kt index 783524aa97..007c9eca5f 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/annotation/AIndicatorStyle.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/annotation/AIndicatorStyle.kt @@ -1,7 +1,7 @@ -package com.mogo.och.taxi.passenger.widget.indicator.annotation +package com.mogo.och.unmanned.passenger.widget.indicator.annotation import androidx.annotation.IntDef -import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorStyle +import com.mogo.och.unmanned.passenger.widget.indicator.enums.IndicatorStyle /** * 
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/base/BaseIndicatorView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/base/BaseIndicatorView.kt
similarity index 93%
rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/base/BaseIndicatorView.kt
rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/base/BaseIndicatorView.kt
index a24f8d08a7..2dd118276e 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/base/BaseIndicatorView.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/base/BaseIndicatorView.kt
@@ -1,4 +1,4 @@
-package com.zhpan.indicator.base
+package com.mogo.och.unmanned.passenger.widget.indicator.base
 
 import android.content.Context
 import android.util.AttributeSet
@@ -6,12 +6,10 @@ import android.view.View
 
 import androidx.annotation.ColorInt
 import androidx.recyclerview.widget.RecyclerView
-
-import com.mogo.och.taxi.passenger.widget.indicator.annotation.AIndicatorSlideMode
-import com.mogo.och.taxi.passenger.widget.indicator.annotation.AIndicatorStyle
-import com.mogo.och.taxi.passenger.widget.indicator.base.IIndicator
-import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorSlideMode
-import com.mogo.och.taxi.passenger.widget.indicator.option.IndicatorOptions
+import com.mogo.och.unmanned.passenger.widget.indicator.annotation.AIndicatorSlideMode
+import com.mogo.och.unmanned.passenger.widget.indicator.annotation.AIndicatorStyle
+import com.mogo.och.unmanned.passenger.widget.indicator.enums.IndicatorSlideMode
+import com.mogo.och.unmanned.passenger.widget.indicator.option.IndicatorOptions
 
 /**
  * 
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/base/IIndicator.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/base/IIndicator.kt
similarity index 58%
rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/base/IIndicator.kt
rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/base/IIndicator.kt
index 817e798893..6ca305bb51 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/base/IIndicator.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/base/IIndicator.kt
@@ -1,6 +1,6 @@
-package com.mogo.och.taxi.passenger.widget.indicator.base
+package com.mogo.och.unmanned.passenger.widget.indicator.base
 
-import com.mogo.och.taxi.passenger.widget.indicator.option.IndicatorOptions
+import com.mogo.och.unmanned.passenger.widget.indicator.option.IndicatorOptions
 
 /**
  * 
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/BaseDrawer.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/BaseDrawer.kt
similarity index 88%
rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/BaseDrawer.kt
rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/BaseDrawer.kt
index ae1e7a520b..8fb291c677 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/BaseDrawer.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/BaseDrawer.kt
@@ -1,11 +1,10 @@
-package com.mogo.och.taxi.passenger.widget.indicator.drawer
+package com.mogo.och.unmanned.passenger.widget.indicator.drawer
 
 import android.animation.ArgbEvaluator
 import android.graphics.Paint
-import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorOrientation
-import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorSlideMode
-
-import com.mogo.och.taxi.passenger.widget.indicator.option.IndicatorOptions
+import com.mogo.och.unmanned.passenger.widget.indicator.enums.IndicatorOrientation
+import com.mogo.och.unmanned.passenger.widget.indicator.enums.IndicatorSlideMode
+import com.mogo.och.unmanned.passenger.widget.indicator.option.IndicatorOptions
 
 /**
  * 
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/CircleDrawer.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/CircleDrawer.kt
similarity index 95%
rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/CircleDrawer.kt
rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/CircleDrawer.kt
index f7bde7a9ff..d2c08b10dc 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/CircleDrawer.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/CircleDrawer.kt
@@ -1,11 +1,10 @@
-package com.mogo.och.taxi.passenger.widget.indicator.drawer
+package com.mogo.och.unmanned.passenger.widget.indicator.drawer
 
 import android.graphics.Canvas
 import android.graphics.RectF
-import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorSlideMode
-
-import com.mogo.och.taxi.passenger.widget.indicator.option.IndicatorOptions
-import com.mogo.och.taxi.passenger.widget.indicator.utils.IndicatorUtils
+import com.mogo.och.unmanned.passenger.widget.indicator.enums.IndicatorSlideMode
+import com.mogo.och.unmanned.passenger.widget.indicator.option.IndicatorOptions
+import com.mogo.och.unmanned.passenger.widget.indicator.utils.IndicatorUtils
 
 /**
  * 
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DashDrawer.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/DashDrawer.kt
similarity index 69%
rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DashDrawer.kt
rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/DashDrawer.kt
index 6b2b7e12d1..42450c518d 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DashDrawer.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/DashDrawer.kt
@@ -1,8 +1,8 @@
-package com.mogo.och.taxi.passenger.widget.indicator.drawer
+package com.mogo.och.unmanned.passenger.widget.indicator.drawer
 
 import android.graphics.Canvas
 
-import com.mogo.och.taxi.passenger.widget.indicator.option.IndicatorOptions
+import com.mogo.och.unmanned.passenger.widget.indicator.option.IndicatorOptions
 
 /**
  * 
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DrawerFactory.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/DrawerFactory.kt
similarity index 66%
rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DrawerFactory.kt
rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/DrawerFactory.kt
index 2b5073a6b2..df41877e28 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DrawerFactory.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/DrawerFactory.kt
@@ -1,7 +1,8 @@
-package com.mogo.och.taxi.passenger.widget.indicator.drawer
+package com.mogo.och.unmanned.passenger.widget.indicator.drawer
+
+import com.mogo.och.unmanned.passenger.widget.indicator.enums.IndicatorStyle
+import com.mogo.och.unmanned.passenger.widget.indicator.option.IndicatorOptions
 
-import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorStyle
-import com.mogo.och.taxi.passenger.widget.indicator.option.IndicatorOptions
 
 /**
  * 
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DrawerProxy.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/DrawerProxy.kt
similarity index 86%
rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DrawerProxy.kt
rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/DrawerProxy.kt
index 30cb21e2ec..080f6bb6b3 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DrawerProxy.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/DrawerProxy.kt
@@ -1,8 +1,8 @@
-package com.mogo.och.taxi.passenger.widget.indicator.drawer
+package com.mogo.och.unmanned.passenger.widget.indicator.drawer
 
 import android.graphics.Canvas
 
-import com.mogo.och.taxi.passenger.widget.indicator.option.IndicatorOptions
+import com.mogo.och.unmanned.passenger.widget.indicator.option.IndicatorOptions
 
 /**
  * 
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/IDrawer.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/IDrawer.kt
similarity index 85%
rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/IDrawer.kt
rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/IDrawer.kt
index 728fa254dd..0a9afbf39b 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/IDrawer.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/IDrawer.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.taxi.passenger.widget.indicator.drawer
+package com.mogo.och.unmanned.passenger.widget.indicator.drawer
 
 import android.graphics.Canvas
 
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RectDrawer.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/RectDrawer.kt
similarity index 96%
rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RectDrawer.kt
rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/RectDrawer.kt
index a0d1367e84..3859dc5757 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RectDrawer.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/RectDrawer.kt
@@ -1,10 +1,9 @@
-package com.mogo.och.taxi.passenger.widget.indicator.drawer
+package com.mogo.och.unmanned.passenger.widget.indicator.drawer
 
 import android.graphics.*
-
-import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorSlideMode
-import com.mogo.och.taxi.passenger.widget.indicator.option.IndicatorOptions
-import com.mogo.och.taxi.passenger.widget.indicator.utils.IndicatorUtils
+import com.mogo.och.unmanned.passenger.widget.indicator.enums.IndicatorSlideMode
+import com.mogo.och.unmanned.passenger.widget.indicator.option.IndicatorOptions
+import com.mogo.och.unmanned.passenger.widget.indicator.utils.IndicatorUtils
 
 /**
  * 
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RoundRectDrawer.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/RoundRectDrawer.kt
similarity index 87%
rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RoundRectDrawer.kt
rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/RoundRectDrawer.kt
index fe781c7656..a3d801afd2 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RoundRectDrawer.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/drawer/RoundRectDrawer.kt
@@ -1,9 +1,9 @@
-package com.mogo.och.taxi.passenger.widget.indicator.drawer
+package com.mogo.och.unmanned.passenger.widget.indicator.drawer
 
 import android.graphics.Canvas
 import android.graphics.LinearGradient
 import android.graphics.Shader
-import com.mogo.och.taxi.passenger.widget.indicator.option.IndicatorOptions
+import com.mogo.och.unmanned.passenger.widget.indicator.option.IndicatorOptions
 
 
 /**
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorOrientation.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/enums/IndicatorOrientation.kt
similarity index 82%
rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorOrientation.kt
rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/enums/IndicatorOrientation.kt
index 4f507e4c05..3738ba418e 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorOrientation.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/enums/IndicatorOrientation.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.taxi.passenger.widget.indicator.enums
+package com.mogo.och.unmanned.passenger.widget.indicator.enums
 
 import android.widget.LinearLayout
 
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorSlideMode.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/enums/IndicatorSlideMode.kt
similarity index 80%
rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorSlideMode.kt
rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/enums/IndicatorSlideMode.kt
index 0e9dfda078..5b4b0855e9 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorSlideMode.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/enums/IndicatorSlideMode.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.taxi.passenger.widget.indicator.enums
+package com.mogo.och.unmanned.passenger.widget.indicator.enums
 
 /**
  * 
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorStyle.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/enums/IndicatorStyle.kt
similarity index 78%
rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorStyle.kt
rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/enums/IndicatorStyle.kt
index e66ffb10fc..13b688241d 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorStyle.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/enums/IndicatorStyle.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.taxi.passenger.widget.indicator.enums
+package com.mogo.och.unmanned.passenger.widget.indicator.enums
 
 /**
  * 
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/option/AttrsController.java
similarity index 89%
rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java
rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/option/AttrsController.java
index 3a439ec7ea..029301c199 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/option/AttrsController.java
@@ -1,4 +1,4 @@
-package com.mogo.och.taxi.passenger.widget.indicator.option;
+package com.mogo.och.unmanned.passenger.widget.indicator.option;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -8,8 +8,8 @@ import android.util.AttributeSet;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.mogo.och.taxi.passenger.R;
-import com.mogo.och.taxi.passenger.widget.indicator.utils.IndicatorUtils;
+import com.mogo.och.unmanned.passenger.widget.indicator.utils.IndicatorUtils;
+import com.mogo.och.unmanned.taxi.passenger.R;
 
 public class AttrsController {
 
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/option/IndicatorOptions.kt
similarity index 79%
rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt
rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/option/IndicatorOptions.kt
index 47a993e1d7..e68d2fa9c8 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/option/IndicatorOptions.kt
@@ -1,13 +1,12 @@
-package com.mogo.och.taxi.passenger.widget.indicator.option
+package com.mogo.och.unmanned.passenger.widget.indicator.option
 
 import android.graphics.Color
-import com.mogo.och.taxi.passenger.widget.indicator.annotation.AIndicatorOrientation
-
-import com.mogo.och.taxi.passenger.widget.indicator.annotation.AIndicatorSlideMode
-import com.mogo.och.taxi.passenger.widget.indicator.annotation.AIndicatorStyle
-import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorOrientation
-import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorSlideMode
-import com.mogo.och.taxi.passenger.widget.indicator.utils.IndicatorUtils
+import com.mogo.och.unmanned.passenger.widget.indicator.annotation.AIndicatorOrientation
+import com.mogo.och.unmanned.passenger.widget.indicator.annotation.AIndicatorSlideMode
+import com.mogo.och.unmanned.passenger.widget.indicator.annotation.AIndicatorStyle
+import com.mogo.och.unmanned.passenger.widget.indicator.enums.IndicatorOrientation
+import com.mogo.och.unmanned.passenger.widget.indicator.enums.IndicatorSlideMode
+import com.mogo.och.unmanned.passenger.widget.indicator.utils.IndicatorUtils
 
 /**
  * 
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/utils/IndicatorUtils.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/utils/IndicatorUtils.kt
similarity index 81%
rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/utils/IndicatorUtils.kt
rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/utils/IndicatorUtils.kt
index 6b0894f3a8..51616e8ea0 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/utils/IndicatorUtils.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/indicator/utils/IndicatorUtils.kt
@@ -1,8 +1,7 @@
-package com.mogo.och.taxi.passenger.widget.indicator.utils
+package com.mogo.och.unmanned.passenger.widget.indicator.utils
 
 import android.content.res.Resources
-
-import com.mogo.och.taxi.passenger.widget.indicator.option.IndicatorOptions
+import com.mogo.och.unmanned.passenger.widget.indicator.option.IndicatorOptions
 
 /**
  * 
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_arrived_end_panel.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_arrived_end_panel.xml
index fa8a889dc4..c9c81e493d 100644
--- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_arrived_end_panel.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_arrived_end_panel.xml
@@ -50,7 +50,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
-    
 
     
-    
@@ -50,7 +50,7 @@
         app:pnc_size="@dimen/dp_40"
         app:pnc_txt_style="@style/AudioFileInfoOverlayText" />
 
-    
 
     
-    
 
     
-    
 
-    
 
-    
 
 
-    
 
-    
 
-    
 
-    
 
-    
 
-    
 
-    
 
-    
 
-    
 
     
-