[6.2.6]

[shuttle-jl]
[切换位置]

OCH/shuttle/passenger/build.gradle

@@ -44,6 +44,21 @@ android {
         }
     }
 
+    sourceSets {
+        main {
+            res.srcDirs = [
+                    'src/main/res',
+                    'src/main/res/m2',
+                    'src/main/res/jinlv',
+            ]
+            java.srcDirs = [
+                    'src/main/java',
+                    'src/main/java/m2',
+                    'src/main/java/jinlv',
+            ]
+        }
+    }
+
     flavorDimensions "vehicle"
     productFlavors {
         // 车型：金旅星辰、开沃 小巴业务

OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java

@@ -10,7 +10,7 @@ import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider;
  *
  * Created on 2022/3/29
  */
-interface IMogoOCH extends IMoGoFunctionProvider {
+public interface IMogoOCH extends IMoGoFunctionProvider {
 
     /**
      * 初始化网约车容器

OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt

@@ -1,7 +1,5 @@
 package com.mogo.och.bus.passenger.constant
 
-import com.mogo.commons.debug.DebugConfig
-
 /**
  * Created on 2021/12/6
  */

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/MogoOCHBusPassenger.java

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger;
+package com.mogo.och.shuttle.passenger;
 
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P;
 
@@ -14,8 +14,9 @@ import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager;
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.MultiDisplayUtils;
+import com.mogo.och.bus.passenger.IMogoOCH;
 import com.mogo.och.bus.passenger.constant.BusPassengerConst;
-import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment;
+import com.mogo.och.shuttle.passenger.ui.BusPassengerRouteFragment;
 import com.mogo.och.common.module.wigets.video.VideoPlayerActivity;
 
 import org.jetbrains.annotations.NotNull;

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/adapter/BusPassengerLineStationsAdapter.java

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.adapter;
+package com.mogo.och.shuttle.passenger.adapter;
 
 import android.content.Context;
 import android.text.TextUtils;

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerOperationStatusResponse.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;
 

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerQueryLineRequest.java

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.bean;
+package com.mogo.och.shuttle.passenger.bean;
 
 public
 /**

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerRoutesResponse.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;

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerRoutesResult.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;

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerStation.java

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.bean;
+package com.mogo.och.shuttle.passenger.bean;
 
 import java.util.Objects;
 

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassegerDriverStatusCallback.java

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.callback;
+package com.mogo.och.shuttle.passenger.callback;
 
 /**
  * @author: wangmingjun

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerADASStatusCallback.java

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.callback;
+package com.mogo.och.shuttle.passenger.callback;
 
 /**
  * Created on 2022/3/31

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerAutopilotPlanningCallback.java

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.callback;
+package com.mogo.och.shuttle.passenger.callback;
 
 import com.amap.api.maps.model.LatLng;
 

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerControllerStatusCallback.java

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.callback;
+package com.mogo.och.shuttle.passenger.callback;
 
 import com.mogo.eagle.core.data.map.MogoLocation;
 

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerMapViewCallback.java

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.callback;
+package com.mogo.och.shuttle.passenger.callback;
 
 /**
  * @author: wangmingjun

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerRouteLineInfoCallback.java

@@ -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;
 

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.model;
+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;
@@ -21,7 +21,6 @@ import com.mogo.commons.module.intent.IntentManager;
 import com.mogo.commons.module.status.IMogoStatusChangedListener;
 import com.mogo.commons.module.status.MogoStatusManager;
 import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener;
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager;
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager;
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
@@ -29,8 +28,8 @@ 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.bus.passenger.bean.BusPassengerOperationStatusResponse;
-import com.mogo.och.bus.passenger.bean.BusPassengerRoutesResponse;
+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;
 import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg;
 import com.mogo.och.common.module.bean.dpmsg.DPMsgType;
@@ -54,14 +53,14 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.eagle.core.utilcode.util.NetworkUtils;
-import com.mogo.och.bus.passenger.callback.IBusPassegerDriverStatusCallback;
-import com.mogo.och.bus.passenger.callback.IBusPassengerADASStatusCallback;
-import com.mogo.och.bus.passenger.callback.IBusPassengerAutopilotPlanningCallback;
-import com.mogo.och.bus.passenger.callback.IBusPassengerControllerStatusCallback;
-import com.mogo.och.bus.passenger.callback.IBusPassengerRouteLineInfoCallback;
+import com.mogo.och.shuttle.passenger.callback.IBusPassegerDriverStatusCallback;
+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.bus.passenger.network.BusPassengerModelLoopManager;
-import com.mogo.och.bus.passenger.network.BusPassengerServiceManager;
+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;
 import com.mogo.och.common.module.manager.AbnormalFactorsLoopManager;
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil;

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerModelLoopManager.java

@@ -1,7 +1,7 @@
-package com.mogo.och.bus.passenger.network;
+package com.mogo.och.shuttle.passenger.network;
 
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.och.bus.passenger.model.BusPassengerModel;
+import com.mogo.och.shuttle.passenger.model.BusPassengerModel;
 
 import java.util.concurrent.TimeUnit;
 

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerServiceManager.kt

@@ -1,13 +1,12 @@
-package com.mogo.och.bus.passenger.network
+package com.mogo.och.shuttle.passenger.network
 
 import android.content.Context
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.getServerToken
-import com.mogo.och.bus.passenger.bean.BusPassengerRoutesResponse
+import com.mogo.och.shuttle.passenger.bean.BusPassengerRoutesResponse
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
-import com.mogo.och.bus.passenger.bean.BusPassengerQueryLineRequest
-import com.mogo.och.bus.passenger.bean.BusPassengerOperationStatusResponse
+import com.mogo.och.shuttle.passenger.bean.BusPassengerQueryLineRequest
+import com.mogo.och.shuttle.passenger.bean.BusPassengerOperationStatusResponse
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
-import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 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
@@ -21,7 +20,8 @@ object BusPassengerServiceManager {
     private var driverSnCache = ""
 
     private var mShuttleBusPassengerServiceApi =
-        MoGoRetrofitFactory.getInstance(OchCommonConst.getShuttleUrl()).create(ShettlePassengerServiceApi::class.java)
+        MoGoRetrofitFactory.getInstance(OchCommonConst.getShuttleUrl()).create(
+            ShettlePassengerServiceApi::class.java)
 
     /**
      * 获取Bus司机端的sn

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/ShettlePassengerServiceApi.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.BusPassengerOperationStatusResponse;
-import com.mogo.och.bus.passenger.bean.BusPassengerQueryLineRequest;
-import com.mogo.och.bus.passenger.bean.BusPassengerRoutesResponse;
+import com.mogo.och.shuttle.passenger.bean.BusPassengerOperationStatusResponse;
+import com.mogo.och.shuttle.passenger.bean.BusPassengerQueryLineRequest;
+import com.mogo.och.shuttle.passenger.bean.BusPassengerRoutesResponse;
 
 import io.reactivex.Observable;
 import retrofit2.http.Body;

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/presenter/BaseBusPassengerPresenter.java

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.presenter;
+package com.mogo.och.shuttle.passenger.presenter;
 
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P;
 
@@ -13,13 +13,13 @@ import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
-import com.mogo.och.bus.passenger.callback.IBusPassegerDriverStatusCallback;
-import com.mogo.och.bus.passenger.callback.IBusPassengerADASStatusCallback;
-import com.mogo.och.bus.passenger.callback.IBusPassengerAutopilotPlanningCallback;
-import com.mogo.och.bus.passenger.callback.IBusPassengerControllerStatusCallback;
-import com.mogo.och.bus.passenger.callback.IBusPassengerRouteLineInfoCallback;
-import com.mogo.och.bus.passenger.model.BusPassengerModel;
-import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment;
+import com.mogo.och.shuttle.passenger.callback.IBusPassegerDriverStatusCallback;
+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.shuttle.passenger.model.BusPassengerModel;
+import com.mogo.och.shuttle.passenger.ui.BusPassengerRouteFragment;
 import com.mogo.och.data.bean.BusStationBean;
 
 import java.util.List;

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/provider/B1StatusViewManager.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.BusPStatusBarView;
+import com.mogo.och.shuttle.passenger.ui.BusPStatusBarView;
 import androidx.annotation.NonNull;
 
 import com.alibaba.android.arouter.facade.annotation.Route;

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPBlueToothView.kt

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui
+package com.mogo.och.shuttle.passenger.ui
 
 import android.content.Context
 import android.util.AttributeSet
@@ -7,7 +7,7 @@ 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 kotlinx.android.synthetic.jinlvvan.shuttle_p_jl_view_blue_tooth.view.blueView
+import kotlinx.android.synthetic.main.shuttle_p_jl_view_blue_tooth.view.blueView
 
 /**
  * 魔戒蓝牙控件

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPStatusBarView.kt

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui
+package com.mogo.och.shuttle.passenger.ui
 
 import android.annotation.*
 import android.content.Context

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerBaseFragment.java

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui;
+package com.mogo.och.shuttle.passenger.ui;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui;
+package com.mogo.och.shuttle.passenger.ui;
 
 import android.graphics.drawable.AnimationDrawable;
 import android.os.Bundle;
@@ -19,11 +19,11 @@ 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.bus.passenger.adapter.BusPassengerLineStationsAdapter;
+import com.mogo.och.shuttle.passenger.adapter.BusPassengerLineStationsAdapter;
 import com.mogo.och.bus.passenger.constant.BusPassengerConst;
-import com.mogo.och.bus.passenger.presenter.BaseBusPassengerPresenter;
-import com.mogo.och.bus.passenger.ui.layoutmanager.CenterLayoutManager;
-import com.mogo.och.bus.passenger.ui.mapdirectionview.BusPassengerMapDirectionView;
+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;
 import com.mogo.och.common.module.utils.NumberFormatUtil;
 import com.mogo.och.common.module.wigets.MarqueeTextView;
 import com.mogo.och.common.module.wigets.OCHGradientTextView;

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerTrafficLightView.kt

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui
+package com.mogo.och.shuttle.passenger.ui
 
 import android.content.Context
 import android.util.AttributeSet
@@ -10,9 +10,9 @@ import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListen
 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 kotlinx.android.synthetic.jinlvvan.shuttle_p_jl_traffic_light_view.view.bus_p_traffic_light_bg
-import kotlinx.android.synthetic.jinlvvan.shuttle_p_jl_traffic_light_view.view.bus_p_traffic_light_iv
-import kotlinx.android.synthetic.jinlvvan.shuttle_p_jl_traffic_light_view.view.bus_p_traffic_light_time_tv
+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
 
 /**
  * bus乘客端：红绿灯view

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/IBusPassengerMapDirectionView.java

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui;
+package com.mogo.och.shuttle.passenger.ui;
 
 /**
  * @author xiaoyuzhou

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/layoutmanager/CenterLayoutManager.java

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.layoutmanager;
+package com.mogo.och.shuttle.passenger.ui.layoutmanager;
 
 import android.content.Context;
 import android.util.AttributeSet;

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/mapdirectionview/BusPassengerMapDirectionView.kt

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.mapdirectionview
+package com.mogo.och.shuttle.passenger.ui.mapdirectionview
 
 import android.content.Context
 import android.os.Bundle
@@ -28,7 +28,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.och.bus.passenger.R
-import com.mogo.och.bus.passenger.ui.IBusPassengerMapDirectionView
+import com.mogo.och.shuttle.passenger.ui.IBusPassengerMapDirectionView
 import com.mogo.och.bus.passenger.utils.BusPassengerMapAssetStyleUtil
 
 /**

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/mapdirectionview/MapDirectionViewModel.kt

@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.mapdirectionview
+package com.mogo.och.shuttle.passenger.ui.mapdirectionview
 
 import androidx.lifecycle.ViewModel
 import com.amap.api.maps.model.LatLng
@@ -11,14 +11,14 @@ class MapDirectionViewModel: ViewModel(), ITrajectoryListener {
 
     private val TAG = MapDirectionViewModel::class.java.simpleName
 
-    private var viewCallback:ItineraryViewCallback?=null
+    private var viewCallback: ItineraryViewCallback?=null
 
 
     init {
         TrajectoryAndDistanceManager.addTrajectoryListener(TAG,this)
     }
 
-    fun setDistanceCallback(viewCallback:ItineraryViewCallback){
+    fun setDistanceCallback(viewCallback: ItineraryViewCallback){
         this.viewCallback = viewCallback
     }
 

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/widget/BusPTurnLightView.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

OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_base_fragment.xml

@@ -16,7 +16,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"/>
 
-    <com.mogo.och.bus.passenger.ui.BusPStatusBarView
+    <com.mogo.och.shuttle.passenger.ui.BusPStatusBarView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintLeft_toLeftOf="parent"

OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_route_fragment.xml

@@ -110,7 +110,7 @@
                 app:layout_constraintTop_toBottomOf="@+id/bus_p_speed_tv" />
 
 
-            <com.mogo.och.bus.passenger.ui.widget.BusPTurnLightView
+            <com.mogo.och.shuttle.passenger.ui.widget.BusPTurnLightView
                 android:layout_width="@dimen/dp_104"
                 android:layout_height="@dimen/dp_58"
                 android:layout_marginLeft="@dimen/dp_20"
@@ -267,7 +267,7 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <com.mogo.och.bus.passenger.ui.mapdirectionview.BusPassengerMapDirectionView
+        <com.mogo.och.shuttle.passenger.ui.mapdirectionview.BusPassengerMapDirectionView
             android:id="@+id/bus_p_line_map_view"
             android:layout_width="@dimen/bus_p_route_info_panel_width"
             android:layout_height="@dimen/bus_p_route_line_map_view_height"

OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_view_status_bar.xml

@@ -20,7 +20,7 @@
         android:layout_marginStart="@dimen/dp_40" />
 
     <!--魔方连接状态 蓝牙-->
-    <com.mogo.och.bus.passenger.ui.BusPBlueToothView
+    <com.mogo.och.shuttle.passenger.ui.BusPBlueToothView
         android:id="@+id/blueToothView"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"