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

Merge branch 'refs/heads/dev_robotaxi-d_240729_6.6.0' into dev_robotaxi-d_240807_6.6.0

Browse Source
This commit is contained in:
yangyakun
2024-08-08 10:50:22 +08:00
parent afd1f0ae03 579d706cbf
commit b4dc590412
376 changed files with 604 additions and 1130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OCH/common/biz/src/main/java/com/mogo/och/biz/login/net/OchCommonServiceManager.kt
View File

@@ -7,7 +7,6 @@ import com.mogo.och.biz.login.bean.DriverStatusQueryRespBean
import com.mogo.och.biz.login.bean.TaxiLoginReqBean
import com.mogo.eagle.core.data.BaseData
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
import com.mogo.eagle.core.network.MoGoRetrofitFactory
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -19,7 +18,7 @@ import com.mogo.och.common.module.constant.OchCommonConst
import com.mogo.och.common.module.network.OchCommonServiceCallback
import com.mogo.och.common.module.network.OchCommonSubscribeImpl
import com.mogo.och.common.module.network.interceptor.transformTry
import com.mogo.och.common.module.utils.ProjectUtils
import com.mogo.commons.env.ProjectUtils
object OchCommonServiceManager {

3
OCH/common/common/build.gradle
View File

@@ -64,6 +64,9 @@ dependencies {
implementation rootProject.ext.dependencies.amapnavi3dmap
implementation rootProject.ext.dependencies.rxandroid
// 串口链接
implementation rootProject.ext.dependencies.serialport
implementation rootProject.ext.dependencies.arouter
kapt rootProject.ext.dependencies.aroutercompiler

4
OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/IOchLanPassengerStatusListener.java
View File

@@ -5,4 +5,8 @@ public interface IOchLanPassengerStatusListener {
default void onDriverSnChagneListner(String sn) {
}
default void onDriverConnectChangeListener(boolean isConnect){
}
}

3
OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanPassengerSocket.kt
View File

@@ -47,6 +47,9 @@ object LoginLanPassengerSocket : IReceivedMsgListener, CallerBase<IOchLanPasseng
var isConnected:Boolean by Delegates.observable(false) { _, oldV, newV ->
if (oldV != newV) {
M_LISTENERS.forEach {
it.value.onDriverConnectChangeListener(newV)
}
if(newV){// 已连接
val msg = BaseDPMsg(type = DPMsgType.TYPE_CLIENT_REGISTER.type)
LanSocketManager.sendMsgToServer(msg)

4
OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt
View File

@@ -39,6 +39,10 @@ class OchCommonConst {
const val SHUTTLE_DRIVER = "/shuttle/shuttledriver"
const val SHUTTLE_PASSENGER = "/shuttle/shuttlepassenger"
const val SHUTTLE_DRIVER_WEAKNET = "/shuttle_weaknet/shuttledriver"
const val SHUTTLE_PASSENGER_WEAKNET = "/shuttle_weaknet/shuttlepassenger"
const val SWEEPER_DRIVER = "/sweeper/sweeperdriver"
const val TAXI_DRIVER = "/taxi/taxidriver"

8
OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt
View File

@@ -37,6 +37,9 @@ object OchChainLogManager {
// 局域网内socket 连接状态流转
const val EVENT_KEY_INFO_SOCKET_CONNECT = "analytics_event_och_track_screen_connect"
// 局域网内socket 连接状态流转
const val EVENT_KEY_INFO_SCANNER = "analytics_event_och_scanner"
fun writeChainLogNet(mustUpdate: Boolean, title: String, info: String) {
if(mustUpdate){
@@ -45,6 +48,11 @@ object OchChainLogManager {
writeChainLog(title, info, DebugConfig.isDebug(), EVENT_KEY_INFO_Net)
}
}
fun writeChainLogScanner(title: String, changeInfo: String) {
writeChainLog(title, changeInfo, true, EVENT_KEY_INFO_SCANNER)
}
fun writeChainLogInit(title: String, info: String) {
writeChainLog(title,info,true,EVENT_KEY_INFO_INIT)
}

211
OCH/shuttle_weaknet/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerManager.kt → OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/ScannerManager.kt
View File

@@ -1,19 +1,18 @@
package com.mogo.och.shuttle.passenger.manager.scnner
package com.mogo.och.common.module.manager.scnner
import android.net.Uri
import com.mogo.commons.AbsMogoApplication
import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener
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.CallerLogger
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.mogo.logger.scene.SceneConstant.Companion.M_BUS_P
import com.mogo.eagle.core.utilcode.util.GsonUtils
import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.och.common.module.biz.lansocket.IOchLanPassengerStatusListener
import com.mogo.och.common.module.biz.lansocket.LoginLanPassengerSocket
import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffDevicesMsg
import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffMsg
import com.mogo.och.common.module.constant.OchCommonConst
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
import com.mogo.support.serialport.client.SerialPortManager
import com.mogo.support.serialport.client.SerialPortManager.SERVICE_STATE
@@ -25,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap
import kotlin.properties.Delegates
object ScannerManager : OnSerialPortListener, OnDeviceVerificationListener(), IReceivedMsgListener {
object ScannerManager : IOchLanPassengerStatusListener {
private val TAG = "ScannerManager"
@@ -34,18 +33,11 @@ object ScannerManager : OnSerialPortListener, OnDeviceVerificationListener(), IR
private val stateChanageListeners: ConcurrentHashMap<String, StateChangeListener> =
ConcurrentHashMap()
private var driverSn:String by Delegates.observable("") { _, oldV, newV ->
if (oldV != newV) {
// sn 发生了改变 需要向司机屏推送当前链接的状态
sendScannerState()
}
}
private var bindStatus: BindStatus by Delegates.observable(BindStatus.NOTHING) { _, oldV, newV ->
if (oldV != newV) {
try {
CallerLogger.d(SceneConstant.M_OCHCOMMON + TAG, "状态发生变化old:${oldV}_new：${newV}")
if(newV!=BindStatus.BIND_SUCCEED) {
CallerLogger.d(SceneConstant.M_OCHCOMMON + TAG, "扫码枪状态发生变化old:${oldV}_new：${newV}")
if(newV!= BindStatus.BIND_SUCCEED) {
dispatchMsg(newV)
}
if (stateChanageListeners.size > 0) {
@@ -73,9 +65,87 @@ object ScannerManager : OnSerialPortListener, OnDeviceVerificationListener(), IR
}
}
private val onDeviceVerificationListener = object :OnDeviceVerificationListener(){
override fun onSerialPortState(
path: String?,
isOpen: Boolean,
throwableMessage: String?
) {
CallerLogger.d(
M_BUS_P + TAG,
"path ${path}---isOpen${isOpen}--throwableMessage${throwableMessage}"
)
OchChainLogManager.writeChainLogScanner(TAG +"onSerialPortState","扫码枪是否打开:path${path}_isOpen${isOpen}_throwableMessage${throwableMessage}")
openStatus = if (isOpen) {
sendWriteOffDevicesMessage2Driver(true,"扫码枪打开成功")
OpenStatus.Open
} else {
sendWriteOffDevicesMessage2Driver(false,"扫码枪打开错误:${throwableMessage}_${path}")
OpenStatus.Unopen
}
}
override fun onActiveDataReceive(data: VerificationActiveData?) {
OchChainLogManager.writeChainLogScanner(TAG +"onActiveDataReceive","扫码结果：data:${data}")
data?.let {
if(data.unpackStatus==UnpackStatus.SUCCEED){
"数据类型${it.dataType.name}"
CallerLogger.d(M_BUS_P + TAG, "data $it")
if(!StringUtils.isEmpty(it.payload)){
parseParams(it.payload)
}else{
CallerLogger.d(M_BUS_P + TAG, "数据错误")
sendWriteOffMessage2Driver("扫码数据为空")
}
}else{
sendWriteOffMessage2Driver("解包失败")
CallerLogger.d(M_BUS_P + TAG, "解包失败")
}
}
}
}
private val onSerialPortListener = object :OnSerialPortListener{
override fun onServiceState(serviceState: Int) {
OchChainLogManager.writeChainLogScanner(TAG +"bindStatus","绑定服务结果:serviceState:${serviceState}")
when (serviceState) {
SERVICE_STATE.BIND_SUCCEED -> {
CallerLogger.d(M_BUS_P + TAG, "服务绑定成功")
bindStatus = BindStatus.BIND_SUCCEED
serialPortManager.openVerificationDevice(onDeviceVerificationListener)
}
SERVICE_STATE.BIND_FAILURE_UNINSTALLED -> {
CallerLogger.d(M_BUS_P + TAG, "服务绑定失败：未安装串口服务端APP")
bindStatus = BindStatus.BIND_FAILURE_UNINSTALLED
}
SERVICE_STATE.BIND_FAILURE_NO_PERMISSION_NOT_FOUND -> {
CallerLogger.d(M_BUS_P + TAG, "服务绑定失败：没有绑定权限或找不到服务（如果是此状态，基本上安装后就可以找到，主要就是权限问题）")
bindStatus = BindStatus.BIND_FAILURE_NO_PERMISSION_NOT_FOUND
}
SERVICE_STATE.EXCEPTION -> {
CallerLogger.d(M_BUS_P + TAG, "服务被异常销毁")
bindStatus = BindStatus.EXCEPTION
}
else -> {}
}
}
// 查询串口
override fun onFindSerialPort(paths: Array<out String>?) {
CallerLogger.d(M_BUS_P + TAG, "$paths")
OchChainLogManager.writeChainLogScanner(TAG +"onFindSerialPort","查询串口:${paths}")
if(paths==null) {
bindStatus = BindStatus.BIND_FAILURE_NO_PERMISSION_NOT_FOUND
}
}
}
init {
//监听司机端消息
CallerTelematicListenerManager.addListener(TAG, this)
LoginLanPassengerSocket.addListener(TAG,this)
serialPortManager.bindService(AbsMogoApplication.getApp(), onSerialPortListener)//绑定服务
}
fun addStateChangeListener(tag: String, listener: StateChangeListener) {
@@ -85,78 +155,10 @@ object ScannerManager : OnSerialPortListener, OnDeviceVerificationListener(), IR
stateChanageListeners[tag] = listener
}
fun bindService() {
serialPortManager.bindService(AbsMogoApplication.getApp(), this)//绑定服务
}
override fun onServiceState(serviceState: Int) {
ScannerChainLogManager.writeChainLog(TAG+"bindStatus","绑定服务结果:serviceState:${serviceState}")
when (serviceState) {
SERVICE_STATE.BIND_SUCCEED -> {
CallerLogger.d(M_BUS_P + TAG, "服务绑定成功")
bindStatus = BindStatus.BIND_SUCCEED
serialPortManager.openVerificationDevice(this)
}
SERVICE_STATE.BIND_FAILURE_UNINSTALLED -> {
CallerLogger.d(M_BUS_P + TAG, "服务绑定失败：未安装串口服务端APP")
bindStatus = BindStatus.BIND_FAILURE_UNINSTALLED
}
SERVICE_STATE.BIND_FAILURE_NO_PERMISSION_NOT_FOUND -> {
CallerLogger.d(M_BUS_P + TAG, "服务绑定失败：没有绑定权限或找不到服务（如果是此状态，基本上安装后就可以找到，主要就是权限问题）")
bindStatus = BindStatus.BIND_FAILURE_NO_PERMISSION_NOT_FOUND
}
SERVICE_STATE.EXCEPTION -> {
CallerLogger.d(M_BUS_P + TAG, "服务被异常销毁")
bindStatus = BindStatus.EXCEPTION
}
else -> {}
}
}
// 查询串口
override fun onFindSerialPort(paths: Array<out String>?) {
CallerLogger.d(M_BUS_P + TAG, "$paths")
ScannerChainLogManager.writeChainLog(TAG+"onFindSerialPort","查询串口:${paths}")
if(paths==null) {
bindStatus = BindStatus.BIND_FAILURE_NO_PERMISSION_NOT_FOUND
}
}
override fun onSerialPortState(
path: String?,
isOpen: Boolean,
throwableMessage: String?
) {
CallerLogger.d(
M_BUS_P + TAG,
"path ${path}---isOpen${isOpen}--throwableMessage${throwableMessage}"
)
ScannerChainLogManager.writeChainLog(TAG+"onSerialPortState","扫码枪是否打开:path${path}_isOpen${isOpen}_throwableMessage${throwableMessage}")
openStatus = if (isOpen) {
sendMessage2Driver(true,"扫码枪打开成功")
OpenStatus.Open
} else {
sendMessage2Driver(false,"扫码枪打开错误:${throwableMessage}_${path}")
OpenStatus.Unopen
}
}
override fun onActiveDataReceive(data: VerificationActiveData?) {
ScannerChainLogManager.writeChainLog(TAG+"onActiveDataReceive","扫码结果：data:${data}")
data?.let {
if(data.unpackStatus==UnpackStatus.SUCCEED){
"数据类型${it.dataType.name}"
CallerLogger.d(M_BUS_P + TAG, "data $it")
if(!StringUtils.isEmpty(it.payload)){
parseParams(it.payload)
}else{
CallerLogger.d(M_BUS_P + TAG, "数据错误")
sendMessage2DriverWriteOffInfo("扫码数据为空")
}
}else{
sendMessage2DriverWriteOffInfo("解包失败")
CallerLogger.d(M_BUS_P + TAG, "解包失败")
}
override fun onDriverConnectChangeListener(isConnect: Boolean) {
super.onDriverConnectChangeListener(isConnect)
if(isConnect) {
sendScannerState()
}
}
@@ -177,7 +179,7 @@ object ScannerManager : OnSerialPortListener, OnDeviceVerificationListener(), IR
}
}
}else{
sendMessage2DriverWriteOffInfo("扫码参数数据为空:${payload}")
sendWriteOffMessage2Driver("扫码参数数据为空:${payload}")
}
}
@@ -185,41 +187,30 @@ object ScannerManager : OnSerialPortListener, OnDeviceVerificationListener(), IR
/**
* @param isConnectScanner 是否打开设备
*/
private fun sendMessage2Driver(isConnectScanner:Boolean,message:String){
private fun sendWriteOffDevicesMessage2Driver(isConnectScanner:Boolean, message:String){
val msg = WriteOffDevicesMsg(isConnectScanner, message)
CallerLogger.d(M_BUS_P + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg))
if(driverSn.isNotEmpty()) {
LanSocketManager.sendMsgToServer(msg)
}
LanSocketManager.sendMsgToServer(msg)
}
/**
* 打开设备后数据异常
*/
private fun sendMessage2DriverWriteOffInfo(message:String){
private fun sendWriteOffMessage2Driver(message:String){
val msg = WriteOffMsg(false, "", 0, "", message,"")
CallerLogger.d(M_BUS_P + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg))
LanSocketManager.sendMsgToServer(msg)
}
override fun onReceivedMsg(type: Int, byteArray: ByteArray) {
}
override fun onReceivedServerSn(sn: String?) {
Logger.d(M_BUS_P + TAG, "司机屏sn：$sn")
driverSn = sn?:""
}
/**
* 链接司机屏后向司机屏同步扫码枪状态
*/
private fun sendScannerState() {
if(bindStatus==BindStatus.BIND_SUCCEED&& openStatus==OpenStatus.Open){
sendMessage2Driver(true,"扫码枪打开状态")
if(bindStatus == BindStatus.BIND_SUCCEED && openStatus == OpenStatus.Open){
sendWriteOffDevicesMessage2Driver(true,"扫码枪打开状态")
}else{
if(bindStatus==BindStatus.BIND_SUCCEED&& openStatus==OpenStatus.Unopen){
sendMessage2Driver(false,"绑定成功、打开失败")
if(bindStatus == BindStatus.BIND_SUCCEED && openStatus == OpenStatus.Unopen){
sendWriteOffDevicesMessage2Driver(false,"绑定成功、打开失败")
}else{
dispatchMsg(bindStatus)
}
@@ -230,15 +221,15 @@ object ScannerManager : OnSerialPortListener, OnDeviceVerificationListener(), IR
when (newV) {
BindStatus.BIND_FAILURE_UNINSTALLED -> {
// 服务绑定失败：未安装串口服务端APP
sendMessage2Driver(false,"服务绑定失败：未安装串口服务端APP")
sendWriteOffDevicesMessage2Driver(false,"服务绑定失败：未安装串口服务端APP")
}
BindStatus.BIND_FAILURE_NO_PERMISSION_NOT_FOUND -> {
// 服务绑定失败：没有绑定权限或找不到服务（如果是此状态，基本上安装后就可以找到，主要就是权限问题）
sendMessage2Driver(false,"服务绑定失败：没有绑定权限或找不到服务")
sendWriteOffDevicesMessage2Driver(false,"服务绑定失败：没有绑定权限或找不到服务")
}
BindStatus.EXCEPTION -> {
// 扫码枪open错误
sendMessage2Driver(false,"扫码枪打开错误")
sendWriteOffDevicesMessage2Driver(false,"扫码枪打开错误")
}
BindStatus.NOTHING -> {}
else -> {}

4
OCH/shuttle_weaknet/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerStateView.kt → OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/ScannerStateView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.passenger.manager.scnner
package com.mogo.och.common.module.manager.scnner
import android.content.Context
import android.util.AttributeSet
@@ -17,7 +17,7 @@ class ScannerStateView @JvmOverloads constructor(
init {
setImageResource(R.drawable.driver_connect_statis)
ScannerManager.addStateChangeListener(TAG,this)
ScannerManager.addStateChangeListener(TAG, this)
}
override fun stateChange(newBindValue: BindStatus, newOpentValue: OpenStatus) {

6
OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/StateChangeListener.kt Normal file
View File

@@ -0,0 +1,6 @@
package com.mogo.och.common.module.manager.scnner
interface StateChangeListener {
fun stateChange(newBindValue: BindStatus, newOpentValue: OpenStatus){}
fun parseData(params: MutableMap<String, Any>, payload: String?){}
}

2
OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt
View File

@@ -1,6 +1,8 @@
package com.mogo.och.common.module.utils
import com.mogo.commons.debug.DebugConfig
import com.mogo.commons.env.Project
import com.mogo.commons.env.ProjectUtils
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils

27
OCH/facade/script/och.gradle
View File

@@ -5,42 +5,41 @@ project.dependencies {
} else {
if (isDriver()) {
implementation project.project(':OCH:offline:driver')
}else if(isPassenger){
implementation project.project(':OCH:offline:passenger')
}
if (isCurrentDriver("C1")) {
implementation project.project(':OCH:sweeper:driver')
} else if (isCurrentDriver("B1")) {
implementation project.project(':OCH:offline:driver')
implementation project.project(':OCH:shuttle:driver')
implementation project.project(':OCH:shuttle:driver_weaknet')
implementation project.project(':OCH:bus:driver')
} else if (isCurrentPassenger("B1")) {
implementation project.project(':OCH:bus:passenger')
implementation project.project(':OCH:shuttle:passenger')
implementation project.project(':OCH:shuttle:passenger_weaknet')
} else if (isCurrentBaiLing("B1")) {
implementation project.project(':OCH:shuttle:driver')
implementation project.project(':OCH:bus:driver')
implementation project.project(':OCH:shuttle:driver_weaknet')
implementation project.project(':OCH:bus:passenger')
implementation project.project(':OCH:shuttle:passenger')
implementation project.project(':OCH:shuttle:passenger_weaknet')
} else if (isCurrentDriver("M1")) {
implementation project.project(':OCH:charter:driver')
implementation project.project(':OCH:shuttle:driver')
implementation project.project(':OCH:shuttle:driver_weaknet')
} else if (isCurrentPassenger("M1")) {
implementation project.project(':OCH:charter:passenger')
implementation project.project(':OCH:shuttle:passenger')
implementation project.project(':OCH:shuttle:passenger_weaknet')
} else if (isCurrentDriver("B2")) {
implementation project.project(':OCH:offline:driver')
implementation project.project(':OCH:shuttle:driver')
implementation project.project(':OCH:shuttle:driver_weaknet')
implementation project.project(':OCH:bus:driver')
} else if (isCurrentPassenger("B2")) {
implementation project.project(':OCH:bus:passenger')
implementation project.project(':OCH:shuttle:passenger')
} else if (isCurrentPassenger("B2")) {
implementation project.project(':OCH:shuttle:driver')
implementation project.project(':OCH:bus:driver')
implementation project.project(':OCH:bus:passenger')
implementation project.project(':OCH:shuttle:passenger')
implementation project.project(':OCH:shuttle:passenger_weaknet')
} else if (isCurrentDriver("T1T2")) {
implementation project.project(':OCH:taxi:driver')
implementation project.project(':OCH:taxi:unmanned-driver')
@@ -48,6 +47,7 @@ project.dependencies {
implementation project.project(':OCH:taxi:unmanned-passenger')
implementation project.project(':OCH:taxi:passenger')
} else if (isCurrentDriver("ALL")) {
implementation project.project(':OCH:offline:driver')
implementation project.project(':OCH:taxi:unmanned-driver')
implementation project.project(':OCH:taxi:driver')
implementation project.project(':OCH:bus:driver')
@@ -60,7 +60,10 @@ project.dependencies {
implementation project.project(':OCH:bus:passenger')
implementation project.project(':OCH:charter:passenger')
implementation project.project(':OCH:shuttle:passenger')
implementation project.project(':OCH:shuttle:passenger_weaknet')
implementation project.project(':OCH:shuttle:driver_weaknet')
} else {
implementation project.project(':OCH:offline:driver')
implementation project.project(':OCH:bus:driver')
implementation project.project(':OCH:bus:passenger')
implementation project.project(':OCH:charter:driver')
@@ -72,6 +75,8 @@ project.dependencies {
implementation project.project(':OCH:taxi:passenger')
implementation project.project(':OCH:taxi:unmanned-driver')
implementation project.project(':OCH:taxi:unmanned-passenger')
implementation project.project(':OCH:shuttle:passenger_weaknet')
implementation project.project(':OCH:shuttle:driver_weaknet')
}
}
}

14
OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt
View File

@@ -29,7 +29,7 @@ import com.mogo.och.common.module.biz.login.LoginStatusManager
import com.mogo.och.common.module.biz.login.LoginStatusEnum
import com.mogo.och.common.module.biz.provider.CommonService
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.utils.ProjectUtils
import com.mogo.commons.env.ProjectUtils
/**
* 网约车小巴业务实现入口
@@ -98,7 +98,11 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
if (AppIdentityModeUtils.isBusDriver(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.BUS_DRIVER)
} else if (AppIdentityModeUtils.isShuttleDriver(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.SHUTTLE_DRIVER)
return if(ProjectUtils.isSaas()){
getFragmentByServeName(OchCommonConst.SHUTTLE_DRIVER_WEAKNET)
}else{
getFragmentByServeName(OchCommonConst.SHUTTLE_DRIVER)
}
} else if (AppIdentityModeUtils.isCharterDriver(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.CHARTER_DRIVER)
} else if (AppIdentityModeUtils.isTaxiDriver(FunctionBuildConfig.appIdentityMode)) {
@@ -114,7 +118,11 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
} else if (AppIdentityModeUtils.isBusPassenger(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.BUS_PASSENGER)
} else if (AppIdentityModeUtils.isShuttlePassenger(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.SHUTTLE_PASSENGER)
return if(ProjectUtils.isSaas()){
getFragmentByServeName(OchCommonConst.SHUTTLE_PASSENGER_WEAKNET)
}else{
getFragmentByServeName(OchCommonConst.SHUTTLE_PASSENGER)
}
} else if (AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.CHARTER_PASSENGER)
} else if (AppIdentityModeUtils.isTaxiPassenger(FunctionBuildConfig.appIdentityMode)) {

2
OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt
View File

@@ -87,7 +87,7 @@ object ShuttleVoiceManager {
}
fun writeOffFaile(reaseon:String) {
VoiceNotice.showNotice("验票失败，${reaseon}", AIAssist.LEVEL3)
VoiceNotice.showNotice(reaseon, AIAssist.LEVEL3)
}
}

2
OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffCountResponse.java
View File

@@ -2,8 +2,6 @@ package com.mogo.och.shuttle.bean;
import com.mogo.eagle.core.data.BaseData;
import java.util.List;
/**
* @author: wangmingjun
* @date: 2022/2/9

101
OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java
View File

@@ -1,9 +1,6 @@
package com.mogo.och.shuttle.model;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
import static com.mogo.och.shuttle.constant.BusConst.DELAY_10S;
import static com.mogo.och.shuttle.constant.BusConst.STATION_STATUS_ARRIVING;
import static com.mogo.och.shuttle.constant.BusConst.STATION_STATUS_STOPPED;
import android.content.Context;
import android.text.TextUtils;
@@ -12,51 +9,59 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.elegant.network.utils.GsonUtil;
import com.mogo.aicloud.services.socket.IMogoOnMessageListener;
import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener;
import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager;
import com.mogo.eagle.core.utilcode.util.CoordinateUtils;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.eagle.core.data.BaseData;
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.data.map.MogoLocation;
import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener;
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.autopilot.CallerAutoPilotStatusListenerManager;
import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
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.StringUtils;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.och.common.module.biz.login.LoginStatusManager;
import com.mogo.och.common.module.callback.OchAdasStartFailureCallback;
import com.mogo.och.common.module.constant.OchCommonConst;
import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager;
import com.mogo.och.common.module.manager.autopilot.autopilot.ArrivedStation;
import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager;
import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager;
import com.mogo.och.common.module.manager.autopilot.line.LineManager;
import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager;
import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager;
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager;
import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager;
import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener;
import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager;
import com.mogo.och.common.module.manager.socket.cloud.data.SystemMsg;
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.bean.BusRoutesResponse;
import com.mogo.och.shuttle.util.ShuttleVoiceManager;
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.BusCacheKey;
import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType;
import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType;
import com.mogo.och.common.module.manager.socket.lan.bean.LoginCacheStatus;
import com.mogo.och.common.module.manager.socket.lan.bean.TaskDetailsMsg;
import com.mogo.och.common.module.biz.login.LoginStatusManager;
import com.mogo.och.common.module.manager.autopilot.autopilot.ArrivedStation;
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager;
import com.mogo.och.common.module.network.OchCommonServiceCallback;
import com.mogo.och.common.module.utils.DateTimeUtil;
import com.mogo.och.common.module.utils.MultiRequestLimitChecker;
import com.mogo.och.common.module.utils.NumberFormatUtil;
import com.mogo.och.common.module.utils.OCHThreadPoolManager;
import com.mogo.och.data.bean.BusStationBean;
import com.mogo.och.common.module.manager.socket.cloud.data.SystemMsg;
import com.mogo.och.common.module.constant.OchCommonConst;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
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.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.och.shuttle.R;
import com.mogo.och.common.module.utils.PinYinUtil;
import com.mogo.och.common.module.voice.VoiceNotice;
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.data.manager.cache.CacheDataManager;
import com.mogo.och.shuttle.R;
import com.mogo.och.shuttle.bean.BusRoutesResponse;
import com.mogo.och.shuttle.callback.IBusADASStatusCallback;
import com.mogo.och.shuttle.callback.IBusControllerStatusCallback;
import com.mogo.och.shuttle.callback.IRefreshBusStationsCallback;
@@ -66,17 +71,7 @@ import com.mogo.och.shuttle.net.OrderServiceManager;
import com.mogo.och.shuttle.util.BusAnalyticsManager;
import com.mogo.och.shuttle.util.BusSendTripInfoManager;
import com.mogo.och.shuttle.util.BusTrajectoryManager;
import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager;
import com.mogo.och.common.module.network.OchCommonServiceCallback;
import com.mogo.och.common.module.callback.OchAdasStartFailureCallback;
import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager;
import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager;
import com.mogo.och.common.module.utils.DateTimeUtil;
import com.mogo.och.common.module.utils.NumberFormatUtil;
import com.mogo.och.common.module.utils.PinYinUtil;
import com.mogo.och.common.module.manager.socket.lan.bean.BusCacheKey;
import com.mogo.och.data.bean.BusTransferData;
import com.mogo.och.data.manager.cache.CacheDataManager;
import com.mogo.och.shuttle.util.ShuttleVoiceManager;
import org.jetbrains.annotations.NotNull;
@@ -451,15 +446,15 @@ public class OrderModel {
BusStationBean station = stations.get(i);
if (i == 0) { // 首发站 显示在最上面
if (station.getDrivingStatus() == STATION_STATUS_STOPPED
if (station.getDrivingStatus() == BusConst.STATION_STATUS_STOPPED
&& !station.isLeaving()) { //到达第一站
arrivingOrArrivedStationIndex = i;
break;
}
} else {
BusStationBean preStation = stations.get(i - 1);
if ((station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving())
|| (station.getDrivingStatus() == STATION_STATUS_ARRIVING
if ((station.getDrivingStatus() == BusConst.STATION_STATUS_STOPPED && !station.isLeaving())
|| (station.getDrivingStatus() == BusConst.STATION_STATUS_ARRIVING
&& preStation.isLeaving())) {
//到站未离开 | 即将到站 显示在最中间
arrivingOrArrivedStationIndex = i;
@@ -475,7 +470,7 @@ public class OrderModel {
DateTimeUtil.HH_mm);
if (arrivingOrArrivedStationIndex == 0 ||
arrivingOrArrivedStation.getDrivingStatus() == STATION_STATUS_STOPPED
arrivingOrArrivedStation.getDrivingStatus() == BusConst.STATION_STATUS_STOPPED
&& !arrivingOrArrivedStation.isLeaving()) {
if (refreshBusStationsCallback != null) {
refreshBusStationsCallback.updateBusTaskStatus(busRoutesResult.getName(), lineTime,
@@ -599,7 +594,7 @@ public class OrderModel {
bean.setDrivingStatus(currentDrivingStatus);
bean.setLeaving(isLeaving);
sites.set(currentIndex,bean);
if (currentDrivingStatus == STATION_STATUS_STOPPED && !isLeaving){
if (currentDrivingStatus == BusConst.STATION_STATUS_STOPPED && !isLeaving){
BusStationBean beanPre = sites.get(currentIndex -1);
beanPre.setDrivingStatus(BusConst.STATION_STATUS_LEAVING);
beanPre.setLeaving(false);
@@ -804,7 +799,7 @@ public class OrderModel {
.getString(R.string.bus_leave_station_tip),
nextStation),-1);
UiThreadHandler.postDelayed(()-> LanSocketManager.sendMsgToClient(startMsg),DELAY_10S);
UiThreadHandler.postDelayed(()-> LanSocketManager.sendMsgToClient(startMsg), BusConst.DELAY_10S);
}
private void sendEndTaskToClient() {
@@ -813,10 +808,6 @@ public class OrderModel {
LanSocketManager.sendMsgToClient(endMsg);
}
public void sendWriteOffNumToClient(String msg){
AppConnectMsg passengerMsg = new AppConnectMsg(false,true,msg,-1);
LanSocketManager.sendMsgToClient(passengerMsg);
}
/**
* 离站上报
@@ -885,7 +876,7 @@ public class OrderModel {
public void run() {//延迟10s播报
ShuttleVoiceManager.INSTANCE.leaveStationBus(nextStation,nextStationKr);
}
},DELAY_10S);
}, BusConst.DELAY_10S);
}
@@ -940,14 +931,14 @@ public class OrderModel {
isGoingToNextStation = true;
}
// 当前站点信息
if (s.getDrivingStatus() == STATION_STATUS_STOPPED) {
if (s.getDrivingStatus() == BusConst.STATION_STATUS_STOPPED) {
backgroundCurrentStationIndex = i;
break;
}
}
if (backgroundCurrentStationIndex == 0 &&
stationList.get(0).getDrivingStatus() == STATION_STATUS_STOPPED
stationList.get(0).getDrivingStatus() == BusConst.STATION_STATUS_STOPPED
&& !stationList.get(0).isLeaving()) { //默认是第一站到站查询
if (busRoutesResult != null) { // 第一站到站也是行程开始的时候
BusSendTripInfoManager.INSTANCE.sendBusTripInfo(BusSendTripInfoManager.START_TRIP
@@ -1022,7 +1013,7 @@ public class OrderModel {
@Override
public void run() {
if (backgroundCurrentStationIndex == 0 && stationList.get(0).getDrivingStatus() == STATION_STATUS_STOPPED
if (backgroundCurrentStationIndex == 0 && stationList.get(0).getDrivingStatus() == BusConst.STATION_STATUS_STOPPED
&& !stationList.get(0).isLeaving()){
tipStartTask("3");
}else {
@@ -1045,7 +1036,7 @@ public class OrderModel {
@Override
public void run() {
if (backgroundCurrentStationIndex == 0 && stationList != null &&
stationList.get(0).getDrivingStatus() == STATION_STATUS_STOPPED
stationList.get(0).getDrivingStatus() == BusConst.STATION_STATUS_STOPPED
&& !stationList.get(0).isLeaving()){
tipStartTask("1");
}else {

42
OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/TicketModel.kt
View File

@@ -1,7 +1,6 @@
package com.mogo.och.shuttle.model
import com.elegant.network.utils.GsonUtil
import com.mogo.aicloud.services.socket.IMogoOnMessageListener
import com.mogo.commons.AbsMogoApplication
import com.mogo.eagle.core.data.enums.EventTypeEnumNew
import com.mogo.eagle.core.data.msgbox.MsgBoxBean
@@ -14,20 +13,20 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.eagle.core.utilcode.util.GsonUtils
import com.mogo.och.shuttle.bean.WriteOffCountResponse
import com.mogo.och.shuttle.bean.WriteOffPassenger
import com.mogo.och.shuttle.net.OrderServiceManager
import com.mogo.och.shuttle.util.ShuttleVoiceManager
import com.mogo.och.common.module.constant.OchCommonConst
import com.mogo.och.common.module.manager.loop.BizLoopManager
import com.mogo.och.common.module.manager.loop.LoopInfo
import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener
import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager
import com.mogo.och.common.module.manager.socket.lan.bean.BaseDPMsg
import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType
import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffDevicesMsg
import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffMsg
import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager
import com.mogo.och.common.module.constant.OchCommonConst
import com.mogo.och.common.module.network.OchCommonServiceCallback
import com.mogo.och.common.module.manager.loop.BizLoopManager
import com.mogo.och.common.module.manager.loop.LoopInfo
import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener
import com.mogo.och.shuttle.bean.WriteOffCountResponse
import com.mogo.och.shuttle.bean.WriteOffPassenger
import com.mogo.och.shuttle.net.OrderServiceManager
import com.mogo.och.shuttle.util.ShuttleVoiceManager
import io.reactivex.Observable
import io.reactivex.ObservableEmitter
import io.reactivex.ObservableOnSubscribe
@@ -139,12 +138,27 @@ object TicketModel : IReceivedMsgListener, IOchOnMessageListener<WriteOffPasseng
// writeOffMsg.orderNo?:""
// )
} else { // 核验失败
ShuttleVoiceManager.writeOffFaile("验票失败，${writeOffMsg.failedReason ?: ""}")
ShuttleVoiceManager.writeOffFaile(writeOffMsg.failedReason ?: "")
var tempPhone = writeOffMsg.phone
tempPhone?.let {
if (it.length > 8) {
//截取电话号码前三位
val phoneNumPre = it.substring(0, 3)
//截取电话号码后四位
val phoneNumFix = it.substring(7)
tempPhone = "$phoneNumPre****$phoneNumFix"
}
}
val reaseonAndPhone = if(tempPhone.isNullOrEmpty()) {
"${writeOffMsg.failedReason}"
}else{
"${writeOffMsg.failedReason};乘客：${tempPhone}"
}
saveMsgBox(
MsgBoxBean(
MsgBoxType.V2X, V2XMsg(
EventTypeEnumNew.TYPE_ABNORMAL_VERIFICATION.poiType,
writeOffMsg.failedReason ?: "",
reaseonAndPhone,
EventTypeEnumNew.TYPE_ABNORMAL_VERIFICATION.tts,
""
)
@@ -189,9 +203,9 @@ object TicketModel : IReceivedMsgListener, IOchOnMessageListener<WriteOffPasseng
private fun playPassenger(ticketSize: Int,phone:String,ticketName:String,orderNo:String) {
if (ticketSize > 1) { //多人播报 "x人" ---》x人核验通过
OrderModel.getInstance().sendWriteOffNumToClient(ticketSize.toString() + "人核验通过")
ShuttleVoiceManager.sendWriteOffNumToClient(ticketSize.toString() + "人核验通过")
} else { //是 1 播放 "滴" 2022.11.09 改为： "核验通过"
OrderModel.getInstance().sendWriteOffNumToClient("核验通过")
ShuttleVoiceManager.sendWriteOffNumToClient("核验通过")
}
ShuttleVoiceManager.writeOffCount(ticketSize)

3
OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/net/IBascApiService.java
View File

@@ -1,13 +1,10 @@
package com.mogo.och.shuttle.net;
import com.mogo.eagle.core.data.BaseData;
import com.mogo.och.shuttle.bean.BusCloseTaskRequest;
import com.mogo.och.shuttle.bean.BusOrdersResponse;
import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse;
import com.mogo.och.shuttle.bean.BusQueryLinesResponse;
import com.mogo.och.shuttle.bean.BusQueryLineStationsRequest;
import com.mogo.och.shuttle.bean.BusRoutesResponse;
import com.mogo.och.shuttle.bean.QueryLeaveAwayPassengersRequest;
import com.mogo.och.shuttle.bean.QueryLeaveAwayPassengersResponse;
import com.mogo.och.shuttle.bean.BusResetDrivingLineRequest;
import com.mogo.och.shuttle.bean.BusUpdateSiteStatusRequest;
import com.mogo.och.shuttle.bean.WriteOffCountResponse;

3
OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/net/OrderServiceManager.kt
View File

@@ -11,15 +11,12 @@ import com.mogo.och.common.module.network.OchCommonSubscribeImpl
import com.mogo.och.common.module.network.interceptor.transformIoTry
import com.mogo.och.common.module.network.interceptor.transformTry
import com.mogo.och.shuttle.bean.BusCloseTaskRequest
import com.mogo.och.shuttle.bean.BusOrdersResponse
import com.mogo.och.shuttle.bean.BusQueryLineStationsRequest
import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse
import com.mogo.och.shuttle.bean.BusQueryLinesResponse
import com.mogo.och.shuttle.bean.BusResetDrivingLineRequest
import com.mogo.och.shuttle.bean.BusRoutesResponse
import com.mogo.och.shuttle.bean.BusUpdateSiteStatusRequest
import com.mogo.och.shuttle.bean.QueryLeaveAwayPassengersRequest
import com.mogo.och.shuttle.bean.QueryLeaveAwayPassengersResponse
import com.mogo.och.shuttle.bean.WriteOffCountResponse
/**

2
OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/presenter/BusLinePresenter.java
View File

@@ -1,7 +1,5 @@
package com.mogo.och.shuttle.presenter;
import android.os.Looper;
import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleOwner;

1
OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/presenter/BusPresenter.java
View File

@@ -15,7 +15,6 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.och.common.module.biz.login.LoginStatusEnum;
import com.mogo.och.common.module.manager.autopilot.autopilot.ArrivedStation;

2
OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffViewModel.kt
View File

@@ -5,8 +5,8 @@ import com.mogo.commons.AbsMogoApplication
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.och.shuttle.R
import com.mogo.och.shuttle.model.TicketModel
import com.mogo.och.common.module.utils.RxUtils
import com.mogo.och.shuttle.model.TicketModel
import io.reactivex.Observable
import io.reactivex.Observer
import io.reactivex.android.schedulers.AndroidSchedulers

2
OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusAnalyticsManager.java
View File

@@ -26,7 +26,7 @@ public class BusAnalyticsManager extends OchAutopilotAnalytics {
}
public static BusAnalyticsManager getInstance() {
return BusAnalyticsManager.SingletonHolder.INSTANCE;
return SingletonHolder.INSTANCE;
}
@NonNull

8
OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusTrajectoryManager.java
View File

@@ -1,16 +1,18 @@
package com.mogo.och.shuttle.util;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
import androidx.annotation.Nullable;
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.util.GsonUtils;
import com.mogo.och.common.module.biz.login.LoginStatusManager;
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager;
import com.mogo.och.data.bean.BusRoutesResult;
import com.mogo.och.shuttle.constant.BusConst;
import com.mogo.och.shuttle.model.OrderModel;
import com.mogo.och.common.module.biz.login.LoginStatusManager;
import java.util.concurrent.TimeUnit;
@@ -20,8 +22,6 @@ import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import mogo_msg.MogoReportMsg;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
/**
* Bus轨迹管理：给MEC下发用于轨迹下载的信息
* Created on 2022/6/23
@@ -34,7 +34,7 @@ public class BusTrajectoryManager {
}
public static BusTrajectoryManager getInstance() {
return BusTrajectoryManager.SingletonHolder.INSTANCE;
return SingletonHolder.INSTANCE;
}
private AutopilotControlParameters.AutoPilotLine mAutoPilotLine = null;

15
OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/ShuttleVoiceManager.kt
View File

@@ -2,16 +2,21 @@ package com.mogo.och.shuttle.util
import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.voice.AIAssist
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.och.shuttle.R
import com.mogo.och.common.module.manager.socket.lan.LanSocketManager.sendMsgToClient
import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg
import com.mogo.och.common.module.voice.VoiceNotice
import com.mogo.och.shuttle.R
import com.mogo.tts.base.LangTtsEntity
import com.mogo.tts.base.LanguageType
import java.util.ArrayList
object ShuttleVoiceManager {
fun sendWriteOffNumToClient(msg: String?) {
val passengerMsg = AppConnectMsg(false, true, msg!!, -1)
sendMsgToClient(passengerMsg)
}
fun arrivedStationBus(siteNameCN: String?, siteNameKR: String?) {
val context = AbsMogoApplication.getApp()
val list: MutableList<LangTtsEntity> = ArrayList()
@@ -87,7 +92,7 @@ object ShuttleVoiceManager {
}
fun writeOffFaile(reaseon:String) {
VoiceNotice.showNotice("验票失败，${reaseon}", AIAssist.LEVEL3)
VoiceNotice.showNotice(reaseon, AIAssist.LEVEL3)
}
}

68
OCH/shuttle/driver/src/main/res/layout/shuttle_tap_position.xml
View File

@@ -1,68 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/tap_p"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="P"
android:textAlignment="center"
android:textColor="@color/p_default_txt_color"
android:textSize="@dimen/dp_34"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/tap_r"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tap_r"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="R"
android:textAlignment="center"
android:textColor="@color/p_default_txt_color"
android:textSize="@dimen/dp_34"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/tap_p"
app:layout_constraintRight_toLeftOf="@+id/tap_n"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tap_n"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="N"
android:textAlignment="center"
android:textColor="@color/p_default_txt_color"
android:textSize="@dimen/dp_34"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/tap_r"
app:layout_constraintRight_toLeftOf="@+id/tap_d"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tap_d"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="D"
android:textAlignment="center"
android:textColor="@color/p_default_txt_color"
android:textSize="@dimen/dp_34"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/tap_n"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

0
OCH/shuttle_weaknet/driver/.gitignore → OCH/shuttle/driver_weaknet/.gitignore vendored
View File

2
OCH/shuttle_weaknet/driver/build.gradle → OCH/shuttle/driver_weaknet/build.gradle
View File

@@ -19,7 +19,7 @@ android {
kapt {
useBuildCache = false
arguments {
arg("AROUTER_MODULE_NAME", "shuttle"+project.getName())
arg("AROUTER_MODULE_NAME", "shuttle_weaknet_"+project.getName())
}
}
}

0
OCH/shuttle_weaknet/driver/consumer-rules.pro → OCH/shuttle/driver_weaknet/consumer-rules.pro
View File

0
OCH/shuttle_weaknet/driver/gradle.properties → OCH/shuttle/driver_weaknet/gradle.properties
View File

0
OCH/shuttle_weaknet/driver/proguard-rules.pro → OCH/shuttle/driver_weaknet/proguard-rules.pro vendored
View File

4
OCH/shuttle_weaknet/driver/src/main/AndroidManifest.xml → OCH/shuttle/driver_weaknet/src/main/AndroidManifest.xml
View File

@@ -1,8 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mogo.och.shuttle">
package="com.mogo.och.shuttle.weaknet">
<application>
<activity android:name="com.mogo.och.shuttle.ui.BusSwitchLineActivity"
<activity android:name="com.mogo.och.weaknet.ui.BusSwitchLineActivity"
android:theme="@style/SwitchLineDialogStyle"
android:launchMode="singleTask"
android:screenOrientation="landscape" />

6
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ShuttleDriverProvider.kt → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt
View File

@@ -1,11 +1,11 @@
package com.mogo.och.shuttle
package com.mogo.och.weaknet
import android.content.Context
import androidx.fragment.app.Fragment
import com.alibaba.android.arouter.facade.annotation.Route
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.och.shuttle.fragment.ShuttleFragment
import com.mogo.och.weaknet.fragment.ShuttleFragment
import com.mogo.och.common.module.constant.OchCommonConst
import com.mogo.och.common.module.biz.provider.CommonServiceImpl
@@ -14,7 +14,7 @@ import com.mogo.och.common.module.biz.provider.CommonServiceImpl
*
* @author tongchenfei
*/
@Route(path = OchCommonConst.SHUTTLE_DRIVER)
@Route(path = OchCommonConst.SHUTTLE_DRIVER_WEAKNET)
class ShuttleDriverProvider : CommonServiceImpl() {
private val TAG = ShuttleDriverProvider::class.java.simpleName

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusCloseTaskRequest.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusCloseTaskRequest.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.bean;
package com.mogo.och.weaknet.bean;
import com.mogo.commons.storage.SharedPrefsMgr;
import com.mogo.och.common.module.utils.DateTimeUtil;

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusOrderBean.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusOrderBean.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.bean;
package com.mogo.och.weaknet.bean;
/**
* @author congtaowang

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusOrdersResponse.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusOrdersResponse.java
View File

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

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLineStationsRequest.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLineStationsRequest.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.bean;
package com.mogo.och.weaknet.bean;
import com.mogo.commons.storage.SharedPrefsMgr;

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLineTaskResponse.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLineTaskResponse.java
View File

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

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLinesResponse.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLinesResponse.java
View File

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

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusResetDrivingLineRequest.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusResetDrivingLineRequest.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.bean;
package com.mogo.och.weaknet.bean;
import com.mogo.commons.storage.SharedPrefsMgr;
import com.mogo.och.common.module.utils.DateTimeUtil;

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusRoutesResponse.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusRoutesResponse.java
View File

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

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusUpdateSiteStatusRequest.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusUpdateSiteStatusRequest.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.bean;
package com.mogo.och.weaknet.bean;
import com.mogo.commons.storage.SharedPrefsMgr;

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/QueryLeaveAwayPassengersRequest.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/QueryLeaveAwayPassengersRequest.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.bean;
package com.mogo.och.weaknet.bean;
import com.mogo.commons.storage.SharedPrefsMgr;

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/QueryLeaveAwayPassengersResponse.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/QueryLeaveAwayPassengersResponse.java
View File

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

4
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffCountResponse.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/WriteOffCountResponse.java
View File

@@ -1,9 +1,7 @@
package com.mogo.och.shuttle.bean;
package com.mogo.och.weaknet.bean;
import com.mogo.eagle.core.data.BaseData;
import java.util.List;
/**
* @author: wangmingjun
* @date: 2022/2/9

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffPassenger.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/WriteOffPassenger.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.bean;
package com.mogo.och.weaknet.bean;
import java.io.Serializable;

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/IBusADASStatusCallback.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusADASStatusCallback.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.callback;
package com.mogo.och.weaknet.callback;
/**
* Created on 2021/9/8

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/IBusControllerStatusCallback.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusControllerStatusCallback.java
View File

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

6
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/IBusLinesCallback.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java
View File

@@ -1,7 +1,7 @@
package com.mogo.och.shuttle.callback;
package com.mogo.och.weaknet.callback;
import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse;
import com.mogo.och.shuttle.bean.BusQueryLinesResponse;
import com.mogo.och.weaknet.bean.BusQueryLineTaskResponse;
import com.mogo.och.weaknet.bean.BusQueryLinesResponse;
/**
* @author: wangmingjun

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/IRefreshBusStationsCallback.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IRefreshBusStationsCallback.java
View File

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

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/ISlidePannelHideCallback.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/ISlidePannelHideCallback.java
View File

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

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/constant/BusConst.kt → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/constant/BusConst.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.constant
package com.mogo.och.weaknet.constant
import com.mogo.commons.debug.DebugConfig

16
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/fragment/BaseShuttleTabFragment.java
View File

@@ -1,6 +1,6 @@
package com.mogo.och.shuttle.fragment;
package com.mogo.och.weaknet.fragment;
import static com.mogo.och.shuttle.constant.BusConst.TIMER_START_AUTOPILOT_INTERVAL;
import static com.mogo.och.weaknet.constant.BusConst.TIMER_START_AUTOPILOT_INTERVAL;
import android.animation.ObjectAnimator;
import android.os.Bundle;
@@ -36,16 +36,17 @@ import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxListView;
import com.mogo.eagle.core.function.smp.view.SmallMapView;
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.map.MogoMap;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.och.common.module.utils.ResourcesUtils;
import com.mogo.och.shuttle.R;
import com.mogo.och.shuttle.view.BizMapView;
import com.mogo.och.weaknet.model.OrderModel;
import com.mogo.och.weaknet.view.BizMapView;
import com.mogo.och.data.bean.BusRoutesResult;
import com.mogo.och.shuttle.model.OrderModel;
import com.mogo.och.shuttle.view.SlidePanelView;
import com.mogo.och.weaknet.view.SlidePanelView;
import com.mogo.och.common.module.utils.SoundPoolHelper;
import com.mogo.och.shuttle.weaknet.R;
import org.greenrobot.eventbus.EventBus;
/**
@@ -91,7 +92,7 @@ public abstract class BaseShuttleTabFragment<V extends IView, P extends Presente
@Override
protected int getLayoutId() {
return R.layout.shuttle_base_fragment;
return R.layout.shuttle_weak_base_fragment;
}
@Override
@@ -152,6 +153,7 @@ public abstract class BaseShuttleTabFragment<V extends IView, P extends Presente
);
tvArrived.setOnClickListener(view -> {
ToastUtils.showLong("weak_net");
onArriveStation();
});

16
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/fragment/ShuttleFragment.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/fragment/ShuttleFragment.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.fragment;
package com.mogo.och.weaknet.fragment;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
import static com.mogo.map.MogoMap.DEFAULT;
@@ -30,19 +30,19 @@ import com.mogo.map.overlay.IMoGoOverlayManager;
import com.mogo.map.overlay.core.Level;
import com.mogo.map.overlay.point.Point;
import com.mogo.och.common.module.utils.ResourcesUtils;
import com.mogo.och.shuttle.R;
import com.mogo.och.data.bean.BusStationBean;
import com.mogo.och.shuttle.constant.BusConst;
import com.mogo.och.shuttle.presenter.BusPresenter;
import com.mogo.och.shuttle.ui.BusStationCommonItem;
import com.mogo.och.shuttle.ui.BusSwitchLineActivity;
import com.mogo.och.shuttle.view.SlidePanelView;
import com.mogo.och.weaknet.constant.BusConst;
import com.mogo.och.weaknet.presenter.BusPresenter;
import com.mogo.och.weaknet.ui.BusStationCommonItem;
import com.mogo.och.weaknet.ui.BusSwitchLineActivity;
import com.mogo.och.weaknet.view.SlidePanelView;
import com.mogo.och.common.module.utils.BlinkAnimationUtil;
import com.mogo.och.common.module.utils.OCHThreadPoolManager;
import com.mogo.och.common.module.utils.QRUtilsKt;
import com.mogo.och.common.module.wigets.BindQRCodeDialog;
import com.mogo.och.common.module.wigets.MarqueeTextView;
import com.mogo.och.common.module.wigets.OCHCommitDialog;
import com.mogo.och.shuttle.weaknet.R;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -418,7 +418,7 @@ public class ShuttleFragment extends BaseShuttleTabFragment<ShuttleFragment, Bus
@Override
public int getStationPanelViewId() {
return R.layout.shuttle_fragment_och;
return R.layout.shuttle_weak_fragment_och;
}
@Override

16
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/model/BusLineModel.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.model;
package com.mogo.och.weaknet.model;
import android.content.Context;
@@ -6,14 +6,14 @@ import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.storage.SharedPrefsMgr;
import com.mogo.eagle.core.utilcode.util.NetworkUtils;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.och.shuttle.R;
import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse;
import com.mogo.och.shuttle.bean.BusQueryLinesResponse;
import com.mogo.och.shuttle.bean.BusRoutesResponse;
import com.mogo.och.shuttle.callback.IBusLinesCallback;
import com.mogo.och.shuttle.net.OrderServiceManager;
import com.mogo.och.shuttle.ui.BusSwitchLineActivity;
import com.mogo.och.common.module.network.OchCommonServiceCallback;
import com.mogo.och.weaknet.bean.BusQueryLineTaskResponse;
import com.mogo.och.weaknet.bean.BusQueryLinesResponse;
import com.mogo.och.weaknet.bean.BusRoutesResponse;
import com.mogo.och.weaknet.callback.IBusLinesCallback;
import com.mogo.och.weaknet.net.OrderServiceManager;
import com.mogo.och.weaknet.ui.BusSwitchLineActivity;
import com.mogo.och.shuttle.weaknet.R;
/**
* @author: wangmingjun

115
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.java
View File

@@ -1,9 +1,6 @@
package com.mogo.och.shuttle.model;
package com.mogo.och.weaknet.model;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
import static com.mogo.och.shuttle.constant.BusConst.DELAY_10S;
import static com.mogo.och.shuttle.constant.BusConst.STATION_STATUS_ARRIVING;
import static com.mogo.och.shuttle.constant.BusConst.STATION_STATUS_STOPPED;
import android.content.Context;
import android.text.TextUtils;
@@ -12,71 +9,69 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.elegant.network.utils.GsonUtil;
import com.mogo.aicloud.services.socket.IMogoOnMessageListener;
import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener;
import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager;
import com.mogo.eagle.core.utilcode.util.CoordinateUtils;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.eagle.core.data.BaseData;
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.data.map.MogoLocation;
import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener;
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.autopilot.CallerAutoPilotStatusListenerManager;
import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
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.StringUtils;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.och.common.module.biz.login.LoginStatusManager;
import com.mogo.och.common.module.callback.OchAdasStartFailureCallback;
import com.mogo.och.common.module.constant.OchCommonConst;
import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager;
import com.mogo.och.common.module.manager.autopilot.autopilot.ArrivedStation;
import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager;
import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager;
import com.mogo.och.common.module.manager.autopilot.line.LineManager;
import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager;
import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager;
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager;
import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager;
import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener;
import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager;
import com.mogo.och.common.module.manager.socket.cloud.data.SystemMsg;
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.bean.BusRoutesResponse;
import com.mogo.och.shuttle.util.ShuttleVoiceManager;
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.BusCacheKey;
import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType;
import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType;
import com.mogo.och.common.module.manager.socket.lan.bean.LoginCacheStatus;
import com.mogo.och.common.module.manager.socket.lan.bean.TaskDetailsMsg;
import com.mogo.och.common.module.biz.login.LoginStatusManager;
import com.mogo.och.common.module.manager.autopilot.autopilot.ArrivedStation;
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager;
import com.mogo.och.common.module.utils.MultiRequestLimitChecker;
import com.mogo.och.common.module.utils.OCHThreadPoolManager;
import com.mogo.och.data.bean.BusStationBean;
import com.mogo.och.common.module.manager.socket.cloud.data.SystemMsg;
import com.mogo.och.common.module.constant.OchCommonConst;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
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.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.och.shuttle.R;
import com.mogo.och.data.bean.BusRoutesResult;
import com.mogo.och.shuttle.callback.IBusADASStatusCallback;
import com.mogo.och.shuttle.callback.IBusControllerStatusCallback;
import com.mogo.och.shuttle.callback.IRefreshBusStationsCallback;
import com.mogo.och.shuttle.callback.ISlidePannelHideCallback;
import com.mogo.och.shuttle.constant.BusConst;
import com.mogo.och.shuttle.net.OrderServiceManager;
import com.mogo.och.shuttle.util.BusAnalyticsManager;
import com.mogo.och.shuttle.util.BusSendTripInfoManager;
import com.mogo.och.shuttle.util.BusTrajectoryManager;
import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager;
import com.mogo.och.common.module.network.OchCommonServiceCallback;
import com.mogo.och.common.module.callback.OchAdasStartFailureCallback;
import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager;
import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager;
import com.mogo.och.common.module.utils.DateTimeUtil;
import com.mogo.och.common.module.utils.MultiRequestLimitChecker;
import com.mogo.och.common.module.utils.NumberFormatUtil;
import com.mogo.och.common.module.utils.OCHThreadPoolManager;
import com.mogo.och.common.module.utils.PinYinUtil;
import com.mogo.och.common.module.manager.socket.lan.bean.BusCacheKey;
import com.mogo.och.common.module.voice.VoiceNotice;
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.data.manager.cache.CacheDataManager;
import com.mogo.och.weaknet.constant.BusConst;
import com.mogo.och.weaknet.net.OrderServiceManager;
import com.mogo.och.weaknet.util.BusSendTripInfoManager;
import com.mogo.och.weaknet.util.ShuttleVoiceManager;
import com.mogo.och.shuttle.weaknet.R;
import com.mogo.och.weaknet.bean.BusRoutesResponse;
import com.mogo.och.weaknet.callback.IBusADASStatusCallback;
import com.mogo.och.weaknet.callback.IBusControllerStatusCallback;
import com.mogo.och.weaknet.callback.IRefreshBusStationsCallback;
import com.mogo.och.weaknet.callback.ISlidePannelHideCallback;
import com.mogo.och.weaknet.util.BusAnalyticsManager;
import com.mogo.och.weaknet.util.BusTrajectoryManager;
import org.jetbrains.annotations.NotNull;
@@ -451,15 +446,15 @@ public class OrderModel {
BusStationBean station = stations.get(i);
if (i == 0) { // 首发站 显示在最上面
if (station.getDrivingStatus() == STATION_STATUS_STOPPED
if (station.getDrivingStatus() == BusConst.STATION_STATUS_STOPPED
&& !station.isLeaving()) { //到达第一站
arrivingOrArrivedStationIndex = i;
break;
}
} else {
BusStationBean preStation = stations.get(i - 1);
if ((station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving())
|| (station.getDrivingStatus() == STATION_STATUS_ARRIVING
if ((station.getDrivingStatus() == BusConst.STATION_STATUS_STOPPED && !station.isLeaving())
|| (station.getDrivingStatus() == BusConst.STATION_STATUS_ARRIVING
&& preStation.isLeaving())) {
//到站未离开 | 即将到站 显示在最中间
arrivingOrArrivedStationIndex = i;
@@ -475,7 +470,7 @@ public class OrderModel {
DateTimeUtil.HH_mm);
if (arrivingOrArrivedStationIndex == 0 ||
arrivingOrArrivedStation.getDrivingStatus() == STATION_STATUS_STOPPED
arrivingOrArrivedStation.getDrivingStatus() == BusConst.STATION_STATUS_STOPPED
&& !arrivingOrArrivedStation.isLeaving()) {
if (refreshBusStationsCallback != null) {
refreshBusStationsCallback.updateBusTaskStatus(busRoutesResult.getName(), lineTime,
@@ -599,7 +594,7 @@ public class OrderModel {
bean.setDrivingStatus(currentDrivingStatus);
bean.setLeaving(isLeaving);
sites.set(currentIndex,bean);
if (currentDrivingStatus == STATION_STATUS_STOPPED && !isLeaving){
if (currentDrivingStatus == BusConst.STATION_STATUS_STOPPED && !isLeaving){
BusStationBean beanPre = sites.get(currentIndex -1);
beanPre.setDrivingStatus(BusConst.STATION_STATUS_LEAVING);
beanPre.setLeaving(false);
@@ -804,7 +799,7 @@ public class OrderModel {
.getString(R.string.bus_leave_station_tip),
nextStation),-1);
UiThreadHandler.postDelayed(()-> LanSocketManager.sendMsgToClient(startMsg),DELAY_10S);
UiThreadHandler.postDelayed(()-> LanSocketManager.sendMsgToClient(startMsg), BusConst.DELAY_10S);
}
private void sendEndTaskToClient() {
@@ -813,10 +808,6 @@ public class OrderModel {
LanSocketManager.sendMsgToClient(endMsg);
}
public void sendWriteOffNumToClient(String msg){
AppConnectMsg passengerMsg = new AppConnectMsg(false,true,msg,-1);
LanSocketManager.sendMsgToClient(passengerMsg);
}
/**
* 离站上报
@@ -885,7 +876,7 @@ public class OrderModel {
public void run() {//延迟10s播报
ShuttleVoiceManager.INSTANCE.leaveStationBus(nextStation,nextStationKr);
}
},DELAY_10S);
}, BusConst.DELAY_10S);
}
@@ -940,14 +931,14 @@ public class OrderModel {
isGoingToNextStation = true;
}
// 当前站点信息
if (s.getDrivingStatus() == STATION_STATUS_STOPPED) {
if (s.getDrivingStatus() == BusConst.STATION_STATUS_STOPPED) {
backgroundCurrentStationIndex = i;
break;
}
}
if (backgroundCurrentStationIndex == 0 &&
stationList.get(0).getDrivingStatus() == STATION_STATUS_STOPPED
stationList.get(0).getDrivingStatus() == BusConst.STATION_STATUS_STOPPED
&& !stationList.get(0).isLeaving()) { //默认是第一站到站查询
if (busRoutesResult != null) { // 第一站到站也是行程开始的时候
BusSendTripInfoManager.INSTANCE.sendBusTripInfo(BusSendTripInfoManager.START_TRIP
@@ -1022,7 +1013,7 @@ public class OrderModel {
@Override
public void run() {
if (backgroundCurrentStationIndex == 0 && stationList.get(0).getDrivingStatus() == STATION_STATUS_STOPPED
if (backgroundCurrentStationIndex == 0 && stationList.get(0).getDrivingStatus() == BusConst.STATION_STATUS_STOPPED
&& !stationList.get(0).isLeaving()){
tipStartTask("3");
}else {
@@ -1045,7 +1036,7 @@ public class OrderModel {
@Override
public void run() {
if (backgroundCurrentStationIndex == 0 && stationList != null &&
stationList.get(0).getDrivingStatus() == STATION_STATUS_STOPPED
stationList.get(0).getDrivingStatus() == BusConst.STATION_STATUS_STOPPED
&& !stationList.get(0).isLeaving()){
tipStartTask("1");
}else {

44
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/model/TicketModel.kt → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt
View File

@@ -1,7 +1,6 @@
package com.mogo.och.shuttle.model
package com.mogo.och.weaknet.model
import com.elegant.network.utils.GsonUtil
import com.mogo.aicloud.services.socket.IMogoOnMessageListener
import com.mogo.commons.AbsMogoApplication
import com.mogo.eagle.core.data.enums.EventTypeEnumNew
import com.mogo.eagle.core.data.msgbox.MsgBoxBean
@@ -14,20 +13,20 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.eagle.core.utilcode.util.GsonUtils
import com.mogo.och.shuttle.bean.WriteOffCountResponse
import com.mogo.och.shuttle.bean.WriteOffPassenger
import com.mogo.och.shuttle.net.OrderServiceManager
import com.mogo.och.shuttle.util.ShuttleVoiceManager
import com.mogo.och.common.module.constant.OchCommonConst
import com.mogo.och.common.module.manager.loop.BizLoopManager
import com.mogo.och.common.module.manager.loop.LoopInfo
import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener
import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager
import com.mogo.och.common.module.manager.socket.lan.bean.BaseDPMsg
import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType
import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffDevicesMsg
import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffMsg
import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager
import com.mogo.och.common.module.constant.OchCommonConst
import com.mogo.och.common.module.network.OchCommonServiceCallback
import com.mogo.och.common.module.manager.loop.BizLoopManager
import com.mogo.och.common.module.manager.loop.LoopInfo
import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener
import com.mogo.och.weaknet.bean.WriteOffCountResponse
import com.mogo.och.weaknet.bean.WriteOffPassenger
import com.mogo.och.weaknet.net.OrderServiceManager
import com.mogo.och.weaknet.util.ShuttleVoiceManager
import io.reactivex.Observable
import io.reactivex.ObservableEmitter
import io.reactivex.ObservableOnSubscribe
@@ -139,12 +138,27 @@ object TicketModel : IReceivedMsgListener, IOchOnMessageListener<WriteOffPasseng
// writeOffMsg.orderNo?:""
// )
} else { // 核验失败
ShuttleVoiceManager.writeOffFaile("验票失败，${writeOffMsg.failedReason ?: ""}")
ShuttleVoiceManager.writeOffFaile(writeOffMsg.failedReason ?: "")
var tempPhone = writeOffMsg.phone
tempPhone?.let {
if (it.length > 8) {
//截取电话号码前三位
val phoneNumPre = it.substring(0, 3)
//截取电话号码后四位
val phoneNumFix = it.substring(7)
tempPhone = "$phoneNumPre****$phoneNumFix"
}
}
val reaseonAndPhone = if(tempPhone.isNullOrEmpty()) {
"${writeOffMsg.failedReason}"
}else{
"${writeOffMsg.failedReason};乘客：${tempPhone}"
}
saveMsgBox(
MsgBoxBean(
MsgBoxType.V2X, V2XMsg(
EventTypeEnumNew.TYPE_ABNORMAL_VERIFICATION.poiType,
writeOffMsg.failedReason ?: "",
reaseonAndPhone,
EventTypeEnumNew.TYPE_ABNORMAL_VERIFICATION.tts,
""
)
@@ -189,9 +203,9 @@ object TicketModel : IReceivedMsgListener, IOchOnMessageListener<WriteOffPasseng
private fun playPassenger(ticketSize: Int,phone:String,ticketName:String,orderNo:String) {
if (ticketSize > 1) { //多人播报 "x人" ---》x人核验通过
OrderModel.getInstance().sendWriteOffNumToClient(ticketSize.toString() + "人核验通过")
ShuttleVoiceManager.sendWriteOffNumToClient(ticketSize.toString() + "人核验通过")
} else { //是 1 播放 "滴" 2022.11.09 改为： "核验通过"
OrderModel.getInstance().sendWriteOffNumToClient("核验通过")
ShuttleVoiceManager.sendWriteOffNumToClient("核验通过")
}
ShuttleVoiceManager.writeOffCount(ticketSize)

22
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/net/IBascApiService.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/net/IBascApiService.java
View File

@@ -1,16 +1,14 @@
package com.mogo.och.shuttle.net;
package com.mogo.och.weaknet.net;
import com.mogo.eagle.core.data.BaseData;
import com.mogo.och.shuttle.bean.BusCloseTaskRequest;
import com.mogo.och.shuttle.bean.BusOrdersResponse;
import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse;
import com.mogo.och.shuttle.bean.BusQueryLinesResponse;
import com.mogo.och.shuttle.bean.BusQueryLineStationsRequest;
import com.mogo.och.shuttle.bean.BusRoutesResponse;
import com.mogo.och.shuttle.bean.QueryLeaveAwayPassengersRequest;
import com.mogo.och.shuttle.bean.QueryLeaveAwayPassengersResponse;
import com.mogo.och.shuttle.bean.BusResetDrivingLineRequest;
import com.mogo.och.shuttle.bean.BusUpdateSiteStatusRequest;
import com.mogo.och.shuttle.bean.WriteOffCountResponse;
import com.mogo.och.weaknet.bean.BusCloseTaskRequest;
import com.mogo.och.weaknet.bean.BusQueryLineStationsRequest;
import com.mogo.och.weaknet.bean.BusQueryLineTaskResponse;
import com.mogo.och.weaknet.bean.BusQueryLinesResponse;
import com.mogo.och.weaknet.bean.BusResetDrivingLineRequest;
import com.mogo.och.weaknet.bean.BusRoutesResponse;
import com.mogo.och.weaknet.bean.BusUpdateSiteStatusRequest;
import com.mogo.och.weaknet.bean.WriteOffCountResponse;
import io.reactivex.Observable;
import retrofit2.http.Body;

23
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/net/OrderServiceManager.kt → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/net/OrderServiceManager.kt
View File

@@ -1,26 +1,23 @@
package com.mogo.och.shuttle.net
package com.mogo.och.weaknet.net
import android.content.Context
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.BaseData
import com.mogo.eagle.core.network.MoGoRetrofitFactory
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.och.common.module.constant.OchCommonConst
import com.mogo.och.common.module.network.OchCommonServiceCallback
import com.mogo.och.common.module.network.OchCommonSubscribeImpl
import com.mogo.och.common.module.network.interceptor.transformIoTry
import com.mogo.och.common.module.network.interceptor.transformTry
import com.mogo.och.shuttle.bean.BusCloseTaskRequest
import com.mogo.och.shuttle.bean.BusOrdersResponse
import com.mogo.och.shuttle.bean.BusQueryLineStationsRequest
import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse
import com.mogo.och.shuttle.bean.BusQueryLinesResponse
import com.mogo.och.shuttle.bean.BusResetDrivingLineRequest
import com.mogo.och.shuttle.bean.BusRoutesResponse
import com.mogo.och.shuttle.bean.BusUpdateSiteStatusRequest
import com.mogo.och.shuttle.bean.QueryLeaveAwayPassengersRequest
import com.mogo.och.shuttle.bean.QueryLeaveAwayPassengersResponse
import com.mogo.och.shuttle.bean.WriteOffCountResponse
import com.mogo.och.weaknet.bean.BusCloseTaskRequest
import com.mogo.och.weaknet.bean.BusQueryLineStationsRequest
import com.mogo.och.weaknet.bean.BusQueryLineTaskResponse
import com.mogo.och.weaknet.bean.BusQueryLinesResponse
import com.mogo.och.weaknet.bean.BusResetDrivingLineRequest
import com.mogo.och.weaknet.bean.BusRoutesResponse
import com.mogo.och.weaknet.bean.BusUpdateSiteStatusRequest
import com.mogo.och.weaknet.bean.WriteOffCountResponse
/**
* @author: wangmingjun

18
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/presenter/BusLinePresenter.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusLinePresenter.java
View File

@@ -1,18 +1,16 @@
package com.mogo.och.shuttle.presenter;
import android.os.Looper;
package com.mogo.och.weaknet.presenter;
import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleOwner;
import com.mogo.commons.mvp.Presenter;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse;
import com.mogo.och.shuttle.bean.BusQueryLinesResponse;
import com.mogo.och.shuttle.callback.IBusLinesCallback;
import com.mogo.och.shuttle.model.BusLineModel;
import com.mogo.och.shuttle.model.OrderModel;
import com.mogo.och.shuttle.ui.BusSwitchLineView;
import com.mogo.och.weaknet.bean.BusQueryLineTaskResponse;
import com.mogo.och.weaknet.bean.BusQueryLinesResponse;
import com.mogo.och.weaknet.callback.IBusLinesCallback;
import com.mogo.och.weaknet.model.BusLineModel;
import com.mogo.och.weaknet.model.OrderModel;
import com.mogo.och.weaknet.ui.BusSwitchLineView;
import java.util.concurrent.TimeUnit;
@@ -107,7 +105,7 @@ public class BusLinePresenter extends Presenter<BusSwitchLineView> implements IB
@Override
public void onBusLineTasks(BusQueryLineTaskResponse o, int position,boolean autoRefresh) {
public void onBusLineTasks(BusQueryLineTaskResponse o, int position, boolean autoRefresh) {
if(mView!=null) {
mView.onBusLineTasks(o,position,autoRefresh);
}

18
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/presenter/BusPresenter.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusPresenter.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.presenter;
package com.mogo.och.weaknet.presenter;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
@@ -15,23 +15,22 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.och.common.module.biz.login.LoginStatusEnum;
import com.mogo.och.common.module.manager.autopilot.autopilot.ArrivedStation;
import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener;
import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager;
import com.mogo.och.data.bean.BusStationBean;
import com.mogo.och.shuttle.callback.IBusADASStatusCallback;
import com.mogo.och.shuttle.callback.IBusControllerStatusCallback;
import com.mogo.och.shuttle.callback.IRefreshBusStationsCallback;
import com.mogo.och.shuttle.callback.ISlidePannelHideCallback;
import com.mogo.och.shuttle.fragment.ShuttleFragment;
import com.mogo.och.shuttle.model.OrderModel;
import com.mogo.och.shuttle.util.BusTrajectoryManager;
import com.mogo.och.common.module.biz.login.ILoginCallback;
import com.mogo.och.common.module.biz.login.LoginStatusManager;
import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager;
import com.mogo.och.weaknet.callback.IBusADASStatusCallback;
import com.mogo.och.weaknet.callback.IBusControllerStatusCallback;
import com.mogo.och.weaknet.callback.IRefreshBusStationsCallback;
import com.mogo.och.weaknet.callback.ISlidePannelHideCallback;
import com.mogo.och.weaknet.fragment.ShuttleFragment;
import com.mogo.och.weaknet.model.OrderModel;
import com.mogo.och.weaknet.util.BusTrajectoryManager;
import java.util.ArrayList;
@@ -285,7 +284,6 @@ public class BusPresenter extends Presenter<ShuttleFragment>
@Override
public void onStatusChange(LoginStatusEnum currentStatus) {
ILoginCallback.super.onStatusChange(currentStatus);
CallerLogger.d(M_BUS + TAG, " loginStatus =" + LoginStatusManager.isLogin());
if(LoginStatusManager.isLogin()){
// OrderModel.getInstance().queryBusRoutes();

8
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/BusStationCommonItem.kt → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusStationCommonItem.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.ui
package com.mogo.och.weaknet.ui
import android.content.Context
import android.util.AttributeSet
@@ -6,9 +6,9 @@ import android.view.LayoutInflater
import android.widget.ImageView
import android.widget.LinearLayout
import androidx.core.content.ContextCompat
import com.mogo.och.shuttle.R
import com.mogo.och.common.module.utils.BlinkAnimationUtil
import kotlinx.android.synthetic.main.shuttle_stations_common_item.view.*
import com.mogo.och.shuttle.weaknet.R
import kotlinx.android.synthetic.main.shuttle_weak_stations_common_item.view.*
/**
* @author: wangmingjun
@@ -21,7 +21,7 @@ class BusStationCommonItem @JvmOverloads constructor(
) : LinearLayout(context, attrs, defStyleAttr){
init {
LayoutInflater.from(context).inflate(R.layout.shuttle_stations_common_item,this,true)
LayoutInflater.from(context).inflate(R.layout.shuttle_weak_stations_common_item,this,true)
}
fun setStationName(name: String){

16
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/BusSwitchLineActivity.kt → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineActivity.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.ui
package com.mogo.och.weaknet.ui
import android.graphics.Point
import android.os.Bundle
@@ -13,14 +13,14 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.mogo.commons.mvp.MvpActivity
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.och.shuttle.presenter.BusLinePresenter
import com.mogo.och.shuttle.ui.adapter.SwitchLineAdapter
import com.mogo.och.shuttle.bean.BusQueryLinesResponse
import com.mogo.och.shuttle.ui.adapter.OpenItemAnimator
import com.mogo.och.weaknet.presenter.BusLinePresenter
import com.mogo.och.weaknet.ui.adapter.SwitchLineAdapter
import com.mogo.och.weaknet.bean.BusQueryLinesResponse
import com.mogo.och.weaknet.ui.adapter.OpenItemAnimator
import com.mogo.eagle.core.utilcode.mogo.view.SpacesItemDecoration
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.och.shuttle.R
import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse
import com.mogo.och.weaknet.bean.BusQueryLineTaskResponse
import com.mogo.och.shuttle.weaknet.R
import java.util.ArrayList
/**
@@ -42,7 +42,7 @@ class BusSwitchLineActivity : MvpActivity<BusSwitchLineView?, BusLinePresenter?>
private lateinit var linearLayoutManager:LinearLayoutManager
private val mData: MutableList<BusQueryLinesResponse.Result> = ArrayList()
override fun getLayoutId(): Int {
return R.layout.shuttle_switch_line
return R.layout.shuttle_weak_switch_line
}
override fun createPresenter(): BusLinePresenter {

6
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/BusSwitchLineView.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineView.java
View File

@@ -1,8 +1,8 @@
package com.mogo.och.shuttle.ui;
package com.mogo.och.weaknet.ui;
import com.mogo.commons.mvp.IView;
import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse;
import com.mogo.och.shuttle.bean.BusQueryLinesResponse;
import com.mogo.och.weaknet.bean.BusQueryLineTaskResponse;
import com.mogo.och.weaknet.bean.BusQueryLinesResponse;
/**
* @author: wangmingjun

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/OpenItemAnimator.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/adapter/OpenItemAnimator.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.ui.adapter;
package com.mogo.och.weaknet.ui.adapter;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;

10
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/SwitchLineAdapter.kt → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/adapter/SwitchLineAdapter.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.ui.adapter
package com.mogo.och.weaknet.ui.adapter
import android.content.Context
import android.view.LayoutInflater
@@ -9,9 +9,9 @@ import androidx.appcompat.widget.AppCompatTextView
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.mogo.och.shuttle.R
import com.mogo.och.shuttle.bean.BusQueryLinesResponse
import com.mogo.och.shuttle.ui.adapter.SwitchLineAdapter.SwitchLineViewHolder
import com.mogo.och.weaknet.bean.BusQueryLinesResponse
import com.mogo.och.weaknet.ui.adapter.SwitchLineAdapter.SwitchLineViewHolder
import com.mogo.och.shuttle.weaknet.R
import kotlin.text.StringBuilder
/**
@@ -33,7 +33,7 @@ class SwitchLineAdapter(
viewType: Int
): SwitchLineViewHolder {
val view = LayoutInflater.from(mContext).inflate(
R.layout.shuttle_switch_line_list_item, parent, false
R.layout.shuttle_weak_switch_line_list_item, parent, false
)
return SwitchLineViewHolder(view)
}

10
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/SwitchLineTaskAdapter.kt → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/adapter/SwitchLineTaskAdapter.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.ui.adapter
package com.mogo.och.weaknet.ui.adapter
import android.content.Context
import android.view.LayoutInflater
@@ -7,9 +7,9 @@ import android.view.ViewGroup
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.mogo.eagle.core.utilcode.util.TimeUtils
import com.mogo.och.shuttle.R
import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse
import com.mogo.och.shuttle.ui.adapter.SwitchLineTaskAdapter.SwitchLineTaskViewHolder
import com.mogo.och.weaknet.bean.BusQueryLineTaskResponse
import com.mogo.och.weaknet.ui.adapter.SwitchLineTaskAdapter.SwitchLineTaskViewHolder
import com.mogo.och.shuttle.weaknet.R
/**
* 路线列表adapter
@@ -22,7 +22,7 @@ class SwitchLineTaskAdapter(
) : RecyclerView.Adapter<SwitchLineTaskViewHolder>() {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SwitchLineTaskViewHolder {
val view = LayoutInflater.from(mContext).inflate(
R.layout.shuttle_switch_line_list_task_item, parent, false
R.layout.shuttle_weak_switch_line_list_task_item, parent, false
)
return SwitchLineTaskViewHolder(view)
}

9
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffView.kt → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/writeoff/WriteOffView.kt
View File

@@ -1,14 +1,13 @@
package com.mogo.och.shuttle.ui.writeoff
package com.mogo.och.weaknet.ui.writeoff
import android.content.Context
import android.util.AttributeSet
import android.util.Log
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.findViewTreeViewModelStoreOwner
import com.mogo.och.shuttle.R
import kotlinx.android.synthetic.main.shuttle_wirte_off_view.view.tv_write_off_count
import com.mogo.och.shuttle.weaknet.R
import kotlinx.android.synthetic.main.shuttle_weak_wirte_off_view.view.tv_write_off_count
class WriteOffView : ConstraintLayout, WriteOffViewModel.IwriteOffViewCallback {
@@ -23,7 +22,7 @@ class WriteOffView : ConstraintLayout, WriteOffViewModel.IwriteOffViewCallback {
constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes)
private fun initView() {
LayoutInflater.from(context).inflate(R.layout.shuttle_wirte_off_view, this, true)
LayoutInflater.from(context).inflate(R.layout.shuttle_weak_wirte_off_view, this, true)
}

6
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffViewModel.kt → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/writeoff/WriteOffViewModel.kt
View File

@@ -1,12 +1,12 @@
package com.mogo.och.shuttle.ui.writeoff
package com.mogo.och.weaknet.ui.writeoff
import androidx.lifecycle.ViewModel
import com.mogo.commons.AbsMogoApplication
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.och.shuttle.R
import com.mogo.och.shuttle.model.TicketModel
import com.mogo.och.weaknet.model.TicketModel
import com.mogo.och.common.module.utils.RxUtils
import com.mogo.och.shuttle.weaknet.R
import io.reactivex.Observable
import io.reactivex.Observer
import io.reactivex.android.schedulers.AndroidSchedulers

4
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/util/BusAnalyticsManager.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusAnalyticsManager.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.util;
package com.mogo.och.weaknet.util;
import androidx.annotation.NonNull;
@@ -26,7 +26,7 @@ public class BusAnalyticsManager extends OchAutopilotAnalytics {
}
public static BusAnalyticsManager getInstance() {
return BusAnalyticsManager.SingletonHolder.INSTANCE;
return SingletonHolder.INSTANCE;
}
@NonNull

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/util/BusSendTripInfoManager.kt → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusSendTripInfoManager.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.util
package com.mogo.och.weaknet.util
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d

14
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/util/BusTrajectoryManager.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.java
View File

@@ -1,4 +1,6 @@
package com.mogo.och.shuttle.util;
package com.mogo.och.weaknet.util;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
import androidx.annotation.Nullable;
@@ -6,11 +8,11 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.util.GsonUtils;
import com.mogo.och.common.module.biz.login.LoginStatusManager;
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager;
import com.mogo.och.data.bean.BusRoutesResult;
import com.mogo.och.shuttle.constant.BusConst;
import com.mogo.och.shuttle.model.OrderModel;
import com.mogo.och.common.module.biz.login.LoginStatusManager;
import com.mogo.och.weaknet.constant.BusConst;
import com.mogo.och.weaknet.model.OrderModel;
import java.util.concurrent.TimeUnit;
@@ -20,8 +22,6 @@ import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import mogo_msg.MogoReportMsg;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
/**
* Bus轨迹管理：给MEC下发用于轨迹下载的信息
* Created on 2022/6/23
@@ -34,7 +34,7 @@ public class BusTrajectoryManager {
}
public static BusTrajectoryManager getInstance() {
return BusTrajectoryManager.SingletonHolder.INSTANCE;
return SingletonHolder.INSTANCE;
}
private AutopilotControlParameters.AutoPilotLine mAutoPilotLine = null;

17
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/util/ShuttleVoiceManager.kt → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/ShuttleVoiceManager.kt
View File

@@ -1,17 +1,22 @@
package com.mogo.och.shuttle.util
package com.mogo.och.weaknet.util
import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.voice.AIAssist
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.och.shuttle.R
import com.mogo.och.common.module.manager.socket.lan.LanSocketManager.sendMsgToClient
import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg
import com.mogo.och.common.module.voice.VoiceNotice
import com.mogo.och.shuttle.weaknet.R
import com.mogo.tts.base.LangTtsEntity
import com.mogo.tts.base.LanguageType
import java.util.ArrayList
object ShuttleVoiceManager {
fun sendWriteOffNumToClient(msg: String?) {
val passengerMsg = AppConnectMsg(false, true, msg!!, -1)
sendMsgToClient(passengerMsg)
}
fun arrivedStationBus(siteNameCN: String?, siteNameKR: String?) {
val context = AbsMogoApplication.getApp()
val list: MutableList<LangTtsEntity> = ArrayList()
@@ -87,7 +92,7 @@ object ShuttleVoiceManager {
}
fun writeOffFaile(reaseon:String) {
VoiceNotice.showNotice("验票失败，${reaseon}", AIAssist.LEVEL3)
VoiceNotice.showNotice(reaseon, AIAssist.LEVEL3)
}
}

10
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/view/BizMapView.kt → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/BizMapView.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.view
package com.mogo.och.weaknet.view
import android.content.Context
import android.os.Bundle
@@ -9,7 +9,7 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.function.view.MapBizView
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.map.uicontroller.IMogoMapUIController
import com.mogo.och.shuttle.R
import com.mogo.och.shuttle.weaknet.R
/**
* 魔戒蓝牙控件
@@ -25,11 +25,11 @@ class BizMapView @JvmOverloads constructor(
init {
if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) {
LayoutInflater.from(context).inflate(R.layout.shuttle_m2_bizmap_map, this, true)
LayoutInflater.from(context).inflate(R.layout.shuttle_weak_m2_bizmap_map, this, true)
}else if(AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)){
LayoutInflater.from(context).inflate(R.layout.shuttle_jl_bizmap_map, this, true)
LayoutInflater.from(context).inflate(R.layout.shuttle_weak_jl_bizmap_map, this, true)
}else{
LayoutInflater.from(context).inflate(R.layout.shuttle_jl_bizmap_map, this, true)
LayoutInflater.from(context).inflate(R.layout.shuttle_weak_jl_bizmap_map, this, true)
}
mapBizView = findViewById(R.id.bizMapView)
}

4
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/view/SlidePanelView.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/SlidePanelView.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.view;
package com.mogo.och.weaknet.view;
import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
@@ -25,8 +25,8 @@ import com.mogo.commons.AbsMogoApplication;
import com.mogo.eagle.core.utilcode.util.ConvertUtils;
import com.mogo.eagle.core.utilcode.util.ThreadUtils;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.och.shuttle.R;
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager;
import com.mogo.och.shuttle.weaknet.R;
import me.jessyan.autosize.AutoSizeConfig;
import me.jessyan.autosize.utils.AutoSizeUtils;

2
OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/view/VerticalDashLineView.java → OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/VerticalDashLineView.java
View File

@@ -1,4 +1,4 @@
package com.mogo.och.shuttle.view;
package com.mogo.och.weaknet.view;
import android.content.Context;
import android.graphics.Canvas;

0
OCH/shuttle_weaknet/driver/src/main/res/color/bus_autopilot_text_color_selector.xml → OCH/shuttle/driver_weaknet/src/main/res/color/bus_autopilot_text_color_selector.xml
View File

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_base_icon_in_autopilot.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_base_icon_in_autopilot.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_base_icon_not_in_autopilot.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_base_icon_not_in_autopilot.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_base_slide_block.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_base_slide_block.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_disable_autopilot_icon.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_disable_autopilot_icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_dot_line.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_dot_line.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 323 B

After

Width:  |  Height:  |  Size: 323 B

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_ic_autopilot.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_ic_autopilot.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_icon_arrived_station.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_icon_arrived_station.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_icon_arriving_station.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_icon_arriving_station.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_icon_not_arrive_station.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_icon_not_arrive_station.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 338 B

After

Width:  |  Height:  |  Size: 338 B

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_light_green_nor.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_light_green_nor.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_light_red_nor.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_light_red_nor.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_lightyellow_nor.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_lightyellow_nor.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_line_panel_bg.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_line_panel_bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 53 KiB

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_line_panel_bg_1.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_line_panel_bg_1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 47 KiB

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_line_task_arrow.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_line_task_arrow.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 491 B

After

Width:  |  Height:  |  Size: 491 B

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_loading_autopilot_icon.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_loading_autopilot_icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_no_line_icon.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_no_line_icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_och_dot_line.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_och_dot_line.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1004 B

After

Width:  |  Height:  |  Size: 1004 B

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_operation_status_bg.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_operation_status_bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_operation_status_select_bg.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_operation_status_select_bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_right_autopilot_icon.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_right_autopilot_icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_selected_btn.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_selected_btn.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_setting_btn_bg.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_setting_btn_bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

0
OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_switch_line_close.png → OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_switch_line_close.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Some files were not shown because too many files have changed in this diff Show More