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

[6.6.0]

Browse Source 
[shuttle]
[passenger]
[资源修改]
This commit is contained in:
yangyakun
2024-08-28 11:10:13 +08:00
parent 94031e4810
commit 857a60f4d0
43 changed files with 199 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/shuttle/passenger_weaknet/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.shuttle.passenger">
package="com.mogo.och.shuttle.weaknet.passenger">
</manifest>

12
OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/ShuttlePassengerProvider.kt → OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/ShuttlePassengerProvider.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger
package com.mogo.och.shuttle.weaknet.passenger
import android.content.Context
import android.view.View
@@ -12,11 +12,11 @@ import com.mogo.eagle.core.utilcode.util.MultiDisplayUtils
import com.mogo.och.common.module.constant.OchCommonConst
import com.mogo.och.common.module.biz.provider.CommonServiceImpl
import com.mogo.och.common.module.wigets.media.MediaPlayerActivity
import com.mogo.och.shuttle.passenger.model.TicketModel
import com.mogo.och.shuttle.passenger.ui.BusPStatusBarView
import com.mogo.och.shuttle.passenger.ui.BusPassengerRouteFragment
import com.mogo.och.shuttle.passenger.ui.PM2BaseFragment
import com.mogo.och.shuttle.passenger.ui.widget.M2StatusBarView
import com.mogo.och.shuttle.weaknet.passenger.model.TicketModel
import com.mogo.och.shuttle.weaknet.passenger.ui.BusPStatusBarView
import com.mogo.och.shuttle.weaknet.passenger.ui.BusPassengerRouteFragment
import com.mogo.och.shuttle.weaknet.passenger.ui.PM2BaseFragment
import com.mogo.och.shuttle.weaknet.passenger.ui.widget.M2StatusBarView
/**
* 网约车-Bus-乘客端

2
OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/request/PassengerQueryLineRequest.java → OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/request/PassengerQueryLineRequest.java
View File

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

2
OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/request/PassengerWriteOffRequest.java → OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/request/PassengerWriteOffRequest.java
View File

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

2
OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/response/PassengerOperationStatusResponse.java → OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/response/PassengerOperationStatusResponse.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.bean.response;
package com.mogo.och.shuttle.weaknet.passenger.bean.response;
import com.mogo.eagle.core.data.BaseData;

2
OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/response/PassengerRoutesResponse.java → OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/response/PassengerRoutesResponse.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.bean.response;
package com.mogo.och.shuttle.weaknet.passenger.bean.response;
import com.mogo.eagle.core.data.BaseData;
import com.mogo.och.data.bean.BusRoutesResult;

2
OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/response/PassengerWriteOffResponse.kt → OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/response/PassengerWriteOffResponse.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.bean.response
package com.mogo.och.shuttle.weaknet.passenger.bean.response
import com.mogo.eagle.core.data.BaseData

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

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

66
OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt → OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/TicketModel.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.model
package com.mogo.och.shuttle.weaknet.passenger.model
import com.mogo.commons.AbsMogoApplication
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -8,11 +8,11 @@ import com.mogo.eagle.core.utilcode.util.RegexUtils
import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffMsg
import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
import com.mogo.och.common.module.network.OchCommonServiceCallback
import com.mogo.och.shuttle.passenger.bean.request.PassengerWriteOffRequest
import com.mogo.och.shuttle.passenger.bean.response.PassengerWriteOffResponse
import com.mogo.och.shuttle.weaknet.passenger.bean.request.PassengerWriteOffRequest
import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerWriteOffResponse
import com.mogo.och.common.module.manager.scnner.ScannerManager
import com.mogo.och.common.module.manager.scnner.StateChangeListener
import com.mogo.och.shuttle.passenger.network.PassengerServiceManager
import com.mogo.och.shuttle.weaknet.passenger.network.PassengerServiceManager
object TicketModel : StateChangeListener {
@@ -61,22 +61,50 @@ object TicketModel : StateChangeListener {
CallerLogger.d(M_BUS_P + TAG, "核销失败 ${code}-----${msg}")
when (code) {
6002 -> {sendMessage2Driver("同一订单核销间隔时间需大于2分钟",phoneNum)}
1009 -> {sendMessage2Driver("车票所选乘车日期非今日",phoneNum)}
1005 -> {sendMessage2Driver("车辆未登录、或没有任务",phoneNum)}
1006 -> {sendMessage2Driver("车票路线信息与当前车辆执行任务的路线信息不符合",phoneNum)}
1008 -> {sendMessage2Driver("车票剩余可用次数为0",phoneNum)}
6001 -> {sendMessage2Driver("二维码已过期",phoneNum)}
1012 -> {sendMessage2Driver("当前用户下单路线非当前的车辆所属公司",phoneNum)}
6002 -> {
sendMessage2Driver("同一订单核销间隔时间需大于2分钟",phoneNum)
}
1009 -> {
sendMessage2Driver("车票所选乘车日期非今日",phoneNum)
}
1005 -> {
sendMessage2Driver("车辆未登录、或没有任务",phoneNum)
}
1006 -> {
sendMessage2Driver("车票路线信息与当前车辆执行任务的路线信息不符合",phoneNum)
}
1008 -> {
sendMessage2Driver("车票剩余可用次数为0",phoneNum)
}
6001 -> {
sendMessage2Driver("二维码已过期",phoneNum)
}
1012 -> {
sendMessage2Driver("当前用户下单路线非当前的车辆所属公司",phoneNum)
}
else -> {
when (msg) {
"6002" -> {sendMessage2Driver("同一订单核销间隔时间需大于2分钟",phoneNum)}
"1009" -> {sendMessage2Driver("车票所选乘车日期非今日",phoneNum)}
"1005" -> {sendMessage2Driver("车辆未登录、或没有任务",phoneNum)}
"1006" -> {sendMessage2Driver("车票路线信息与当前车辆执行任务的路线信息不符合",phoneNum)}
"1008" -> {sendMessage2Driver("车票剩余可用次数为0",phoneNum)}
"6001" -> {sendMessage2Driver("二维码已过期",phoneNum)}
"1012" -> {sendMessage2Driver("当前用户下单路线非当前的车辆所属公司",phoneNum)}
"6002" -> {
sendMessage2Driver("同一订单核销间隔时间需大于2分钟",phoneNum)
}
"1009" -> {
sendMessage2Driver("车票所选乘车日期非今日",phoneNum)
}
"1005" -> {
sendMessage2Driver("车辆未登录、或没有任务",phoneNum)
}
"1006" -> {
sendMessage2Driver("车票路线信息与当前车辆执行任务的路线信息不符合",phoneNum)
}
"1008" -> {
sendMessage2Driver("车票剩余可用次数为0",phoneNum)
}
"6001" -> {
sendMessage2Driver("二维码已过期",phoneNum)
}
"1012" -> {
sendMessage2Driver("当前用户下单路线非当前的车辆所属公司",phoneNum)
}
else -> {
sendMessage2Driver(msg?:"",phoneNum)
}
@@ -97,7 +125,7 @@ object TicketModel : StateChangeListener {
CallerLogger.d(M_BUS_P + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg))
LanSocketManager.sendMsgToServer(msg)
}
private fun sendMessage2DriverSuccess(message: PassengerWriteOffResponse.Result,orderNo: String){
private fun sendMessage2DriverSuccess(message: PassengerWriteOffResponse.Result, orderNo: String){
val msg = WriteOffMsg(true, message.phone, message.ticketSize, message.ticketName, "",orderNo)
CallerLogger.d(M_BUS_P + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg))
LanSocketManager.sendMsgToServer(msg)

12
OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/network/PassengerServiceManager.kt → OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/network/PassengerServiceManager.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.network
package com.mogo.och.shuttle.weaknet.passenger.network
import android.content.Context
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
@@ -12,11 +12,11 @@ import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.network.OchCommonServiceCallback
import com.mogo.och.common.module.network.OchCommonSubscribeImpl
import com.mogo.och.common.module.network.interceptor.transformTry
import com.mogo.och.shuttle.passenger.bean.request.PassengerQueryLineRequest
import com.mogo.och.shuttle.passenger.bean.request.PassengerWriteOffRequest
import com.mogo.och.shuttle.passenger.bean.response.PassengerOperationStatusResponse
import com.mogo.och.shuttle.passenger.bean.response.PassengerRoutesResponse
import com.mogo.och.shuttle.passenger.bean.response.PassengerWriteOffResponse
import com.mogo.och.shuttle.weaknet.passenger.bean.request.PassengerQueryLineRequest
import com.mogo.och.shuttle.weaknet.passenger.bean.request.PassengerWriteOffRequest
import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerOperationStatusResponse
import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerRoutesResponse
import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerWriteOffResponse
/**
* Created on 2022/3/31

12
OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/network/ServiceApi.java → OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/network/ServiceApi.java
View File

@@ -1,10 +1,10 @@
package com.mogo.och.shuttle.passenger.network;
package com.mogo.och.shuttle.weaknet.passenger.network;
import com.mogo.och.shuttle.passenger.bean.request.PassengerQueryLineRequest;
import com.mogo.och.shuttle.passenger.bean.request.PassengerWriteOffRequest;
import com.mogo.och.shuttle.passenger.bean.response.PassengerOperationStatusResponse;
import com.mogo.och.shuttle.passenger.bean.response.PassengerRoutesResponse;
import com.mogo.och.shuttle.passenger.bean.response.PassengerWriteOffResponse;
import com.mogo.och.shuttle.weaknet.passenger.bean.request.PassengerQueryLineRequest;
import com.mogo.och.shuttle.weaknet.passenger.bean.request.PassengerWriteOffRequest;
import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerOperationStatusResponse;
import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerRoutesResponse;
import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerWriteOffResponse;
import io.reactivex.Observable;
import retrofit2.http.Body;

2
OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassegerDriverStatusCallback.java → OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/callback/IBusPassegerDriverStatusCallback.java
View File

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

2
OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerADASStatusCallback.java → OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/callback/IBusPassengerADASStatusCallback.java
View File

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

2
OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerAutopilotPlanningCallback.java → OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/callback/IBusPassengerAutopilotPlanningCallback.java
View File

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

2
OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerControllerStatusCallback.java → OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/callback/IBusPassengerControllerStatusCallback.java
View File

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

2
OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerRouteLineInfoCallback.java → OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/callback/IBusPassengerRouteLineInfoCallback.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.callback;
package com.mogo.och.shuttle.weaknet.passenger.callback;
import com.mogo.och.data.bean.BusStationBean;

28
OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java → OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/model/BusPassengerModel.java
View File

@@ -1,8 +1,8 @@
package com.mogo.och.shuttle.passenger.model;
package com.mogo.och.shuttle.weaknet.passenger.model;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P;
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 static com.mogo.och.shuttle.weaknet.passenger.constant.BusPassengerConst.QUERY_BUS_P_STATION_DELAY;
import static com.mogo.och.shuttle.weaknet.passenger.constant.BusPassengerConst.STATION_STATUS_STOPPED;
import android.content.Context;
import android.content.Intent;
@@ -32,7 +32,7 @@ import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager;
import com.mogo.och.common.module.manager.socket.lan.LanSocketManager;
import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType;
import com.mogo.och.common.module.voice.VoiceNotice;
import com.mogo.och.shuttle.passenger.R;
import com.mogo.och.shuttle.weaknet.passenger.R;
import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg;
import com.mogo.och.common.module.manager.socket.lan.bean.BaseDPMsg;
import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType;
@@ -48,21 +48,21 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.util.NetworkUtils;
import com.mogo.och.shuttle.passenger.bean.response.PassengerOperationStatusResponse;
import com.mogo.och.shuttle.passenger.bean.response.PassengerRoutesResponse;
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.constant.BusPassengerConst;
import com.mogo.och.shuttle.passenger.network.BusPassengerModelLoopManager;
import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerOperationStatusResponse;
import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerRoutesResponse;
import com.mogo.och.shuttle.weaknet.passenger.callback.IBusPassegerDriverStatusCallback;
import com.mogo.och.shuttle.weaknet.passenger.callback.IBusPassengerADASStatusCallback;
import com.mogo.och.shuttle.weaknet.passenger.callback.IBusPassengerAutopilotPlanningCallback;
import com.mogo.och.shuttle.weaknet.passenger.callback.IBusPassengerControllerStatusCallback;
import com.mogo.och.shuttle.weaknet.passenger.callback.IBusPassengerRouteLineInfoCallback;
import com.mogo.och.shuttle.weaknet.passenger.constant.BusPassengerConst;
import com.mogo.och.shuttle.weaknet.passenger.network.BusPassengerModelLoopManager;
import com.mogo.och.common.module.network.OchCommonServiceCallback;
import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager;
import com.mogo.och.data.bean.BusRoutesResult;
import com.mogo.och.data.bean.BusStationBean;
import com.mogo.och.data.bean.BusTransferData;
import com.mogo.och.shuttle.passenger.network.PassengerServiceManager;
import com.mogo.och.shuttle.weaknet.passenger.network.PassengerServiceManager;
import java.util.ArrayList;
import java.util.List;

9
OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerModelLoopManager.java → OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/network/BusPassengerModelLoopManager.java
View File

@@ -1,19 +1,18 @@
package com.mogo.och.shuttle.passenger.network;
package com.mogo.och.shuttle.weaknet.passenger.network;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.och.shuttle.passenger.model.BusPassengerModel;
import com.mogo.och.shuttle.weaknet.passenger.model.BusPassengerModel;
import java.util.concurrent.TimeUnit;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
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.shuttle.passenger.constant.BusPassengerConst.LOOP_DELAY;
import static com.mogo.och.shuttle.passenger.constant.BusPassengerConst.LOOP_LINE_2S;
import static com.mogo.och.shuttle.weaknet.passenger.constant.BusPassengerConst.LOOP_DELAY;
import static com.mogo.och.shuttle.weaknet.passenger.constant.BusPassengerConst.LOOP_LINE_2S;
/**
* Created on 2021/11/22

18
OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/presenter/BaseBusPassengerPresenter.java → OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/presenter/BaseBusPassengerPresenter.java
View File

@@ -1,9 +1,7 @@
package com.mogo.och.shuttle.passenger.presenter;
package com.mogo.och.shuttle.weaknet.passenger.presenter;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P;
import android.os.Looper;
import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleOwner;
@@ -13,13 +11,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.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.shuttle.weaknet.passenger.callback.IBusPassegerDriverStatusCallback;
import com.mogo.och.shuttle.weaknet.passenger.callback.IBusPassengerADASStatusCallback;
import com.mogo.och.shuttle.weaknet.passenger.callback.IBusPassengerAutopilotPlanningCallback;
import com.mogo.och.shuttle.weaknet.passenger.callback.IBusPassengerControllerStatusCallback;
import com.mogo.och.shuttle.weaknet.passenger.callback.IBusPassengerRouteLineInfoCallback;
import com.mogo.och.shuttle.weaknet.passenger.model.BusPassengerModel;
import com.mogo.och.shuttle.weaknet.passenger.ui.BusPassengerRouteFragment;
import com.mogo.och.data.bean.BusStationBean;
import java.util.List;

6
OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPBlueToothView.kt → OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPBlueToothView.kt
View File

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

6
OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPStatusBarView.kt → OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPStatusBarView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.ui
package com.mogo.och.shuttle.weaknet.passenger.ui
import android.annotation.*
import android.content.Context
@@ -13,8 +13,8 @@ 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.AppUtils
import com.mogo.och.shuttle.passenger.R
import kotlinx.android.synthetic.main.shuttle_p_jl_view_status_bar.view.tv_shuttle_b1_p_version
import com.mogo.och.shuttle.weaknet.passenger.R
import kotlinx.android.synthetic.main.shuttle_p_weak_jl_view_status_bar.view.tv_shuttle_b1_p_version
import kotlinx.coroutines.*
import me.jessyan.autosize.utils.AutoSizeUtils

4
OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerBaseFragment.java → OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerBaseFragment.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.ui;
package com.mogo.och.shuttle.weaknet.passenger.ui;
import android.os.Bundle;
import android.view.LayoutInflater;
@@ -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.shuttle.passenger.R;
import com.mogo.och.shuttle.weaknet.passenger.R;
/**
* Created on 2022/3/31

10
OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java → OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.ui;
package com.mogo.och.shuttle.weaknet.passenger.ui;
import android.content.Context;
import android.graphics.drawable.AnimationDrawable;
@@ -24,10 +24,10 @@ import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView;
import com.mogo.map.overlay.IMoGoOverlayManager;
import com.mogo.och.common.module.utils.ResourcesUtils;
import com.mogo.och.shuttle.passenger.R;
import com.mogo.och.shuttle.passenger.ui.adapter.BusPassengerLineStationsAdapter;
import com.mogo.och.shuttle.passenger.presenter.BaseBusPassengerPresenter;
import com.mogo.och.shuttle.passenger.ui.layoutmanager.CenterLayoutManager;
import com.mogo.och.shuttle.weaknet.passenger.R;
import com.mogo.och.shuttle.weaknet.passenger.ui.adapter.BusPassengerLineStationsAdapter;
import com.mogo.och.shuttle.weaknet.passenger.presenter.BaseBusPassengerPresenter;
import com.mogo.och.shuttle.weaknet.passenger.ui.layoutmanager.CenterLayoutManager;
import com.mogo.och.common.module.wigets.mapdirectionview.MapDirectionView;
import com.mogo.och.common.module.utils.NumberFormatUtil;
import com.mogo.och.common.module.wigets.MarqueeTextView;

10
OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerTrafficLightView.kt → OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerTrafficLightView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.ui
package com.mogo.och.shuttle.weaknet.passenger.ui
import android.content.Context
import android.util.AttributeSet
@@ -9,10 +9,10 @@ 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.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
import com.mogo.och.shuttle.weaknet.passenger.R
import kotlinx.android.synthetic.main.shuttle_p_weak_jl_traffic_light_view.view.bus_p_traffic_light_bg
import kotlinx.android.synthetic.main.shuttle_p_weak_jl_traffic_light_view.view.bus_p_traffic_light_iv
import kotlinx.android.synthetic.main.shuttle_p_weak_jl_traffic_light_view.view.bus_p_traffic_light_time_tv
/**
* bus乘客端：红绿灯view

10
OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/adapter/BusPassengerLineStationsAdapter.java → OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/adapter/BusPassengerLineStationsAdapter.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.ui.adapter;
package com.mogo.och.shuttle.weaknet.passenger.ui.adapter;
import android.content.Context;
import android.text.TextUtils;
@@ -11,16 +11,16 @@ import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.mogo.och.shuttle.passenger.R;
import com.mogo.och.shuttle.weaknet.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.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;
import static com.mogo.och.shuttle.weaknet.passenger.constant.BusPassengerConst.STATION_STATUS_ARRIVING;
import static com.mogo.och.shuttle.weaknet.passenger.constant.BusPassengerConst.STATION_STATUS_LEAVING;
import static com.mogo.och.shuttle.weaknet.passenger.constant.BusPassengerConst.STATION_STATUS_STOPPED;
/**
* @author: wangmingjun

2
OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/layoutmanager/CenterLayoutManager.java → OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/layoutmanager/CenterLayoutManager.java
View File

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

15
OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/widget/BusPTurnLightView.kt → OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPTurnLightView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.ui.widget
package com.mogo.och.shuttle.weaknet.passenger.ui.widget
import android.animation.AnimatorSet
import android.animation.ObjectAnimator
@@ -13,13 +13,14 @@ import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTurnLightListener
import com.mogo.eagle.core.function.call.v2x.CallerTurnLightListenerManager
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.och.shuttle.passenger.R
import com.mogo.och.shuttle.weaknet.passenger.R
import com.mogo.och.common.module.manager.light.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
import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.right_nor_image
import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.right_select_image
import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.turn_light_layout
import kotlinx.android.synthetic.main.shuttle_p_weak_jl_turn_light_status.view.left_nor_image
import kotlinx.android.synthetic.main.shuttle_p_weak_jl_turn_light_status.view.left_select_image
import kotlinx.android.synthetic.main.shuttle_p_weak_jl_turn_light_status.view.right_nor_image
import kotlinx.android.synthetic.main.shuttle_p_weak_jl_turn_light_status.view.right_select_image
import kotlinx.android.synthetic.main.shuttle_p_weak_jl_turn_light_status.view.turn_light_layout
/**
* @author: wangmingjun

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

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

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

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

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

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.callback
package com.mogo.och.shuttle.weaknet.passenger.callback
import com.mogo.och.data.bean.BusStationBean

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

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

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

@@ -1,7 +1,7 @@
package com.mogo.och.shuttle.passenger.model
package com.mogo.och.shuttle.weaknet.passenger.model
import android.content.Context
import com.mogo.och.shuttle.passenger.callback.ADASCallback
import com.mogo.och.shuttle.weaknet.passenger.callback.ADASCallback
import com.mogo.och.data.bean.BusStationBean
/**

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

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.model
package com.mogo.och.shuttle.weaknet.passenger.model
import android.content.Context
import android.media.AudioAttributes
@@ -50,13 +50,13 @@ import com.mogo.och.common.module.voice.VoiceNotice.showNotice
import com.mogo.och.data.bean.BusRoutesResult
import com.mogo.och.data.bean.BusStationBean
import com.mogo.och.data.bean.BusTransferData
import com.mogo.och.shuttle.passenger.R
import com.mogo.och.shuttle.passenger.bean.response.PassengerOperationStatusResponse
import com.mogo.och.shuttle.passenger.bean.response.PassengerRoutesResponse
import com.mogo.och.shuttle.passenger.callback.AutoPilotStatusCallback
import com.mogo.och.shuttle.passenger.callback.DrivingInfoCallback
import com.mogo.och.shuttle.passenger.constant.BusPassengerConst
import com.mogo.och.shuttle.passenger.network.PassengerServiceManager
import com.mogo.och.shuttle.weaknet.passenger.R
import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerOperationStatusResponse
import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerRoutesResponse
import com.mogo.och.shuttle.weaknet.passenger.callback.AutoPilotStatusCallback
import com.mogo.och.shuttle.weaknet.passenger.callback.DrivingInfoCallback
import com.mogo.och.shuttle.weaknet.passenger.constant.BusPassengerConst
import com.mogo.och.shuttle.weaknet.passenger.network.PassengerServiceManager
import io.reactivex.schedulers.Schedulers
import kotlin.math.abs
@@ -283,7 +283,7 @@ class PM2DrivingModel private constructor() {
override fun onAutopilotStatusResponse(state: Int) {
super.onAutopilotStatusResponse(state)
d(SceneConstant.M_BUS_P+TAG, "onAutopilotStatusResponse ===== $state")
d(SceneConstant.M_BUS_P+ TAG, "onAutopilotStatusResponse ===== $state")
if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING != state){
//美化模式下且行程中
if (FunctionBuildConfig.isDemoMode &&
@@ -301,7 +301,8 @@ class PM2DrivingModel private constructor() {
}
private fun queryDriverOperationDelay() {
handler.sendEmptyMessageDelayed(MSG_QUERY_BUS_P_STATION,
handler.sendEmptyMessageDelayed(
MSG_QUERY_BUS_P_STATION,
BusPassengerConst.QUERY_BUS_P_STATION_DELAY
)
}
@@ -315,7 +316,7 @@ class PM2DrivingModel private constructor() {
if (data?.data == null) return
if (data.data.driverStatus != operationStatus?.driverStatus
|| data.data.plateNumber != operationStatus?.plateNumber){
d(SceneConstant.M_BUS_P+TAG, "queryDriverOperationStatus ===== 车牌或者登陆状态有变更")
d(SceneConstant.M_BUS_P+ TAG, "queryDriverOperationStatus ===== 车牌或者登陆状态有变更")
mDrivingInfoCallback?.changeOperationStatus(data.data.driverStatus == 1)
}
operationStatus = data.data as PassengerOperationStatusResponse.Result
@@ -348,13 +349,13 @@ class PM2DrivingModel private constructor() {
if (routesResult != null) {
routesResult = null
updateLocalOrder()
d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate= result is null")
d(SceneConstant.M_BUS_P+ TAG, "queryDriverSiteByCoordinate= result is null")
return
}
return
}
if (data.result != null && data.result.equals(routesResult)){
d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate= not update")
d(SceneConstant.M_BUS_P+ TAG, "queryDriverSiteByCoordinate= not update")
return
}
@@ -380,7 +381,7 @@ class PM2DrivingModel private constructor() {
}
override fun onFail(code: Int, msg: String?) {
d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate = %s", msg)
d(SceneConstant.M_BUS_P+ TAG, "queryDriverSiteByCoordinate = %s", msg)
if (code == 1003){
queryDriverOperationDelay()
cleanStation("queryDriverSiteByCoordinate 1003")
@@ -415,11 +416,11 @@ class PM2DrivingModel private constructor() {
}
if (routesResult != null && routesResult!!.lineId != result.lineId){
d(SceneConstant.M_BUS_P+TAG, "lineId change= clearCustomPolyline")
d(SceneConstant.M_BUS_P+ TAG, "lineId change= clearCustomPolyline")
mDrivingInfoCallback?.clearCustomPolyline()
}
d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate= update")
d(SceneConstant.M_BUS_P+ TAG, "queryDriverSiteByCoordinate= update")
routesResult = result
mDrivingInfoCallback?.updateLine(result.name, result.runningDur)
@@ -434,8 +435,8 @@ class PM2DrivingModel private constructor() {
if (station.drivingStatus == BusPassengerConst.STATION_STATUS_STOPPED
&& station.isLeaving && i + 1 < stations.size) {
mDrivingInfoCallback?.updateStationsInfo(stations as MutableList<BusStationBean>, i + 1, false)
d(SceneConstant.M_BUS_P+TAG,"och-rotting--mNextStationIndex = $mNextStationIndex , i = $i")
d(SceneConstant.M_BUS_P+TAG,"och-rotting--start ")
d(SceneConstant.M_BUS_P+ TAG,"och-rotting--mNextStationIndex = $mNextStationIndex , i = $i")
d(SceneConstant.M_BUS_P+ TAG,"och-rotting--start ")
isGoingToNextStation = true
mNextStationIndex = i + 1
val startStation = mStations[i]
@@ -443,8 +444,8 @@ class PM2DrivingModel private constructor() {
setTrajectoryStation(startStation, endStation, result.lineId)
return
} else if (station.drivingStatus == BusPassengerConst.STATION_STATUS_STOPPED && !station.isLeaving) {
d(SceneConstant.M_BUS_P+TAG,"och-rotting--mNextStationIndex = $mNextStationIndex , i = $i")
d(SceneConstant.M_BUS_P+TAG,"och-rotting--arrived ")
d(SceneConstant.M_BUS_P+ TAG,"och-rotting--mNextStationIndex = $mNextStationIndex , i = $i")
d(SceneConstant.M_BUS_P+ TAG,"och-rotting--arrived ")
if (i == stations.size - 1) {
cleanStation("updatePassengerRouteInfo最后一个站点")
}

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

@@ -1,11 +1,11 @@
package com.mogo.och.shuttle.passenger.presenter
package com.mogo.och.shuttle.weaknet.passenger.presenter
import androidx.lifecycle.LifecycleOwner
import com.mogo.commons.mvp.Presenter
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
import com.mogo.och.shuttle.weaknet.passenger.callback.ADASCallback
import com.mogo.och.shuttle.weaknet.passenger.constant.M2Const.Companion.M2_MAP_STATION_MAKER
import com.mogo.och.shuttle.weaknet.passenger.model.PM2ADASModel
import com.mogo.och.shuttle.weaknet.passenger.ui.PM2HPMapFragment
class PM2ADASPresenter(view: PM2HPMapFragment?) :
Presenter<PM2HPMapFragment?>(view), ADASCallback {

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

@@ -1,14 +1,14 @@
package com.mogo.och.shuttle.passenger.presenter
package com.mogo.och.shuttle.weaknet.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.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.shuttle.weaknet.passenger.callback.AutoPilotStatusCallback
import com.mogo.och.shuttle.weaknet.passenger.callback.DrivingInfoCallback
import com.mogo.och.shuttle.weaknet.passenger.model.PM2ADASModel
import com.mogo.och.shuttle.weaknet.passenger.model.PM2DrivingModel
import com.mogo.och.shuttle.weaknet.passenger.ui.PM2DrivingInfoFragment
import com.mogo.och.data.bean.BusStationBean
class PM2DrivingPresenter(view: PM2DrivingInfoFragment?) :

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

@@ -1,7 +1,7 @@
package com.mogo.och.shuttle.passenger.presenter
package com.mogo.och.shuttle.weaknet.passenger.presenter
import com.mogo.commons.mvp.Presenter
import com.mogo.och.shuttle.passenger.ui.PM2BaseFragment
import com.mogo.och.shuttle.weaknet.passenger.ui.PM2BaseFragment
class PM2Presenter(view: PM2BaseFragment?) :
Presenter<PM2BaseFragment?>(view)

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

@@ -1,9 +1,9 @@
package com.mogo.och.shuttle.passenger.ui
package com.mogo.och.shuttle.weaknet.passenger.ui
import com.mogo.commons.mvp.MvpFragment
import com.mogo.eagle.core.utilcode.util.AppUtils
import com.mogo.och.shuttle.passenger.R
import com.mogo.och.shuttle.passenger.presenter.PM2Presenter
import com.mogo.och.shuttle.weaknet.passenger.R
import com.mogo.och.shuttle.weaknet.passenger.presenter.PM2Presenter
import com.mogo.och.common.module.wigets.media.MediaPlayerFragment
import kotlinx.android.synthetic.main.shuttle_p_m2_fragment.tv_shuttle_b2_p_version

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

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.ui
package com.mogo.och.shuttle.weaknet.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.shuttle.passenger.R
import com.mogo.och.shuttle.passenger.presenter.PM2DrivingPresenter
import com.mogo.och.shuttle.weaknet.passenger.R
import com.mogo.och.shuttle.weaknet.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_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt → OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2HPMapFragment.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.ui
package com.mogo.och.shuttle.weaknet.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.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.shuttle.weaknet.passenger.R
import com.mogo.och.shuttle.weaknet.passenger.constant.M2Const.Companion.TYPE_MARKER_M2_LINE
import com.mogo.och.shuttle.weaknet.passenger.presenter.PM2ADASPresenter
import com.mogo.och.common.module.utils.OCHThreadPoolManager
import kotlinx.android.synthetic.main.shuttle_p_m2_hpmap_fragment.mapBizView

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

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.ui.widget
package com.mogo.och.shuttle.weaknet.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.shuttle.passenger.R
import com.mogo.och.shuttle.weaknet.passenger.R
import kotlinx.android.synthetic.main.shuttle_p_m2_view_blue_tooth.view.blueView
/**

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

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.ui.widget
package com.mogo.och.shuttle.weaknet.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.shuttle.passenger.R
import com.mogo.och.shuttle.weaknet.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_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2StatusBarView.kt → OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.ui.widget
package com.mogo.och.shuttle.weaknet.passenger.ui.widget
import android.annotation.*
import android.content.Context
@@ -18,7 +18,7 @@ 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.eagle.core.utilcode.util.ThreadUtils
import com.mogo.och.shuttle.passenger.R
import com.mogo.och.shuttle.weaknet.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.*

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

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.ui.widget
package com.mogo.och.shuttle.weaknet.passenger.ui.widget
import android.animation.AnimatorSet
import android.animation.ObjectAnimator
@@ -13,13 +13,14 @@ import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTurnLightListener
import com.mogo.eagle.core.function.call.v2x.CallerTurnLightListenerManager
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.och.shuttle.passenger.R
import com.mogo.och.shuttle.weaknet.passenger.R
import com.mogo.och.common.module.manager.light.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
import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.right_nor_image
import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.right_select_image
import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.turn_light_layout
import kotlinx.android.synthetic.main.shuttle_p_m2_turn_light_status.view.left_nor_image
import kotlinx.android.synthetic.main.shuttle_p_m2_turn_light_status.view.left_select_image
import kotlinx.android.synthetic.main.shuttle_p_m2_turn_light_status.view.right_nor_image
import kotlinx.android.synthetic.main.shuttle_p_m2_turn_light_status.view.right_select_image
import kotlinx.android.synthetic.main.shuttle_p_m2_turn_light_status.view.turn_light_layout
/**
* @author: wangmingjun