From 51c16b55d428fff9801f6e043333fe66b9eb0173 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 6 Dec 2023 19:24:13 +0800 Subject: [PATCH] [6.2.6] [bus_p] [mv file] --- .../passenger/src/m2/AndroidManifest.xml | 2 +- .../passenger/src/main/AndroidManifest.xml | 2 +- .../passenger/MogoOCHShuttlePassenger.kt | 6 ++--- .../passenger/constant/BusPassengerConst.kt | 2 +- .../utils/BusPassengerMapAssetStyleUtil.java | 2 +- .../BusPassengerLineStationsAdapter.java | 8 +++---- .../passenger/model/BusPassengerModel.java | 8 +++---- .../network/BusPassengerModelLoopManager.java | 4 ++-- .../shuttle/passenger/ui/BusPBlueToothView.kt | 2 +- .../shuttle/passenger/ui/BusPStatusBarView.kt | 2 +- .../ui/BusPassengerBaseFragment.java | 2 +- .../ui/BusPassengerRouteFragment.java | 4 ++-- .../ui/BusPassengerTrafficLightView.kt | 2 +- .../BusPassengerMapDirectionView.kt | 4 ++-- .../passenger/ui/widget/BusPTurnLightView.kt | 2 +- .../bean/PM2OperationStatusResponse.java | 2 +- .../passenger/bean/PM2QueryLineRequest.java | 2 +- .../passenger/bean/PM2RoutesResponse.java | 2 +- .../passenger/bean/PM2RoutesResult.java | 2 +- .../shuttle}/passenger/bean/PM2Station.java | 2 +- .../passenger/callback/ADASCallback.kt | 2 +- .../callback/AutoPilotStatusCallback.kt | 2 +- .../passenger/callback/DrivingInfoCallback.kt | 2 +- .../shuttle}/passenger/constant/M2Const.kt | 2 +- .../shuttle}/passenger/model/PM2ADASModel.kt | 4 ++-- .../passenger/model/PM2DrivingModel.kt | 19 ++++++++-------- .../passenger/model/PM2ServiceManager.kt | 10 ++++----- .../passenger/network/PM2ModelLoopManager.kt | 6 ++--- .../passenger/network/PM2ServiceApi.java | 8 +++---- .../passenger/presenter/PM2ADASPresenter.kt | 10 ++++----- .../presenter/PM2DrivingPresenter.kt | 12 +++++----- .../passenger/presenter/PM2Presenter.kt | 4 ++-- .../passenger/presenter/PM2VideoPresenter.kt | 4 ++-- .../provider/M2StatusViewManager.java | 4 ++-- .../shuttle}/passenger/ui/PM2BaseFragment.kt | 8 +++---- .../passenger/ui/PM2DrivingInfoFragment.kt | 6 ++--- .../shuttle}/passenger/ui/PM2HPMapFragment.kt | 8 +++---- .../passenger/ui/video/PM2VideoFragment.kt | 6 ++--- .../passenger/ui/widget/M2BlueToothView.kt | 4 ++-- .../ui/widget/M2PTrafficLightView.kt | 4 ++-- .../passenger/ui/widget/M2StatusBarView.kt | 4 ++-- .../passenger/ui/widget/M2TurnLightView.kt | 4 ++-- .../ui/widget/video/AdvanceGSYVideoPlayer.kt | 2 +- .../ui/widget/video/AdvanceImageView.kt | 4 ++-- .../ui/widget/video/AdvancePagerAdapter.kt | 2 +- .../ui/widget/video/AdvanceVideoView.kt | 4 ++-- .../ui/widget/video/AdvanceViewPager.kt | 2 +- .../ui/widget/video/ImageAndVideoRotation.kt | 2 +- .../src/main/java/passenger/IMogoOCH.java | 22 ------------------- .../main/java/passenger/utils/DimenUtil.kt | 13 ----------- .../shuttle_p_m2_driving_info_fragment.xml | 2 +- .../m2/layout/shuttle_p_m2_video_fragment.xml | 2 +- 52 files changed, 107 insertions(+), 143 deletions(-) rename OCH/shuttle/passenger/src/main/java/{ => com/mogo/och/shuttle}/passenger/MogoOCHShuttlePassenger.kt (95%) rename OCH/shuttle/passenger/src/main/java/{ => com/mogo/och/shuttle}/passenger/constant/BusPassengerConst.kt (95%) rename OCH/shuttle/passenger/src/main/java/{ => com/mogo/och/shuttle}/passenger/utils/BusPassengerMapAssetStyleUtil.java (97%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/bean/PM2OperationStatusResponse.java (91%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/bean/PM2QueryLineRequest.java (83%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/bean/PM2RoutesResponse.java (93%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/bean/PM2RoutesResult.java (97%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/bean/PM2Station.java (98%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/callback/ADASCallback.kt (79%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/callback/AutoPilotStatusCallback.kt (83%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/callback/DrivingInfoCallback.kt (92%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/constant/M2Const.kt (85%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/model/PM2ADASModel.kt (91%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/model/PM2DrivingModel.kt (97%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/model/PM2ServiceManager.kt (88%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/network/PM2ModelLoopManager.kt (96%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/network/PM2ServiceApi.java (82%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/presenter/PM2ADASPresenter.kt (74%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/presenter/PM2DrivingPresenter.kt (91%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/presenter/PM2Presenter.kt (53%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/presenter/PM2VideoPresenter.kt (53%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/provider/M2StatusViewManager.java (86%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/ui/PM2BaseFragment.kt (90%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/ui/PM2DrivingInfoFragment.kt (98%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/ui/PM2HPMapFragment.kt (93%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/ui/video/PM2VideoFragment.kt (91%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/ui/widget/M2BlueToothView.kt (92%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/ui/widget/M2PTrafficLightView.kt (98%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/ui/widget/M2StatusBarView.kt (97%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/ui/widget/M2TurnLightView.kt (98%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt (98%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/ui/widget/video/AdvanceImageView.kt (93%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/ui/widget/video/AdvancePagerAdapter.kt (99%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/ui/widget/video/AdvanceVideoView.kt (99%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/ui/widget/video/AdvanceViewPager.kt (90%) rename OCH/shuttle/passenger/src/main/java/m2/{ => com/mogo/och/shuttle}/passenger/ui/widget/video/ImageAndVideoRotation.kt (95%) delete mode 100644 OCH/shuttle/passenger/src/main/java/passenger/IMogoOCH.java delete mode 100644 OCH/shuttle/passenger/src/main/java/passenger/utils/DimenUtil.kt diff --git a/OCH/shuttle/passenger/src/m2/AndroidManifest.xml b/OCH/shuttle/passenger/src/m2/AndroidManifest.xml index ef86a3875d..8eb912b35e 100644 --- a/OCH/shuttle/passenger/src/m2/AndroidManifest.xml +++ b/OCH/shuttle/passenger/src/m2/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="com.mogo.och.shuttle.passenger"> diff --git a/OCH/shuttle/passenger/src/main/AndroidManifest.xml b/OCH/shuttle/passenger/src/main/AndroidManifest.xml index 3e64218ab9..549784ca83 100644 --- a/OCH/shuttle/passenger/src/main/AndroidManifest.xml +++ b/OCH/shuttle/passenger/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.mogo.och.shuttle.passenger"> \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/java/passenger/MogoOCHShuttlePassenger.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/MogoOCHShuttlePassenger.kt similarity index 95% rename from OCH/shuttle/passenger/src/main/java/passenger/MogoOCHShuttlePassenger.kt rename to OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/MogoOCHShuttlePassenger.kt index da9744582a..ce15ccd1ca 100644 --- a/OCH/shuttle/passenger/src/main/java/passenger/MogoOCHShuttlePassenger.kt +++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/MogoOCHShuttlePassenger.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger +package com.mogo.och.shuttle.passenger import android.content.Context import androidx.fragment.app.Fragment @@ -12,10 +12,10 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils 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.MultiDisplayUtils -import com.mogo.och.bus.passenger.constant.BusPassengerConst -import com.mogo.och.bus.passenger.ui.PM2BaseFragment +import com.mogo.och.shuttle.passenger.constant.BusPassengerConst import com.mogo.och.common.module.wigets.video.VideoPlayerActivity import com.mogo.och.shuttle.passenger.ui.BusPassengerRouteFragment +import com.mogo.och.shuttle.passenger.ui.PM2BaseFragment /** * 网约车-Bus-乘客端 diff --git a/OCH/shuttle/passenger/src/main/java/passenger/constant/BusPassengerConst.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/constant/BusPassengerConst.kt similarity index 95% rename from OCH/shuttle/passenger/src/main/java/passenger/constant/BusPassengerConst.kt rename to OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/constant/BusPassengerConst.kt index 0831646d4d..dc0bb741a3 100644 --- a/OCH/shuttle/passenger/src/main/java/passenger/constant/BusPassengerConst.kt +++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/constant/BusPassengerConst.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.constant +package com.mogo.och.shuttle.passenger.constant /** * Created on 2021/12/6 diff --git a/OCH/shuttle/passenger/src/main/java/passenger/utils/BusPassengerMapAssetStyleUtil.java b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/utils/BusPassengerMapAssetStyleUtil.java similarity index 97% rename from OCH/shuttle/passenger/src/main/java/passenger/utils/BusPassengerMapAssetStyleUtil.java rename to OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/utils/BusPassengerMapAssetStyleUtil.java index 3cad825966..1f9bc9c159 100644 --- a/OCH/shuttle/passenger/src/main/java/passenger/utils/BusPassengerMapAssetStyleUtil.java +++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/utils/BusPassengerMapAssetStyleUtil.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.utils; +package com.mogo.och.shuttle.passenger.utils; import android.content.Context; diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/adapter/BusPassengerLineStationsAdapter.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/adapter/BusPassengerLineStationsAdapter.java index 9c572e7f85..15a89f2b66 100644 --- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/adapter/BusPassengerLineStationsAdapter.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/adapter/BusPassengerLineStationsAdapter.java @@ -11,16 +11,16 @@ import android.widget.ImageView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.mogo.och.bus.passenger.R; +import com.mogo.och.shuttle.passenger.R; import com.mogo.och.common.module.utils.BlinkAnimationUtil; import com.mogo.och.common.module.wigets.MarqueeTextView; import com.mogo.och.data.bean.BusStationBean; import java.util.List; -import static com.mogo.och.bus.passenger.constant.BusPassengerConst.STATION_STATUS_ARRIVING; -import static com.mogo.och.bus.passenger.constant.BusPassengerConst.STATION_STATUS_LEAVING; -import static com.mogo.och.bus.passenger.constant.BusPassengerConst.STATION_STATUS_STOPPED; +import static com.mogo.och.shuttle.passenger.constant.BusPassengerConst.STATION_STATUS_ARRIVING; +import static com.mogo.och.shuttle.passenger.constant.BusPassengerConst.STATION_STATUS_LEAVING; +import static com.mogo.och.shuttle.passenger.constant.BusPassengerConst.STATION_STATUS_STOPPED; /** * @author: wangmingjun diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java index b94d10814f..e4e7d09942 100644 --- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java @@ -1,8 +1,8 @@ package com.mogo.och.shuttle.passenger.model; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P; -import static com.mogo.och.bus.passenger.constant.BusPassengerConst.QUERY_BUS_P_STATION_DELAY; -import static com.mogo.och.bus.passenger.constant.BusPassengerConst.STATION_STATUS_STOPPED; +import static com.mogo.och.shuttle.passenger.constant.BusPassengerConst.QUERY_BUS_P_STATION_DELAY; +import static com.mogo.och.shuttle.passenger.constant.BusPassengerConst.STATION_STATUS_STOPPED; import android.content.Context; import android.content.Intent; @@ -27,7 +27,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant; import com.mogo.eagle.core.utilcode.util.GsonUtils; import com.mogo.eagle.core.utilcode.util.ToastUtils; -import com.mogo.och.bus.passenger.R; +import com.mogo.och.shuttle.passenger.R; import com.mogo.och.shuttle.passenger.bean.BusPassengerOperationStatusResponse; import com.mogo.och.shuttle.passenger.bean.BusPassengerRoutesResponse; import com.mogo.och.common.module.bean.dpmsg.AppConnectMsg; @@ -58,7 +58,7 @@ import com.mogo.och.shuttle.passenger.callback.IBusPassengerADASStatusCallback; import com.mogo.och.shuttle.passenger.callback.IBusPassengerAutopilotPlanningCallback; import com.mogo.och.shuttle.passenger.callback.IBusPassengerControllerStatusCallback; import com.mogo.och.shuttle.passenger.callback.IBusPassengerRouteLineInfoCallback; -import com.mogo.och.bus.passenger.constant.BusPassengerConst; +import com.mogo.och.shuttle.passenger.constant.BusPassengerConst; import com.mogo.och.shuttle.passenger.network.BusPassengerModelLoopManager; import com.mogo.och.shuttle.passenger.network.BusPassengerServiceManager; import com.mogo.och.common.module.biz.network.OchCommonServiceCallback; diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerModelLoopManager.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerModelLoopManager.java index e6f8826bf5..1a722f16b9 100644 --- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerModelLoopManager.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerModelLoopManager.java @@ -12,8 +12,8 @@ import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P; -import static com.mogo.och.bus.passenger.constant.BusPassengerConst.LOOP_DELAY; -import static com.mogo.och.bus.passenger.constant.BusPassengerConst.LOOP_LINE_2S; +import static com.mogo.och.shuttle.passenger.constant.BusPassengerConst.LOOP_DELAY; +import static com.mogo.och.shuttle.passenger.constant.BusPassengerConst.LOOP_LINE_2S; /** * Created on 2021/11/22 diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPBlueToothView.kt b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPBlueToothView.kt index 9add9a9e5d..985057174c 100644 --- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPBlueToothView.kt +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPBlueToothView.kt @@ -6,7 +6,7 @@ import android.view.LayoutInflater import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.bus.passenger.R +import com.mogo.och.shuttle.passenger.R import kotlinx.android.synthetic.main.shuttle_p_jl_view_blue_tooth.view.blueView /** diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPStatusBarView.kt b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPStatusBarView.kt index 4ee59f2561..1dd9581d1b 100644 --- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPStatusBarView.kt +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPStatusBarView.kt @@ -12,7 +12,7 @@ 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 import com.mogo.eagle.core.utilcode.kotlin.* -import com.mogo.och.bus.passenger.R +import com.mogo.och.shuttle.passenger.R import kotlinx.coroutines.* import me.jessyan.autosize.utils.AutoSizeUtils diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerBaseFragment.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerBaseFragment.java index 1b10d55532..9f83c84663 100644 --- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerBaseFragment.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerBaseFragment.java @@ -12,7 +12,7 @@ import com.mogo.commons.mvp.MvpFragment; import com.mogo.commons.mvp.Presenter; import com.mogo.eagle.core.function.hmi.ui.widget.RomaPassengerView; import com.mogo.eagle.core.function.view.MapBizView; -import com.mogo.och.bus.passenger.R; +import com.mogo.och.shuttle.passenger.R; /** * Created on 2022/3/31 diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java index 852460915d..3bc99cf4a7 100644 --- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java @@ -18,9 +18,9 @@ import com.elegant.utils.UiThreadHandler; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; -import com.mogo.och.bus.passenger.R; +import com.mogo.och.shuttle.passenger.R; import com.mogo.och.shuttle.passenger.adapter.BusPassengerLineStationsAdapter; -import com.mogo.och.bus.passenger.constant.BusPassengerConst; +import com.mogo.och.shuttle.passenger.constant.BusPassengerConst; import com.mogo.och.shuttle.passenger.presenter.BaseBusPassengerPresenter; import com.mogo.och.shuttle.passenger.ui.layoutmanager.CenterLayoutManager; import com.mogo.och.shuttle.passenger.ui.mapdirectionview.BusPassengerMapDirectionView; diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerTrafficLightView.kt b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerTrafficLightView.kt index 115f7973a8..f2178f347d 100644 --- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerTrafficLightView.kt +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerTrafficLightView.kt @@ -9,7 +9,7 @@ import com.mogo.eagle.core.data.enums.TrafficLightEnum import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.bus.passenger.R +import com.mogo.och.shuttle.passenger.R import kotlinx.android.synthetic.main.shuttle_p_jl_traffic_light_view.view.bus_p_traffic_light_bg import kotlinx.android.synthetic.main.shuttle_p_jl_traffic_light_view.view.bus_p_traffic_light_iv import kotlinx.android.synthetic.main.shuttle_p_jl_traffic_light_view.view.bus_p_traffic_light_time_tv diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/mapdirectionview/BusPassengerMapDirectionView.kt b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/mapdirectionview/BusPassengerMapDirectionView.kt index 906f7f30d9..7a1c0df493 100644 --- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/mapdirectionview/BusPassengerMapDirectionView.kt +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/mapdirectionview/BusPassengerMapDirectionView.kt @@ -27,9 +27,9 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis 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.bus.passenger.R +import com.mogo.och.shuttle.passenger.R import com.mogo.och.shuttle.passenger.ui.IBusPassengerMapDirectionView -import com.mogo.och.bus.passenger.utils.BusPassengerMapAssetStyleUtil +import com.mogo.och.shuttle.passenger.utils.BusPassengerMapAssetStyleUtil /** * 乘客屏小地图 diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/widget/BusPTurnLightView.kt b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/widget/BusPTurnLightView.kt index 9f92b2ba97..17f9179559 100644 --- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/widget/BusPTurnLightView.kt +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/widget/BusPTurnLightView.kt @@ -14,7 +14,7 @@ import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTurnLightListener import com.mogo.eagle.core.function.call.autopilot.CallerChassisLamplightListenerManager import com.mogo.eagle.core.function.call.v2x.CallerTurnLightListenerManager import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.bus.passenger.R +import com.mogo.och.shuttle.passenger.R import com.mogo.och.common.module.manager.lightmanager.TurnLightManager import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.left_nor_image import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.left_select_image diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2OperationStatusResponse.java b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2OperationStatusResponse.java similarity index 91% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2OperationStatusResponse.java rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2OperationStatusResponse.java index 9869a9e135..a39d34927b 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2OperationStatusResponse.java +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2OperationStatusResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean; +package com.mogo.och.shuttle.passenger.bean; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2QueryLineRequest.java b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2QueryLineRequest.java similarity index 83% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2QueryLineRequest.java rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2QueryLineRequest.java index 5569730773..62594f2813 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2QueryLineRequest.java +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2QueryLineRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean; +package com.mogo.och.shuttle.passenger.bean; public /** diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2RoutesResponse.java b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2RoutesResponse.java similarity index 93% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2RoutesResponse.java rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2RoutesResponse.java index 32306a33c1..cc302cdca5 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2RoutesResponse.java +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2RoutesResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean; +package com.mogo.och.shuttle.passenger.bean; import com.mogo.eagle.core.data.BaseData; import com.mogo.och.data.bean.BusRoutesResult; diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2RoutesResult.java b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2RoutesResult.java similarity index 97% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2RoutesResult.java rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2RoutesResult.java index 1f26b5346d..d120747432 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2RoutesResult.java +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2RoutesResult.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean; +package com.mogo.och.shuttle.passenger.bean; import java.util.List; import java.util.Objects; diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2Station.java b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2Station.java similarity index 98% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2Station.java rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2Station.java index ec903b7e93..767da50f10 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2Station.java +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2Station.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean; +package com.mogo.och.shuttle.passenger.bean; import java.util.Objects; diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/callback/ADASCallback.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/ADASCallback.kt similarity index 79% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/callback/ADASCallback.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/ADASCallback.kt index 217f03740f..b5b490e29d 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/callback/ADASCallback.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/ADASCallback.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.callback +package com.mogo.och.shuttle.passenger.callback /** * @author: wangmingjun diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/callback/AutoPilotStatusCallback.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/AutoPilotStatusCallback.kt similarity index 83% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/callback/AutoPilotStatusCallback.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/AutoPilotStatusCallback.kt index efb7410ba2..44b2075170 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/callback/AutoPilotStatusCallback.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/AutoPilotStatusCallback.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.callback +package com.mogo.och.shuttle.passenger.callback /** * @author: wangmingjun diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/callback/DrivingInfoCallback.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/DrivingInfoCallback.kt similarity index 92% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/callback/DrivingInfoCallback.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/DrivingInfoCallback.kt index 61589fce33..88ab043327 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/callback/DrivingInfoCallback.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/DrivingInfoCallback.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.callback +package com.mogo.och.shuttle.passenger.callback import com.mogo.och.data.bean.BusStationBean diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/constant/M2Const.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/constant/M2Const.kt similarity index 85% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/constant/M2Const.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/constant/M2Const.kt index 65d482b5fd..fd9097ad64 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/constant/M2Const.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/constant/M2Const.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.constant +package com.mogo.och.shuttle.passenger.constant /** * Created on 2021/12/6 diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/model/PM2ADASModel.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ADASModel.kt similarity index 91% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/model/PM2ADASModel.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ADASModel.kt index 87c68dda4f..3994625de7 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/model/PM2ADASModel.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ADASModel.kt @@ -1,7 +1,7 @@ -package com.mogo.och.bus.passenger.model +package com.mogo.och.shuttle.passenger.model import android.content.Context -import com.mogo.och.bus.passenger.callback.ADASCallback +import com.mogo.och.shuttle.passenger.callback.ADASCallback import com.mogo.och.data.bean.BusStationBean /** diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/model/PM2DrivingModel.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2DrivingModel.kt similarity index 97% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/model/PM2DrivingModel.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2DrivingModel.kt index d91c62fc57..4e5f1a568f 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/model/PM2DrivingModel.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2DrivingModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.model +package com.mogo.och.shuttle.passenger.model import android.content.Context import android.media.AudioAttributes @@ -12,7 +12,6 @@ import com.mogo.commons.module.intent.IMogoIntentListener import com.mogo.commons.module.intent.IntentManager import com.mogo.commons.voice.AIAssist import com.mogo.commons.voice.IMogoVoiceCmdCallBack -import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener @@ -32,14 +31,14 @@ import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.NetworkUtils import com.mogo.eagle.core.utilcode.util.ToastUtils -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.bean.PM2OperationStatusResponse -import com.mogo.och.bus.passenger.bean.PM2RoutesResponse -import com.mogo.och.bus.passenger.callback.AutoPilotStatusCallback -import com.mogo.och.bus.passenger.callback.DrivingInfoCallback -import com.mogo.och.bus.passenger.constant.BusPassengerConst -import com.mogo.och.bus.passenger.model.PM2ServiceManager.driverAppSn -import com.mogo.och.bus.passenger.network.PM2ModelLoopManager +import com.mogo.och.shuttle.passenger.R +import com.mogo.och.shuttle.passenger.constant.BusPassengerConst +import com.mogo.och.shuttle.passenger.bean.PM2OperationStatusResponse +import com.mogo.och.shuttle.passenger.bean.PM2RoutesResponse +import com.mogo.och.shuttle.passenger.callback.AutoPilotStatusCallback +import com.mogo.och.shuttle.passenger.callback.DrivingInfoCallback +import com.mogo.och.shuttle.passenger.model.PM2ServiceManager.driverAppSn +import com.mogo.och.shuttle.passenger.network.PM2ModelLoopManager import com.mogo.och.common.module.bean.dpmsg.* import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager.pushAppOperationalMsgBox import com.mogo.och.common.module.biz.constant.OchCommonConst diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/model/PM2ServiceManager.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ServiceManager.kt similarity index 88% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/model/PM2ServiceManager.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ServiceManager.kt index f23b75ea3f..99f133a0d2 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/model/PM2ServiceManager.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ServiceManager.kt @@ -1,13 +1,13 @@ -package com.mogo.och.bus.passenger.model +package com.mogo.och.shuttle.passenger.model import android.content.Context import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.getServerToken import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.eagle.core.network.MoGoRetrofitFactory -import com.mogo.och.bus.passenger.bean.PM2OperationStatusResponse -import com.mogo.och.bus.passenger.bean.PM2QueryLineRequest -import com.mogo.och.bus.passenger.bean.PM2RoutesResponse -import com.mogo.och.bus.passenger.network.PM2ServiceApi +import com.mogo.och.shuttle.passenger.bean.PM2OperationStatusResponse +import com.mogo.och.shuttle.passenger.bean.PM2QueryLineRequest +import com.mogo.och.shuttle.passenger.bean.PM2RoutesResponse +import com.mogo.och.shuttle.passenger.network.PM2ServiceApi import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/network/PM2ModelLoopManager.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/network/PM2ModelLoopManager.kt similarity index 96% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/network/PM2ModelLoopManager.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/network/PM2ModelLoopManager.kt index b430a966a1..8f3082bce1 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/network/PM2ModelLoopManager.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/network/PM2ModelLoopManager.kt @@ -1,9 +1,9 @@ -package com.mogo.och.bus.passenger.network +package com.mogo.och.shuttle.passenger.network import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.och.bus.passenger.constant.BusPassengerConst -import com.mogo.och.bus.passenger.model.PM2DrivingModel +import com.mogo.och.shuttle.passenger.constant.BusPassengerConst +import com.mogo.och.shuttle.passenger.model.PM2DrivingModel import io.reactivex.Observable import io.reactivex.ObservableOnSubscribe import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/network/PM2ServiceApi.java b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/network/PM2ServiceApi.java similarity index 82% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/network/PM2ServiceApi.java rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/network/PM2ServiceApi.java index 9a0f63e23e..8797caf27e 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/network/PM2ServiceApi.java +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/network/PM2ServiceApi.java @@ -1,8 +1,8 @@ -package com.mogo.och.bus.passenger.network; +package com.mogo.och.shuttle.passenger.network; -import com.mogo.och.bus.passenger.bean.PM2OperationStatusResponse; -import com.mogo.och.bus.passenger.bean.PM2QueryLineRequest; -import com.mogo.och.bus.passenger.bean.PM2RoutesResponse; +import com.mogo.och.shuttle.passenger.bean.PM2OperationStatusResponse; +import com.mogo.och.shuttle.passenger.bean.PM2QueryLineRequest; +import com.mogo.och.shuttle.passenger.bean.PM2RoutesResponse; import io.reactivex.Observable; import retrofit2.http.Body; diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2ADASPresenter.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2ADASPresenter.kt similarity index 74% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2ADASPresenter.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2ADASPresenter.kt index b3d6ab2894..4e28ee57de 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2ADASPresenter.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2ADASPresenter.kt @@ -1,11 +1,11 @@ -package com.mogo.och.bus.passenger.presenter +package com.mogo.och.shuttle.passenger.presenter import androidx.lifecycle.LifecycleOwner import com.mogo.commons.mvp.Presenter -import com.mogo.och.bus.passenger.callback.ADASCallback -import com.mogo.och.bus.passenger.constant.M2Const.Companion.M2_MAP_STATION_MAKER -import com.mogo.och.bus.passenger.model.PM2ADASModel -import com.mogo.och.bus.passenger.ui.PM2HPMapFragment +import com.mogo.och.shuttle.passenger.callback.ADASCallback +import com.mogo.och.shuttle.passenger.constant.M2Const.Companion.M2_MAP_STATION_MAKER +import com.mogo.och.shuttle.passenger.model.PM2ADASModel +import com.mogo.och.shuttle.passenger.ui.PM2HPMapFragment class PM2ADASPresenter(view: PM2HPMapFragment?) : Presenter(view), ADASCallback { diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2DrivingPresenter.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2DrivingPresenter.kt similarity index 91% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2DrivingPresenter.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2DrivingPresenter.kt index 54986df014..419f50e7ac 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2DrivingPresenter.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2DrivingPresenter.kt @@ -1,14 +1,14 @@ -package com.mogo.och.bus.passenger.presenter +package com.mogo.och.shuttle.passenger.presenter import androidx.lifecycle.LifecycleOwner import com.amap.api.maps.model.LatLng import com.mogo.commons.mvp.Presenter import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.bus.passenger.callback.AutoPilotStatusCallback -import com.mogo.och.bus.passenger.callback.DrivingInfoCallback -import com.mogo.och.bus.passenger.model.PM2ADASModel -import com.mogo.och.bus.passenger.model.PM2DrivingModel -import com.mogo.och.bus.passenger.ui.PM2DrivingInfoFragment +import com.mogo.och.shuttle.passenger.callback.AutoPilotStatusCallback +import com.mogo.och.shuttle.passenger.callback.DrivingInfoCallback +import com.mogo.och.shuttle.passenger.model.PM2ADASModel +import com.mogo.och.shuttle.passenger.model.PM2DrivingModel +import com.mogo.och.shuttle.passenger.ui.PM2DrivingInfoFragment import com.mogo.och.data.bean.BusStationBean class PM2DrivingPresenter(view: PM2DrivingInfoFragment?) : diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2Presenter.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2Presenter.kt similarity index 53% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2Presenter.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2Presenter.kt index e55cc469d1..450109ef98 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2Presenter.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2Presenter.kt @@ -1,7 +1,7 @@ -package com.mogo.och.bus.passenger.presenter +package com.mogo.och.shuttle.passenger.presenter import com.mogo.commons.mvp.Presenter -import com.mogo.och.bus.passenger.ui.PM2BaseFragment +import com.mogo.och.shuttle.passenger.ui.PM2BaseFragment class PM2Presenter(view: PM2BaseFragment?) : Presenter(view) \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2VideoPresenter.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2VideoPresenter.kt similarity index 53% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2VideoPresenter.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2VideoPresenter.kt index b62879bf4b..247a9ea7f1 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2VideoPresenter.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2VideoPresenter.kt @@ -1,7 +1,7 @@ -package com.mogo.och.bus.passenger.presenter +package com.mogo.och.shuttle.passenger.presenter import com.mogo.commons.mvp.Presenter -import com.mogo.och.bus.passenger.ui.video.PM2VideoFragment +import com.mogo.och.shuttle.passenger.ui.video.PM2VideoFragment class PM2VideoPresenter(view: PM2VideoFragment?) : Presenter(view) \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/provider/M2StatusViewManager.java b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/provider/M2StatusViewManager.java similarity index 86% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/provider/M2StatusViewManager.java rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/provider/M2StatusViewManager.java index 8966090d91..49b0288cd3 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/provider/M2StatusViewManager.java +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/provider/M2StatusViewManager.java @@ -1,9 +1,9 @@ -package com.mogo.och.bus.passenger.provider; +package com.mogo.och.shuttle.passenger.provider; import android.content.Context; import android.view.View; -import com.mogo.och.bus.passenger.ui.widget.M2StatusBarView; +import com.mogo.och.shuttle.passenger.ui.widget.M2StatusBarView; import androidx.annotation.NonNull; import com.alibaba.android.arouter.facade.annotation.Route; diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/PM2BaseFragment.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2BaseFragment.kt similarity index 90% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/ui/PM2BaseFragment.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2BaseFragment.kt index cfaf69365f..c84ad52e02 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/PM2BaseFragment.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2BaseFragment.kt @@ -1,9 +1,9 @@ -package com.mogo.och.bus.passenger.ui +package com.mogo.och.shuttle.passenger.ui import com.mogo.commons.mvp.MvpFragment -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.presenter.PM2Presenter -import com.mogo.och.bus.passenger.ui.video.PM2VideoFragment +import com.mogo.och.shuttle.passenger.R +import com.mogo.och.shuttle.passenger.presenter.PM2Presenter +import com.mogo.och.shuttle.passenger.ui.video.PM2VideoFragment /** * @author: wangmingjun diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2DrivingInfoFragment.kt similarity index 98% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/ui/PM2DrivingInfoFragment.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2DrivingInfoFragment.kt index 76bb502f48..4872a904f3 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/PM2DrivingInfoFragment.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2DrivingInfoFragment.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui +package com.mogo.och.shuttle.passenger.ui import android.graphics.BitmapFactory import android.graphics.drawable.AnimationDrawable @@ -11,8 +11,8 @@ import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView import com.mogo.eagle.core.function.view.SiteMarkerBean import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.presenter.PM2DrivingPresenter +import com.mogo.och.shuttle.passenger.R +import com.mogo.och.shuttle.passenger.presenter.PM2DrivingPresenter import com.mogo.och.common.module.utils.DateTimeUtil.* import com.mogo.och.common.module.utils.NumberFormatUtil import com.mogo.och.data.bean.BusStationBean diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/PM2HPMapFragment.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt similarity index 93% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/ui/PM2HPMapFragment.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt index ff7d473e84..a404d073b5 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/PM2HPMapFragment.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui +package com.mogo.och.shuttle.passenger.ui import android.os.Bundle import com.mogo.commons.mvp.MvpFragment @@ -7,9 +7,9 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.map.overlay.core.Level import com.mogo.map.overlay.point.Point import com.mogo.map.MapDataWrapper -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.constant.M2Const.Companion.TYPE_MARKER_M2_LINE -import com.mogo.och.bus.passenger.presenter.PM2ADASPresenter +import com.mogo.och.shuttle.passenger.R +import com.mogo.och.shuttle.passenger.constant.M2Const.Companion.TYPE_MARKER_M2_LINE +import com.mogo.och.shuttle.passenger.presenter.PM2ADASPresenter import com.mogo.och.common.module.utils.OCHThreadPoolManager import kotlinx.android.synthetic.main.shuttle_p_m2_hpmap_fragment.mapBizView diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/video/PM2VideoFragment.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/video/PM2VideoFragment.kt similarity index 91% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/ui/video/PM2VideoFragment.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/video/PM2VideoFragment.kt index b574c5e194..9752b6b86a 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/video/PM2VideoFragment.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/video/PM2VideoFragment.kt @@ -1,11 +1,11 @@ -package com.mogo.och.bus.passenger.ui.video +package com.mogo.och.shuttle.passenger.ui.video import com.google.gson.reflect.TypeToken import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.util.GsonUtils -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.presenter.PM2VideoPresenter +import com.mogo.och.shuttle.passenger.R +import com.mogo.och.shuttle.passenger.presenter.PM2VideoPresenter import com.mogo.och.common.module.wigets.video.AdsDatas import com.mogo.och.common.module.wigets.video.RotationItem import kotlinx.android.synthetic.main.shuttle_p_m2_video_fragment.imageVideoRotationView diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2BlueToothView.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2BlueToothView.kt similarity index 92% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2BlueToothView.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2BlueToothView.kt index 72b69bee01..42d43b81db 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2BlueToothView.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2BlueToothView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget +package com.mogo.och.shuttle.passenger.ui.widget import android.content.Context import android.util.AttributeSet @@ -6,7 +6,7 @@ import android.view.LayoutInflater import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.bus.passenger.R +import com.mogo.och.shuttle.passenger.R import kotlinx.android.synthetic.main.shuttle_p_m2_view_blue_tooth.view.blueView /** diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2PTrafficLightView.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2PTrafficLightView.kt similarity index 98% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2PTrafficLightView.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2PTrafficLightView.kt index 1efe064ae6..17e0c7e594 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2PTrafficLightView.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2PTrafficLightView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget +package com.mogo.och.shuttle.passenger.ui.widget import android.content.Context import android.util.AttributeSet @@ -9,7 +9,7 @@ import com.mogo.eagle.core.data.enums.TrafficLightEnum import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.bus.passenger.R +import com.mogo.och.shuttle.passenger.R import kotlinx.android.synthetic.main.shuttle_p_m2_traffic_light_view.view.m2_p_traffic_light_bg import kotlinx.android.synthetic.main.shuttle_p_m2_traffic_light_view.view.m2_p_traffic_light_iv import kotlinx.android.synthetic.main.shuttle_p_m2_traffic_light_view.view.m2_p_traffic_light_time_tv diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2StatusBarView.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2StatusBarView.kt similarity index 97% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2StatusBarView.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2StatusBarView.kt index 52f1cb0536..9d837d88bb 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2StatusBarView.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2StatusBarView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget +package com.mogo.och.shuttle.passenger.ui.widget import android.annotation.* import android.content.Context @@ -17,7 +17,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager import com.mogo.eagle.core.utilcode.kotlin.* import com.mogo.eagle.core.utilcode.util.ClickUtils -import com.mogo.och.bus.passenger.R +import com.mogo.och.shuttle.passenger.R import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.progress import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.tv_power_cos import kotlinx.coroutines.* diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2TurnLightView.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2TurnLightView.kt similarity index 98% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2TurnLightView.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2TurnLightView.kt index 4b47d58223..663976a36c 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2TurnLightView.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2TurnLightView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget +package com.mogo.och.shuttle.passenger.ui.widget import android.animation.AnimatorSet import android.animation.ObjectAnimator @@ -14,7 +14,7 @@ import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTurnLightListener import com.mogo.eagle.core.function.call.autopilot.CallerChassisLamplightListenerManager import com.mogo.eagle.core.function.call.v2x.CallerTurnLightListenerManager import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.bus.passenger.R +import com.mogo.och.shuttle.passenger.R import com.mogo.och.common.module.manager.lightmanager.TurnLightManager import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.left_nor_image import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.left_select_image diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt similarity index 98% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt index 9408aba57d..22b19e955f 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget.video +package com.mogo.och.shuttle.passenger.ui.widget.video import android.content.Context import android.media.AudioManager diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceImageView.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceImageView.kt similarity index 93% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceImageView.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceImageView.kt index d8f2581b5a..7967e593b7 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceImageView.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceImageView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget.video +package com.mogo.och.shuttle.passenger.ui.widget.video import android.annotation.SuppressLint import android.content.Context @@ -7,7 +7,7 @@ import android.widget.ImageView import android.widget.RelativeLayout import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions -import com.mogo.och.bus.passenger.R +import com.mogo.och.shuttle.passenger.R /** * @author: wangmingjun diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvancePagerAdapter.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvancePagerAdapter.kt similarity index 99% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvancePagerAdapter.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvancePagerAdapter.kt index 2d68d3b34d..f5e47f2d6e 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvancePagerAdapter.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvancePagerAdapter.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget.video +package com.mogo.och.shuttle.passenger.ui.widget.video import android.content.Context import android.view.View diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceVideoView.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceVideoView.kt similarity index 99% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceVideoView.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceVideoView.kt index dff721134d..18179b3065 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceVideoView.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceVideoView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget.video +package com.mogo.och.shuttle.passenger.ui.widget.video import android.annotation.SuppressLint import android.content.Context @@ -12,7 +12,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.util.FileUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.bus.passenger.R +import com.mogo.och.shuttle.passenger.R import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack import java.io.File diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceViewPager.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceViewPager.kt similarity index 90% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceViewPager.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceViewPager.kt index 1ec09195c3..699247294b 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceViewPager.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceViewPager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget.video +package com.mogo.och.shuttle.passenger.ui.widget.video import android.content.Context import android.util.AttributeSet diff --git a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/ImageAndVideoRotation.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/ImageAndVideoRotation.kt similarity index 95% rename from OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/ImageAndVideoRotation.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/ImageAndVideoRotation.kt index 02205dd945..bf7a667726 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/ImageAndVideoRotation.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/ImageAndVideoRotation.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget.video +package com.mogo.och.shuttle.passenger.ui.widget.video import android.annotation.SuppressLint import android.content.Context diff --git a/OCH/shuttle/passenger/src/main/java/passenger/IMogoOCH.java b/OCH/shuttle/passenger/src/main/java/passenger/IMogoOCH.java deleted file mode 100644 index 1f70b2dd7b..0000000000 --- a/OCH/shuttle/passenger/src/main/java/passenger/IMogoOCH.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.mogo.och.bus.passenger; - -import androidx.annotation.IdRes; -import androidx.fragment.app.FragmentActivity; - -import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider; - -/** - * 网约车抽象接口 - * - * Created on 2022/3/29 - */ -public interface IMogoOCH extends IMoGoFunctionProvider { - - /** - * 初始化网约车容器 - * - * @param activity - * @param containerId 容器ID - */ - void createCoverage(FragmentActivity activity, @IdRes int containerId); -} diff --git a/OCH/shuttle/passenger/src/main/java/passenger/utils/DimenUtil.kt b/OCH/shuttle/passenger/src/main/java/passenger/utils/DimenUtil.kt deleted file mode 100644 index 4ad4e9a2ba..0000000000 --- a/OCH/shuttle/passenger/src/main/java/passenger/utils/DimenUtil.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.mogo.och.bus.passenger.utils - -import android.content.res.Resources - -/** - * @author: wangmingjun - * @date: 2022/1/21 - */ -object DimenUtil{ - fun dp2px(value:Float):Float{ - return (0.5f + value * Resources.getSystem().displayMetrics.density) - } -} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_driving_info_fragment.xml b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_driving_info_fragment.xml index 0400960ed0..4233460588 100644 --- a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_driving_info_fragment.xml +++ b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_driving_info_fragment.xml @@ -285,7 +285,7 @@ app:layout_constraintBottom_toBottomOf="parent" /> - -