yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.2.6]

Browse Source 
[bus_p]
[mv file]
This commit is contained in:
yangyakun
2023-12-06 19:24:13 +08:00
parent e3fffc0ac6
commit 51c16b55d4
52 changed files with 107 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/shuttle/passenger/src/m2/AndroidManifest.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.mogo.och.bus.passenger">
package="com.mogo.och.shuttle.passenger">
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<application>

2
OCH/shuttle/passenger/src/main/AndroidManifest.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.mogo.och.bus.passenger">
package="com.mogo.och.shuttle.passenger">
</manifest>

6
OCH/shuttle/passenger/src/main/java/passenger/MogoOCHShuttlePassenger.kt → OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/MogoOCHShuttlePassenger.kt
View File

@@ -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-乘客端

2
OCH/shuttle/passenger/src/main/java/passenger/constant/BusPassengerConst.kt → OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/constant/BusPassengerConst.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.passenger.constant
package com.mogo.och.shuttle.passenger.constant
/**
* Created on 2021/12/6

2
OCH/shuttle/passenger/src/main/java/passenger/utils/BusPassengerMapAssetStyleUtil.java → OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/utils/BusPassengerMapAssetStyleUtil.java
View File

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

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

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

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

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

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

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

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

@@ -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
/**

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

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

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

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

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

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

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

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

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

@@ -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
/**
* 乘客屏小地图

2
OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/widget/BusPTurnLightView.kt
View File

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

2
OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2OperationStatusResponse.java → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2OperationStatusResponse.java
View File

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

2
OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2QueryLineRequest.java → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2QueryLineRequest.java
View File

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

2
OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2RoutesResponse.java → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2RoutesResponse.java
View File

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

2
OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2RoutesResult.java → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2RoutesResult.java
View File

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

2
OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2Station.java → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2Station.java
View File

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

2
OCH/shuttle/passenger/src/main/java/m2/passenger/callback/ADASCallback.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/ADASCallback.kt
View File

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

2
OCH/shuttle/passenger/src/main/java/m2/passenger/callback/AutoPilotStatusCallback.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/AutoPilotStatusCallback.kt
View File

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

2
OCH/shuttle/passenger/src/main/java/m2/passenger/callback/DrivingInfoCallback.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/DrivingInfoCallback.kt
View File

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

2
OCH/shuttle/passenger/src/main/java/m2/passenger/constant/M2Const.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/constant/M2Const.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.bus.passenger.constant
package com.mogo.och.shuttle.passenger.constant
/**
* Created on 2021/12/6

4
OCH/shuttle/passenger/src/main/java/m2/passenger/model/PM2ADASModel.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ADASModel.kt
View File

@@ -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
/**

19
OCH/shuttle/passenger/src/main/java/m2/passenger/model/PM2DrivingModel.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2DrivingModel.kt
View File

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

10
OCH/shuttle/passenger/src/main/java/m2/passenger/model/PM2ServiceManager.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ServiceManager.kt
View File

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

6
OCH/shuttle/passenger/src/main/java/m2/passenger/network/PM2ModelLoopManager.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/network/PM2ModelLoopManager.kt
View File

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

8
OCH/shuttle/passenger/src/main/java/m2/passenger/network/PM2ServiceApi.java → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/network/PM2ServiceApi.java
View File

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

10
OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2ADASPresenter.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2ADASPresenter.kt
View File

@@ -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<PM2HPMapFragment?>(view), ADASCallback {

12
OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2DrivingPresenter.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2DrivingPresenter.kt
View File

@@ -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?) :

4
OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2Presenter.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2Presenter.kt
View File

@@ -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<PM2BaseFragment?>(view)

4
OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2VideoPresenter.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2VideoPresenter.kt
View File

@@ -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<PM2VideoFragment?>(view)

4
OCH/shuttle/passenger/src/main/java/m2/passenger/provider/M2StatusViewManager.java → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/provider/M2StatusViewManager.java
View File

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

8
OCH/shuttle/passenger/src/main/java/m2/passenger/ui/PM2BaseFragment.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2BaseFragment.kt
View File

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

6
OCH/shuttle/passenger/src/main/java/m2/passenger/ui/PM2DrivingInfoFragment.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2DrivingInfoFragment.kt
View File

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

8
OCH/shuttle/passenger/src/main/java/m2/passenger/ui/PM2HPMapFragment.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt
View File

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

6
OCH/shuttle/passenger/src/main/java/m2/passenger/ui/video/PM2VideoFragment.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/video/PM2VideoFragment.kt
View File

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

4
OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2BlueToothView.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2BlueToothView.kt
View File

@@ -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
/**

4
OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2PTrafficLightView.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2PTrafficLightView.kt
View File

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

4
OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2StatusBarView.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2StatusBarView.kt
View File

@@ -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.*

4
OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2TurnLightView.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2TurnLightView.kt
View File

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

2
OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
View File

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

4
OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceImageView.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceImageView.kt
View File

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

2
OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvancePagerAdapter.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvancePagerAdapter.kt
View File

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

4
OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceVideoView.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceVideoView.kt
View File

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

2
OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceViewPager.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceViewPager.kt
View File

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

2
OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/ImageAndVideoRotation.kt → OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/ImageAndVideoRotation.kt
View File

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

22
OCH/shuttle/passenger/src/main/java/passenger/IMogoOCH.java
View File

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

13
OCH/shuttle/passenger/src/main/java/passenger/utils/DimenUtil.kt
View File

@@ -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)
}
}

2
OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_driving_info_fragment.xml
View File

@@ -285,7 +285,7 @@
app:layout_constraintBottom_toBottomOf="parent" />
<!-- 转向灯 IMoGoChassisLamplightListener-->
<com.mogo.och.bus.passenger.ui.widget.M2TurnLightView
<com.mogo.och.shuttle.passenger.ui.widget.M2TurnLightView
android:id="@+id/turn_light_view"
android:layout_width="@dimen/dp_86"
android:layout_height="@dimen/dp_47"

2
OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_video_fragment.xml
View File

@@ -5,7 +5,7 @@
<!-- 图片或视频广告-->
<com.mogo.och.bus.passenger.ui.widget.video.ImageAndVideoRotation
<com.mogo.och.shuttle.passenger.ui.widget.video.ImageAndVideoRotation
android:id="@+id/imageVideoRotationView"
android:layout_width="match_parent"
android:layout_height="match_parent"/>