diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/net/OchCommonServiceManager.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/net/OchCommonServiceManager.kt index 4670b0d98e..7c26baa06a 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/net/OchCommonServiceManager.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/net/OchCommonServiceManager.kt @@ -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 { diff --git a/OCH/common/common/build.gradle b/OCH/common/common/build.gradle index 8dae7850b8..5a7057c888 100644 --- a/OCH/common/common/build.gradle +++ b/OCH/common/common/build.gradle @@ -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 diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/IOchLanPassengerStatusListener.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/IOchLanPassengerStatusListener.java index 94831d48b0..92fbd33aa1 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/IOchLanPassengerStatusListener.java +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/IOchLanPassengerStatusListener.java @@ -5,4 +5,8 @@ public interface IOchLanPassengerStatusListener { default void onDriverSnChagneListner(String sn) { } + default void onDriverConnectChangeListener(boolean isConnect){ + + } + } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanPassengerSocket.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanPassengerSocket.kt index f2d94e83ac..0dbb45ff1c 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanPassengerSocket.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanPassengerSocket.kt @@ -47,6 +47,9 @@ object LoginLanPassengerSocket : IReceivedMsgListener, CallerBase if (oldV != newV) { + M_LISTENERS.forEach { + it.value.onDriverConnectChangeListener(newV) + } if(newV){// 已连接 val msg = BaseDPMsg(type = DPMsgType.TYPE_CLIENT_REGISTER.type) LanSocketManager.sendMsgToServer(msg) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt index fb092bcf23..a27c88d4e5 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt @@ -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" diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt index c07b21a18e..719751b5ce 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt @@ -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) } diff --git a/OCH/shuttle_weaknet/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/ScannerManager.kt similarity index 52% rename from OCH/shuttle_weaknet/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerManager.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/ScannerManager.kt index a5e19b5757..847d1eadfc 100644 --- a/OCH/shuttle_weaknet/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/ScannerManager.kt @@ -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 = 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?) { + 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?) { - 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 -> {} diff --git a/OCH/shuttle_weaknet/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerStateView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/ScannerStateView.kt similarity index 91% rename from OCH/shuttle_weaknet/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerStateView.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/ScannerStateView.kt index f7b335c3a2..fe24512136 100644 --- a/OCH/shuttle_weaknet/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerStateView.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/ScannerStateView.kt @@ -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) { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/StateChangeListener.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/StateChangeListener.kt new file mode 100644 index 0000000000..723b598010 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/StateChangeListener.kt @@ -0,0 +1,6 @@ +package com.mogo.och.common.module.manager.scnner + +interface StateChangeListener { + fun stateChange(newBindValue: BindStatus, newOpentValue: OpenStatus){} + fun parseData(params: MutableMap, payload: String?){} +} \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt index e1b2128c18..9fb386dd51 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt @@ -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 diff --git a/OCH/facade/script/och.gradle b/OCH/facade/script/och.gradle index e8b94fefd1..9745fed424 100644 --- a/OCH/facade/script/och.gradle +++ b/OCH/facade/script/och.gradle @@ -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') } } } diff --git a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt index 1bf12952a3..cda54e5d2f 100644 --- a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt +++ b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt @@ -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)) { diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt index fafac81b18..d38c5a1898 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt @@ -87,7 +87,7 @@ object ShuttleVoiceManager { } fun writeOffFaile(reaseon:String) { - VoiceNotice.showNotice("验票失败，${reaseon}", AIAssist.LEVEL3) + VoiceNotice.showNotice(reaseon, AIAssist.LEVEL3) } } \ No newline at end of file diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffCountResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffCountResponse.java index b8eaa7e68d..931a6e0a42 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffCountResponse.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffCountResponse.java @@ -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 diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java index 63514041c1..07e26c9ce7 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java @@ -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 { diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/TicketModel.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/TicketModel.kt index 921e44a85a..22e036ce1a 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/TicketModel.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/TicketModel.kt @@ -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 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 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) diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/net/IBascApiService.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/net/IBascApiService.java index 7219cf0be7..88d5ecbb0d 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/net/IBascApiService.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/net/IBascApiService.java @@ -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; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/net/OrderServiceManager.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/net/OrderServiceManager.kt index e305dc5c8f..735e507e02 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/net/OrderServiceManager.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/net/OrderServiceManager.kt @@ -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 /** diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/presenter/BusLinePresenter.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/presenter/BusLinePresenter.java index 8dfd60efa0..571780f469 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/presenter/BusLinePresenter.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/presenter/BusLinePresenter.java @@ -1,7 +1,5 @@ package com.mogo.och.shuttle.presenter; -import android.os.Looper; - import androidx.annotation.NonNull; import androidx.lifecycle.LifecycleOwner; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/presenter/BusPresenter.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/presenter/BusPresenter.java index baf09bf32f..1b74fa0608 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/presenter/BusPresenter.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/presenter/BusPresenter.java @@ -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; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffViewModel.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffViewModel.kt index 27953a4012..68da5137b1 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffViewModel.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffViewModel.kt @@ -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 diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusAnalyticsManager.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusAnalyticsManager.java index 5e85fa7ffa..a9cc91db20 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusAnalyticsManager.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusAnalyticsManager.java @@ -26,7 +26,7 @@ public class BusAnalyticsManager extends OchAutopilotAnalytics { } public static BusAnalyticsManager getInstance() { - return BusAnalyticsManager.SingletonHolder.INSTANCE; + return SingletonHolder.INSTANCE; } @NonNull diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusTrajectoryManager.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusTrajectoryManager.java index 2154ea4672..0d3dca0c64 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusTrajectoryManager.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusTrajectoryManager.java @@ -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; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/ShuttleVoiceManager.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/ShuttleVoiceManager.kt index 854c739097..77e85a4594 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/ShuttleVoiceManager.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/ShuttleVoiceManager.kt @@ -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 = ArrayList() @@ -87,7 +92,7 @@ object ShuttleVoiceManager { } fun writeOffFaile(reaseon:String) { - VoiceNotice.showNotice("验票失败，${reaseon}", AIAssist.LEVEL3) + VoiceNotice.showNotice(reaseon, AIAssist.LEVEL3) } } \ No newline at end of file diff --git a/OCH/shuttle/driver/src/main/res/layout/shuttle_tap_position.xml b/OCH/shuttle/driver/src/main/res/layout/shuttle_tap_position.xml deleted file mode 100644 index 0aa49df0bd..0000000000 --- a/OCH/shuttle/driver/src/main/res/layout/shuttle_tap_position.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/shuttle_weaknet/driver/.gitignore b/OCH/shuttle/driver_weaknet/.gitignore similarity index 100% rename from OCH/shuttle_weaknet/driver/.gitignore rename to OCH/shuttle/driver_weaknet/.gitignore diff --git a/OCH/shuttle_weaknet/driver/build.gradle b/OCH/shuttle/driver_weaknet/build.gradle similarity index 96% rename from OCH/shuttle_weaknet/driver/build.gradle rename to OCH/shuttle/driver_weaknet/build.gradle index 9d0078f8e6..70d921e362 100644 --- a/OCH/shuttle_weaknet/driver/build.gradle +++ b/OCH/shuttle/driver_weaknet/build.gradle @@ -19,7 +19,7 @@ android { kapt { useBuildCache = false arguments { - arg("AROUTER_MODULE_NAME", "shuttle"+project.getName()) + arg("AROUTER_MODULE_NAME", "shuttle_weaknet_"+project.getName()) } } } diff --git a/OCH/shuttle_weaknet/driver/consumer-rules.pro b/OCH/shuttle/driver_weaknet/consumer-rules.pro similarity index 100% rename from OCH/shuttle_weaknet/driver/consumer-rules.pro rename to OCH/shuttle/driver_weaknet/consumer-rules.pro diff --git a/OCH/shuttle_weaknet/driver/gradle.properties b/OCH/shuttle/driver_weaknet/gradle.properties similarity index 100% rename from OCH/shuttle_weaknet/driver/gradle.properties rename to OCH/shuttle/driver_weaknet/gradle.properties diff --git a/OCH/shuttle_weaknet/driver/proguard-rules.pro b/OCH/shuttle/driver_weaknet/proguard-rules.pro similarity index 100% rename from OCH/shuttle_weaknet/driver/proguard-rules.pro rename to OCH/shuttle/driver_weaknet/proguard-rules.pro diff --git a/OCH/shuttle_weaknet/driver/src/main/AndroidManifest.xml b/OCH/shuttle/driver_weaknet/src/main/AndroidManifest.xml similarity index 72% rename from OCH/shuttle_weaknet/driver/src/main/AndroidManifest.xml rename to OCH/shuttle/driver_weaknet/src/main/AndroidManifest.xml index b24b4d5534..1f7b878d2c 100644 --- a/OCH/shuttle_weaknet/driver/src/main/AndroidManifest.xml +++ b/OCH/shuttle/driver_weaknet/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ + package="com.mogo.och.shuttle.weaknet"> - diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ShuttleDriverProvider.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt similarity index 87% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ShuttleDriverProvider.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt index ff8e351db4..46cf3162a9 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ShuttleDriverProvider.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt @@ -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 diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusCloseTaskRequest.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusCloseTaskRequest.java similarity index 93% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusCloseTaskRequest.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusCloseTaskRequest.java index 7854aa0e07..0e08c10936 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusCloseTaskRequest.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusCloseTaskRequest.java @@ -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; diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusOrderBean.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusOrderBean.java similarity index 98% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusOrderBean.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusOrderBean.java index 4a4230ccd6..3d089f6bfa 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusOrderBean.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusOrderBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.bean; +package com.mogo.och.weaknet.bean; /** * @author congtaowang diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusOrdersResponse.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusOrdersResponse.java similarity index 92% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusOrdersResponse.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusOrdersResponse.java index 03a2b23b96..71ad794921 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusOrdersResponse.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusOrdersResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.bean; +package com.mogo.och.weaknet.bean; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLineStationsRequest.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLineStationsRequest.java similarity index 90% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLineStationsRequest.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLineStationsRequest.java index 0f3cd777ea..63d594a53a 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLineStationsRequest.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLineStationsRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.bean; +package com.mogo.och.weaknet.bean; import com.mogo.commons.storage.SharedPrefsMgr; diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLineTaskResponse.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLineTaskResponse.java similarity index 89% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLineTaskResponse.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLineTaskResponse.java index fbf8f22c3b..2ef69bd07e 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLineTaskResponse.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLineTaskResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.bean; +package com.mogo.och.weaknet.bean; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLinesResponse.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLinesResponse.java similarity index 94% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLinesResponse.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLinesResponse.java index a5ad54daa8..8f94eb131e 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLinesResponse.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusQueryLinesResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.bean; +package com.mogo.och.weaknet.bean; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusResetDrivingLineRequest.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusResetDrivingLineRequest.java similarity index 93% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusResetDrivingLineRequest.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusResetDrivingLineRequest.java index ef6cdbda93..132c81ca59 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusResetDrivingLineRequest.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusResetDrivingLineRequest.java @@ -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; diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusRoutesResponse.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusRoutesResponse.java similarity index 94% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusRoutesResponse.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusRoutesResponse.java index 667135077b..1d1d7322df 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusRoutesResponse.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusRoutesResponse.java @@ -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; diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusUpdateSiteStatusRequest.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusUpdateSiteStatusRequest.java similarity index 94% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusUpdateSiteStatusRequest.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusUpdateSiteStatusRequest.java index 13ba2e4f3c..77c4c54b75 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/BusUpdateSiteStatusRequest.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusUpdateSiteStatusRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.bean; +package com.mogo.och.weaknet.bean; import com.mogo.commons.storage.SharedPrefsMgr; diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/QueryLeaveAwayPassengersRequest.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/QueryLeaveAwayPassengersRequest.java similarity index 95% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/QueryLeaveAwayPassengersRequest.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/QueryLeaveAwayPassengersRequest.java index 8c13428bff..f99cbe0faa 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/QueryLeaveAwayPassengersRequest.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/QueryLeaveAwayPassengersRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.bean; +package com.mogo.och.weaknet.bean; import com.mogo.commons.storage.SharedPrefsMgr; diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/QueryLeaveAwayPassengersResponse.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/QueryLeaveAwayPassengersResponse.java similarity index 98% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/QueryLeaveAwayPassengersResponse.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/QueryLeaveAwayPassengersResponse.java index b11ba9329b..c09fc7a6b2 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/QueryLeaveAwayPassengersResponse.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/QueryLeaveAwayPassengersResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.bean; +package com.mogo.och.weaknet.bean; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffCountResponse.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/WriteOffCountResponse.java similarity index 75% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffCountResponse.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/WriteOffCountResponse.java index b8eaa7e68d..ff71cabb89 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffCountResponse.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/WriteOffCountResponse.java @@ -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 diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffPassenger.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/WriteOffPassenger.java similarity index 94% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffPassenger.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/WriteOffPassenger.java index cdedc26acb..93b764df8f 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffPassenger.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/WriteOffPassenger.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.bean; +package com.mogo.och.weaknet.bean; import java.io.Serializable; diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/IBusADASStatusCallback.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusADASStatusCallback.java similarity index 85% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/IBusADASStatusCallback.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusADASStatusCallback.java index 8a59bcb206..71bb55e671 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/IBusADASStatusCallback.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusADASStatusCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.callback; +package com.mogo.och.weaknet.callback; /** * Created on 2021/9/8 diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/IBusControllerStatusCallback.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusControllerStatusCallback.java similarity index 91% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/IBusControllerStatusCallback.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusControllerStatusCallback.java index 2e3a71fff3..c9e0acf8ac 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/IBusControllerStatusCallback.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusControllerStatusCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.callback; +package com.mogo.och.weaknet.callback; import com.mogo.eagle.core.data.map.MogoLocation; diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/IBusLinesCallback.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java similarity index 63% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/IBusLinesCallback.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java index f52a9c7454..458035b841 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/IBusLinesCallback.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java @@ -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 diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/IRefreshBusStationsCallback.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IRefreshBusStationsCallback.java similarity index 93% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/IRefreshBusStationsCallback.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IRefreshBusStationsCallback.java index 14e30a34fa..20b4c86690 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/IRefreshBusStationsCallback.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IRefreshBusStationsCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.callback; +package com.mogo.och.weaknet.callback; import com.mogo.och.data.bean.BusStationBean; diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/ISlidePannelHideCallback.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/ISlidePannelHideCallback.java similarity index 76% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/ISlidePannelHideCallback.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/ISlidePannelHideCallback.java index 6acad8a540..0865abccfe 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/callback/ISlidePannelHideCallback.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/ISlidePannelHideCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.callback; +package com.mogo.och.weaknet.callback; /** * @author: wangmingjun diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/constant/BusConst.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/constant/BusConst.kt similarity index 97% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/constant/BusConst.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/constant/BusConst.kt index 10fb756a69..59d1367a43 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/constant/BusConst.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/constant/BusConst.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.constant +package com.mogo.och.weaknet.constant import com.mogo.commons.debug.DebugConfig diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/fragment/BaseShuttleTabFragment.java similarity index 98% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/fragment/BaseShuttleTabFragment.java index 6043c194ec..c5b451171e 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/fragment/BaseShuttleTabFragment.java @@ -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 { + ToastUtils.showLong("weak_net"); onArriveStation(); }); diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/fragment/ShuttleFragment.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/fragment/ShuttleFragment.java similarity index 98% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/fragment/ShuttleFragment.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/fragment/ShuttleFragment.java index 3ff99861e0..b54aa7e480 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/fragment/ShuttleFragment.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/fragment/ShuttleFragment.java @@ -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 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 { diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/model/TicketModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt similarity index 86% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/model/TicketModel.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt index 921e44a85a..8073cefd21 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/model/TicketModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt @@ -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 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 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) diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/net/IBascApiService.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/net/IBascApiService.java similarity index 84% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/net/IBascApiService.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/net/IBascApiService.java index 7219cf0be7..2db4d1147e 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/net/IBascApiService.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/net/IBascApiService.java @@ -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; diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/net/OrderServiceManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/net/OrderServiceManager.kt similarity index 89% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/net/OrderServiceManager.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/net/OrderServiceManager.kt index e305dc5c8f..6ed39388bd 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/net/OrderServiceManager.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/net/OrderServiceManager.kt @@ -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 diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/presenter/BusLinePresenter.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusLinePresenter.java similarity index 87% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/presenter/BusLinePresenter.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusLinePresenter.java index 8dfd60efa0..3c8155e341 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/presenter/BusLinePresenter.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusLinePresenter.java @@ -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 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); } diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/presenter/BusPresenter.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusPresenter.java similarity index 95% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/presenter/BusPresenter.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusPresenter.java index 5e055e533e..fcb83bcb9b 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/presenter/BusPresenter.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusPresenter.java @@ -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 @Override public void onStatusChange(LoginStatusEnum currentStatus) { - ILoginCallback.super.onStatusChange(currentStatus); CallerLogger.d(M_BUS + TAG, " loginStatus =" + LoginStatusManager.isLogin()); if(LoginStatusManager.isLogin()){ // OrderModel.getInstance().queryBusRoutes(); diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/BusStationCommonItem.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusStationCommonItem.kt similarity index 91% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/BusStationCommonItem.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusStationCommonItem.kt index 9f6c121f07..4390ae6de0 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/BusStationCommonItem.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusStationCommonItem.kt @@ -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){ diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/BusSwitchLineActivity.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineActivity.kt similarity index 94% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/BusSwitchLineActivity.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineActivity.kt index a9fddd0ff4..64acfd963d 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/BusSwitchLineActivity.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineActivity.kt @@ -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 private lateinit var linearLayoutManager:LinearLayoutManager private val mData: MutableList = ArrayList() override fun getLayoutId(): Int { - return R.layout.shuttle_switch_line + return R.layout.shuttle_weak_switch_line } override fun createPresenter(): BusLinePresenter { diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/BusSwitchLineView.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineView.java similarity index 68% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/BusSwitchLineView.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineView.java index 5a4d85d312..e3c8c82f1c 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/BusSwitchLineView.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineView.java @@ -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 diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/OpenItemAnimator.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/adapter/OpenItemAnimator.java similarity index 99% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/OpenItemAnimator.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/adapter/OpenItemAnimator.java index bc8596d255..0880562e89 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/OpenItemAnimator.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/adapter/OpenItemAnimator.java @@ -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; diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/SwitchLineAdapter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/adapter/SwitchLineAdapter.kt similarity index 96% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/SwitchLineAdapter.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/adapter/SwitchLineAdapter.kt index 19738350eb..986b646714 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/SwitchLineAdapter.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/adapter/SwitchLineAdapter.kt @@ -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) } diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/SwitchLineTaskAdapter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/adapter/SwitchLineTaskAdapter.kt similarity index 89% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/SwitchLineTaskAdapter.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/adapter/SwitchLineTaskAdapter.kt index 95d5badfb8..1d5b885270 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/SwitchLineTaskAdapter.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/adapter/SwitchLineTaskAdapter.kt @@ -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() { 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) } diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/writeoff/WriteOffView.kt similarity index 83% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffView.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/writeoff/WriteOffView.kt index b0d7b3851a..3660c95d5d 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/writeoff/WriteOffView.kt @@ -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) } diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffViewModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/writeoff/WriteOffViewModel.kt similarity index 93% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffViewModel.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/writeoff/WriteOffViewModel.kt index 27953a4012..dce69c1fe9 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffViewModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/writeoff/WriteOffViewModel.kt @@ -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 diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/util/BusAnalyticsManager.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusAnalyticsManager.java similarity index 94% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/util/BusAnalyticsManager.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusAnalyticsManager.java index 5e85fa7ffa..93f5c13045 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/util/BusAnalyticsManager.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusAnalyticsManager.java @@ -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 diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/util/BusSendTripInfoManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusSendTripInfoManager.kt similarity index 97% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/util/BusSendTripInfoManager.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusSendTripInfoManager.kt index 51fb81a0d0..08021ff5c2 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/util/BusSendTripInfoManager.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusSendTripInfoManager.kt @@ -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 diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/util/BusTrajectoryManager.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.java similarity index 98% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/util/BusTrajectoryManager.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.java index 2154ea4672..94d17edf10 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/util/BusTrajectoryManager.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.java @@ -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; diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/util/ShuttleVoiceManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/ShuttleVoiceManager.kt similarity index 87% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/util/ShuttleVoiceManager.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/ShuttleVoiceManager.kt index 854c739097..a69eb2c063 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/util/ShuttleVoiceManager.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/ShuttleVoiceManager.kt @@ -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 = ArrayList() @@ -87,7 +92,7 @@ object ShuttleVoiceManager { } fun writeOffFaile(reaseon:String) { - VoiceNotice.showNotice("验票失败，${reaseon}", AIAssist.LEVEL3) + VoiceNotice.showNotice(reaseon, AIAssist.LEVEL3) } } \ No newline at end of file diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/view/BizMapView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/BizMapView.kt similarity index 90% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/view/BizMapView.kt rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/BizMapView.kt index d396c664ca..aa7c1e657e 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/view/BizMapView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/BizMapView.kt @@ -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) } diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/view/SlidePanelView.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/SlidePanelView.java similarity index 99% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/view/SlidePanelView.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/SlidePanelView.java index 87c355ceb5..a665ba8b78 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/view/SlidePanelView.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/SlidePanelView.java @@ -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; diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/view/VerticalDashLineView.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/VerticalDashLineView.java similarity index 98% rename from OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/view/VerticalDashLineView.java rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/VerticalDashLineView.java index 2b0fdfcf6d..abac3ca41b 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/view/VerticalDashLineView.java +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/VerticalDashLineView.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.view; +package com.mogo.och.weaknet.view; import android.content.Context; import android.graphics.Canvas; diff --git a/OCH/shuttle_weaknet/driver/src/main/res/color/bus_autopilot_text_color_selector.xml b/OCH/shuttle/driver_weaknet/src/main/res/color/bus_autopilot_text_color_selector.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/color/bus_autopilot_text_color_selector.xml rename to OCH/shuttle/driver_weaknet/src/main/res/color/bus_autopilot_text_color_selector.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_base_icon_in_autopilot.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_base_icon_in_autopilot.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_base_icon_in_autopilot.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_base_icon_in_autopilot.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_base_icon_not_in_autopilot.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_base_icon_not_in_autopilot.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_base_icon_not_in_autopilot.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_base_icon_not_in_autopilot.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_base_slide_block.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_base_slide_block.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_base_slide_block.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_base_slide_block.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_disable_autopilot_icon.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_disable_autopilot_icon.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_disable_autopilot_icon.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_disable_autopilot_icon.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_dot_line.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_dot_line.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_dot_line.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_dot_line.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_ic_autopilot.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_ic_autopilot.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_ic_autopilot.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_ic_autopilot.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_icon_arrived_station.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_icon_arrived_station.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_icon_arrived_station.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_icon_arrived_station.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_icon_arriving_station.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_icon_arriving_station.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_icon_arriving_station.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_icon_arriving_station.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_icon_not_arrive_station.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_icon_not_arrive_station.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_icon_not_arrive_station.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_icon_not_arrive_station.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_light_green_nor.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_light_green_nor.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_light_green_nor.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_light_green_nor.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_light_red_nor.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_light_red_nor.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_light_red_nor.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_light_red_nor.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_lightyellow_nor.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_lightyellow_nor.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_lightyellow_nor.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_lightyellow_nor.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_line_panel_bg.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_line_panel_bg.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_line_panel_bg.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_line_panel_bg.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_line_panel_bg_1.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_line_panel_bg_1.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_line_panel_bg_1.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_line_panel_bg_1.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_line_task_arrow.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_line_task_arrow.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_line_task_arrow.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_line_task_arrow.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_loading_autopilot_icon.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_loading_autopilot_icon.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_loading_autopilot_icon.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_loading_autopilot_icon.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_no_line_icon.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_no_line_icon.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_no_line_icon.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_no_line_icon.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_och_dot_line.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_och_dot_line.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_och_dot_line.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_och_dot_line.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_operation_status_bg.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_operation_status_bg.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_operation_status_bg.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_operation_status_bg.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_operation_status_select_bg.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_operation_status_select_bg.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_operation_status_select_bg.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_operation_status_select_bg.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_right_autopilot_icon.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_right_autopilot_icon.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_right_autopilot_icon.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_right_autopilot_icon.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_selected_btn.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_selected_btn.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_selected_btn.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_selected_btn.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_setting_btn_bg.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_setting_btn_bg.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_setting_btn_bg.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_setting_btn_bg.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_switch_line_close.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_switch_line_close.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_switch_line_close.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_switch_line_close.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_switch_map_long.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_switch_map_long.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_switch_map_long.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_switch_map_long.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_switch_map_medium.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_switch_map_medium.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_switch_map_medium.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_switch_map_medium.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_unselect_btn.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_unselect_btn.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_unselect_btn.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_unselect_btn.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_wrong_autopilot_icon.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_wrong_autopilot_icon.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/bus_wrong_autopilot_icon.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/bus_wrong_autopilot_icon.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/end_maker_icon.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/end_maker_icon.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/end_maker_icon.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/end_maker_icon.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_ai_collect.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_ai_collect.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_ai_collect.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_ai_collect.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_ai_normal.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_ai_normal.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_ai_normal.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_ai_normal.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_ai_select.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_ai_select.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_ai_select.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_ai_select.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_arrow_blue_bus.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_arrow_blue_bus.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_arrow_blue_bus.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_arrow_blue_bus.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_arrow_green_bus.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_arrow_green_bus.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_arrow_green_bus.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_arrow_green_bus.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_arrow_grey_bus.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_arrow_grey_bus.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_arrow_grey_bus.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_arrow_grey_bus.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_bad_case.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_bad_case.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_bad_case.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_bad_case.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_bad_case_normal.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_bad_case_normal.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_bad_case_normal.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_bad_case_normal.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_bad_case_select.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_bad_case_select.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_bad_case_select.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_bad_case_select.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_no_bus_line.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_no_bus_line.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_no_bus_line.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_no_bus_line.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_point_blue_bus.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_point_blue_bus.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_point_blue_bus.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_point_blue_bus.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_point_green_bus.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_point_green_bus.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_point_green_bus.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_point_green_bus.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_point_grey_bus.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_point_grey_bus.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_point_grey_bus.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_point_grey_bus.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_station_start_end.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_station_start_end.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/icon_station_start_end.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/icon_station_start_end.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/no_order_data.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/no_order_data.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/no_order_data.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/no_order_data.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/pingxingjiashi.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/pingxingjiashi.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/pingxingjiashi.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/pingxingjiashi.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/press_start_status.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/press_start_status.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/press_start_status.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/press_start_status.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/shuttle_write_off_bg.png b/OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/shuttle_write_off_bg.png similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable-nodpi/shuttle_write_off_bg.png rename to OCH/shuttle/driver_weaknet/src/main/res/drawable-nodpi/shuttle_write_off_bg.png diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/ai_collect_selector.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/ai_collect_selector.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/ai_collect_selector.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/ai_collect_selector.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bad_case_selector.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bad_case_selector.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bad_case_selector.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bad_case_selector.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bg_bus_traffic_light_background.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bg_bus_traffic_light_background.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bg_bus_traffic_light_background.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bg_bus_traffic_light_background.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_checkbox_selector.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_checkbox_selector.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_checkbox_selector.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_checkbox_selector.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_line_dividing_line1_selector.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_line_dividing_line1_selector.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_line_dividing_line1_selector.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_line_dividing_line1_selector.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_line_dividing_line2_selector.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_line_dividing_line2_selector.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_line_dividing_line2_selector.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_line_dividing_line2_selector.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_operation_status_bg_selector.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_operation_status_bg_selector.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_operation_status_bg_selector.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_operation_status_bg_selector.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_panel_anchor_bkg.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_panel_anchor_bkg.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_panel_anchor_bkg.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_panel_anchor_bkg.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_panel_bkg.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_panel_bkg.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_panel_bkg.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_panel_bkg.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_station_green_dash_line.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_station_green_dash_line.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_station_green_dash_line.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_station_green_dash_line.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_station_v_green_dash.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_station_v_green_dash.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_station_v_green_dash.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_station_v_green_dash.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_switch_line_btn.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_switch_line_btn.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_switch_line_btn.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_switch_line_btn.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_switch_line_btn_commit.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_switch_line_btn_commit.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_switch_line_btn_commit.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_switch_line_btn_commit.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_switch_map_bg.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_switch_map_bg.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_switch_map_bg.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_switch_map_bg.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_task_time_bg.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_task_time_bg.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_task_time_bg.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_task_time_bg.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml rename to OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/layout/shuttle_base_fragment.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml similarity index 98% rename from OCH/shuttle_weaknet/driver/src/main/res/layout/shuttle_base_fragment.xml rename to OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml index 159ebca0d0..3736800c39 100644 --- a/OCH/shuttle_weaknet/driver/src/main/res/layout/shuttle_base_fragment.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:layout_marginTop="@dimen/dp_72"> - @@ -218,7 +218,7 @@ - - - - - - diff --git a/OCH/shuttle_weaknet/driver/src/main/res/layout/shuttle_switch_line_list_item.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line_list_item.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/layout/shuttle_switch_line_list_item.xml rename to OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line_list_item.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/layout/shuttle_switch_line_list_task_item.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line_list_task_item.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/layout/shuttle_switch_line_list_task_item.xml rename to OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line_list_task_item.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/layout/shuttle_test_bar_view.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_test_bar_view.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/layout/shuttle_test_bar_view.xml rename to OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_test_bar_view.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/layout/shuttle_wirte_off_view.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_wirte_off_view.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/layout/shuttle_wirte_off_view.xml rename to OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_wirte_off_view.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/raw/bus_away_passengers.json b/OCH/shuttle/driver_weaknet/src/main/res/raw/bus_away_passengers.json similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/raw/bus_away_passengers.json rename to OCH/shuttle/driver_weaknet/src/main/res/raw/bus_away_passengers.json diff --git a/OCH/shuttle/driver_weaknet/src/main/res/raw/bus_di.mp3 b/OCH/shuttle/driver_weaknet/src/main/res/raw/bus_di.mp3 new file mode 100644 index 0000000000..15b31ed247 Binary files /dev/null and b/OCH/shuttle/driver_weaknet/src/main/res/raw/bus_di.mp3 differ diff --git a/OCH/shuttle_weaknet/driver/src/main/res/raw/bus_order_1.json b/OCH/shuttle/driver_weaknet/src/main/res/raw/bus_order_1.json similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/raw/bus_order_1.json rename to OCH/shuttle/driver_weaknet/src/main/res/raw/bus_order_1.json diff --git a/OCH/shuttle_weaknet/driver/src/main/res/raw/bus_station_list1.json b/OCH/shuttle/driver_weaknet/src/main/res/raw/bus_station_list1.json similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/raw/bus_station_list1.json rename to OCH/shuttle/driver_weaknet/src/main/res/raw/bus_station_list1.json diff --git a/OCH/shuttle_weaknet/driver/src/main/res/raw/bus_station_list2.json b/OCH/shuttle/driver_weaknet/src/main/res/raw/bus_station_list2.json similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/raw/bus_station_list2.json rename to OCH/shuttle/driver_weaknet/src/main/res/raw/bus_station_list2.json diff --git a/OCH/shuttle/driver_weaknet/src/main/res/raw/end_marker.nt3d b/OCH/shuttle/driver_weaknet/src/main/res/raw/end_marker.nt3d new file mode 100644 index 0000000000..be6057c547 Binary files /dev/null and b/OCH/shuttle/driver_weaknet/src/main/res/raw/end_marker.nt3d differ diff --git a/OCH/shuttle/driver_weaknet/src/main/res/raw/star_marker.nt3d b/OCH/shuttle/driver_weaknet/src/main/res/raw/star_marker.nt3d new file mode 100644 index 0000000000..c6e546fc31 Binary files /dev/null and b/OCH/shuttle/driver_weaknet/src/main/res/raw/star_marker.nt3d differ diff --git a/OCH/shuttle_weaknet/driver/src/main/res/values/attrs.xml b/OCH/shuttle/driver_weaknet/src/main/res/values/attrs.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/values/attrs.xml rename to OCH/shuttle/driver_weaknet/src/main/res/values/attrs.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/values/colors.xml b/OCH/shuttle/driver_weaknet/src/main/res/values/colors.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/values/colors.xml rename to OCH/shuttle/driver_weaknet/src/main/res/values/colors.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/values/dimens.xml b/OCH/shuttle/driver_weaknet/src/main/res/values/dimens.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/values/dimens.xml rename to OCH/shuttle/driver_weaknet/src/main/res/values/dimens.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/values/strings.xml b/OCH/shuttle/driver_weaknet/src/main/res/values/strings.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/values/strings.xml rename to OCH/shuttle/driver_weaknet/src/main/res/values/strings.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/values/style.xml b/OCH/shuttle/driver_weaknet/src/main/res/values/style.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/values/style.xml rename to OCH/shuttle/driver_weaknet/src/main/res/values/style.xml diff --git a/OCH/shuttle_weaknet/driver/src/main/res/xml/bus_switch_line_list_item_scene.xml b/OCH/shuttle/driver_weaknet/src/main/res/xml/bus_switch_line_list_item_scene.xml similarity index 100% rename from OCH/shuttle_weaknet/driver/src/main/res/xml/bus_switch_line_list_item_scene.xml rename to OCH/shuttle/driver_weaknet/src/main/res/xml/bus_switch_line_list_item_scene.xml diff --git a/OCH/shuttle/passenger/build.gradle b/OCH/shuttle/passenger/build.gradle index cddf5c35e9..2a19ed8914 100644 --- a/OCH/shuttle/passenger/build.gradle +++ b/OCH/shuttle/passenger/build.gradle @@ -71,8 +71,6 @@ dependencies { implementation rootProject.ext.dependencies.rxandroid implementation rootProject.ext.dependencies.androidxconstraintlayout implementation rootProject.ext.dependencies.amapnavi3dmap - // 串口链接 - implementation rootProject.ext.dependencies.serialport implementation project(":OCH:common:common") compileOnly project(":libraries:mogo-map") implementation project(':core:mogo-core-res') diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerChainLogManager.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerChainLogManager.kt deleted file mode 100644 index abc506434e..0000000000 --- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerChainLogManager.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.mogo.och.shuttle.passenger.manager.scnner - -import android.text.TextUtils -import com.mogo.commons.debug.DebugConfig -import com.mogo.commons.storage.SharedPrefsMgr -import com.mogo.commons.utils.MogoAnalyticUtils -import com.mogo.eagle.core.data.app.AppConfigInfo -import com.mogo.eagle.core.data.deva.chain.ChainConstant -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.eagle.core.utilcode.util.DateTimeUtils -import com.zhjt.service.chain.ChainLog - -object ScannerChainLogManager { - - private val TAG = ScannerChainLogManager::class.java.simpleName - - const val EVENT_KEY_INFE_WITH_CHANGE = "event_key_och_scanner_info" - - /** - * @param Info 事件 - * @param changeInfo 数据 - */ - @ChainLog( - linkChainLog = ChainConstant.CHAIN_TYPE_OCH, - linkCode = ChainConstant.CHAIN_SOURCE_OCH, - nodeAliasCode = ChainConstant.CHAIN_CODE_OCH_COMMON_DISTANCE, - paramIndexes = [0,1] - ) - @JvmStatic - fun writeChainLog(info: String, changeInfo: String,upload:Boolean = true,eventID:String=EVENT_KEY_INFE_WITH_CHANGE) { - try { - d(SceneConstant.M_OCHCOMMON + TAG, info+changeInfo) - if(upload) { - val plateNum = AppConfigInfo.plateNumber - val params = HashMap() - params["sn"] = SharedPrefsMgr.getInstance().sn - params["env"] = DebugConfig.getNetMode() - params["plate_number"] = if (TextUtils.isEmpty(plateNum)) "" else plateNum - params["time"] = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd_HH_mm_ss) - params[info] = changeInfo - MogoAnalyticUtils.track(eventID, params) - } - }catch (e:Exception){ - e.printStackTrace() - } - } - -} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerManager.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerManager.kt deleted file mode 100644 index a5e19b5757..0000000000 --- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerManager.kt +++ /dev/null @@ -1,257 +0,0 @@ -package com.mogo.och.shuttle.passenger.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.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.socket.lan.LanSocketManager -import com.mogo.support.serialport.client.SerialPortManager -import com.mogo.support.serialport.client.SerialPortManager.SERVICE_STATE -import com.mogo.support.serialport.client.listener.OnDeviceVerificationListener -import com.mogo.support.serialport.client.listener.OnSerialPortListener -import com.mogo.support.serialport.common.verification.UnpackStatus -import com.mogo.support.serialport.common.verification.data.VerificationActiveData -import java.util.concurrent.ConcurrentHashMap -import kotlin.properties.Delegates - - -object ScannerManager : OnSerialPortListener, OnDeviceVerificationListener(), IReceivedMsgListener { - - private val TAG = "ScannerManager" - - private var serialPortManager = SerialPortManager() - - private val stateChanageListeners: ConcurrentHashMap = - 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) { - dispatchMsg(newV) - } - if (stateChanageListeners.size > 0) { - stateChanageListeners.forEach { - it.value.stateChange(newV, openStatus) - } - } - } catch (e: Exception) { - CallerLogger.e(SceneConstant.M_OCHCOMMON + TAG, "扫码枪bind错误") - } - } - } - - private var openStatus: OpenStatus by Delegates.observable(OpenStatus.Unopen) { _, oldV, newV -> - if (oldV != newV) { - try { - if (stateChanageListeners.size > 0) { - stateChanageListeners.forEach { - it.value.stateChange(bindStatus, newV) - } - } - } catch (e: Exception) { - CallerLogger.e(SceneConstant.M_OCHCOMMON + TAG, "扫码枪open错误") - } - } - } - - init { - //监听司机端消息 - CallerTelematicListenerManager.addListener(TAG, this) - } - - fun addStateChangeListener(tag: String, listener: StateChangeListener) { - if (stateChanageListeners.containsKey(tag)) { - return - } - 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?) { - 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, "解包失败") - } - } - } - - private fun parseParams(payload: String?) { - val parse = Uri.parse("${OchCommonConst.getShuttleUrl()}?${payload}") - val queryParameterNames = parse.queryParameterNames - val mutableMapOf = mutableMapOf() - queryParameterNames.forEach { - val queryParameter = parse.getQueryParameter(it) - if(it!=null&&queryParameter!=null){ - mutableMapOf[it] = queryParameter - } - } - if(mutableMapOf.isNotEmpty()){ - if (stateChanageListeners.size > 0) { - stateChanageListeners.forEach { - it.value.parseData(mutableMapOf,payload) - } - } - }else{ - sendMessage2DriverWriteOffInfo("扫码参数数据为空:${payload}") - } - - } - - /** - * @param isConnectScanner 是否打开设备 - */ - private fun sendMessage2Driver(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) - } - } - - /** - * 打开设备后数据异常 - */ - private fun sendMessage2DriverWriteOffInfo(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,"扫码枪打开状态") - }else{ - if(bindStatus==BindStatus.BIND_SUCCEED&& openStatus==OpenStatus.Unopen){ - sendMessage2Driver(false,"绑定成功、打开失败") - }else{ - dispatchMsg(bindStatus) - } - } - } - - private fun dispatchMsg(newV: BindStatus) { - when (newV) { - BindStatus.BIND_FAILURE_UNINSTALLED -> { - // 服务绑定失败：未安装串口服务端APP - sendMessage2Driver(false,"服务绑定失败：未安装串口服务端APP") - } - BindStatus.BIND_FAILURE_NO_PERMISSION_NOT_FOUND -> { - // 服务绑定失败：没有绑定权限或找不到服务（如果是此状态，基本上安装后就可以找到，主要就是权限问题） - sendMessage2Driver(false,"服务绑定失败：没有绑定权限或找不到服务") - } - BindStatus.EXCEPTION -> { - // 扫码枪open错误 - sendMessage2Driver(false,"扫码枪打开错误") - } - BindStatus.NOTHING -> {} - else -> {} - } - } - - -} - -enum class BindStatus { - BIND_SUCCEED, BIND_FAILURE_UNINSTALLED ,BIND_FAILURE_NO_PERMISSION_NOT_FOUND,EXCEPTION,NOTHING -} - -enum class OpenStatus { - Open, Unopen -} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerStateView.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerStateView.kt deleted file mode 100644 index f7b335c3a2..0000000000 --- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerStateView.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.mogo.och.shuttle.passenger.manager.scnner - -import android.content.Context -import android.util.AttributeSet -import android.view.View -import androidx.appcompat.widget.AppCompatImageView -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.och.common.module.R - -class ScannerStateView @JvmOverloads constructor( - context: Context, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0 -) : AppCompatImageView(context, attrs, defStyleAttr), StateChangeListener { - private val TAG = "ScannerStateView" - - init { - setImageResource(R.drawable.driver_connect_statis) - ScannerManager.addStateChangeListener(TAG,this) - } - - override fun stateChange(newBindValue: BindStatus, newOpentValue: OpenStatus) { - CallerLogger.d(SceneConstant.M_BUS_P + TAG, "newBindValue = $newBindValue newOpentValue = $newOpentValue") - when (newOpentValue) { - OpenStatus.Open -> { - //成功打开 - visibility = View.GONE - } - OpenStatus.Unopen -> { - // 打开失败 - setImageResource(R.drawable.driver_connect_statis) - } - } - } - - -} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/StateChangeListener.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/StateChangeListener.kt deleted file mode 100644 index 12698fa45e..0000000000 --- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/StateChangeListener.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.mogo.och.shuttle.passenger.manager.scnner - -interface StateChangeListener { - fun stateChange(newBindValue:BindStatus,newOpentValue:OpenStatus){} - fun parseData(params: MutableMap, payload: String?){} -} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt index e6fa3753ef..5f82e1c20c 100644 --- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt +++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt @@ -4,14 +4,14 @@ import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger 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.RegexUtils import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffMsg import com.mogo.och.common.module.manager.socket.lan.LanSocketManager import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.shuttle.passenger.bean.request.PassengerWriteOffRequest import com.mogo.och.shuttle.passenger.bean.response.PassengerWriteOffResponse -import com.mogo.och.shuttle.passenger.manager.scnner.ScannerChainLogManager -import com.mogo.och.shuttle.passenger.manager.scnner.ScannerManager -import com.mogo.och.shuttle.passenger.manager.scnner.StateChangeListener +import com.mogo.och.common.module.manager.scnner.ScannerManager +import com.mogo.och.common.module.manager.scnner.StateChangeListener import com.mogo.och.shuttle.passenger.network.PassengerServiceManager object TicketModel : StateChangeListener { @@ -19,7 +19,6 @@ object TicketModel : StateChangeListener { private const val TAG = "TicketModel" init { - ScannerManager.bindService() ScannerManager.addStateChangeListener(TAG, this) } @@ -30,15 +29,22 @@ object TicketModel : StateChangeListener { override fun parseData(params: MutableMap, payload: String?) { val orderNo = params["orderNo"] val uid = params["uid"] + val phone = params["phone"] if(orderNo is String && uid is String){ - writeOffTicket(orderNo,uid) + var phoneNum = "" + if(phone is String){ + if (RegexUtils.isMobileExact(phone)) { + phoneNum = phone + } + } + writeOffTicket(orderNo,uid,phoneNum) }else{ // 通知司机屏二维码错误 - sendMessage2Driver("参数错误:${payload}") + sendMessage2Driver("参数错误:${payload}","") } } - private fun writeOffTicket(orderNo: String, uid: String) { + private fun writeOffTicket(orderNo: String, uid: String, phoneNum: String) { val passengerWriteOffRequest = PassengerWriteOffRequest(orderNo, uid) PassengerServiceManager.writeOffTicket(AbsMogoApplication.getApp(), passengerWriteOffRequest, @@ -53,25 +59,26 @@ object TicketModel : StateChangeListener { override fun onFail(code: Int, msg: String?) { CallerLogger.d(M_BUS_P + TAG, "核销失败 ${code}-----${msg}") + when (code) { - 6002 -> {sendMessage2Driver("同一订单核销间隔时间需大于2分钟")} - 1009 -> {sendMessage2Driver("车票所选乘车日期非今日")} - 1005 -> {sendMessage2Driver("车辆未登录、或没有任务")} - 1006 -> {sendMessage2Driver("车票路线信息与当前车辆执行任务的路线信息不符合")} - 1008 -> {sendMessage2Driver("车票剩余可用次数为0")} - 6001 -> {sendMessage2Driver("二维码已过期")} - 1012 -> {sendMessage2Driver("当前用户下单路线非当前的车辆所属公司")} + 6002 -> {sendMessage2Driver("同一订单核销间隔时间需大于2分钟",phoneNum)} + 1009 -> {sendMessage2Driver("车票所选乘车日期非今日",phoneNum)} + 1005 -> {sendMessage2Driver("车辆未登录、或没有任务",phoneNum)} + 1006 -> {sendMessage2Driver("车票路线信息与当前车辆执行任务的路线信息不符合",phoneNum)} + 1008 -> {sendMessage2Driver("车票剩余可用次数为0",phoneNum)} + 6001 -> {sendMessage2Driver("二维码已过期",phoneNum)} + 1012 -> {sendMessage2Driver("当前用户下单路线非当前的车辆所属公司",phoneNum)} else -> { when (msg) { - "6002" -> {sendMessage2Driver("同一订单核销间隔时间需大于2分钟")} - "1009" -> {sendMessage2Driver("车票所选乘车日期非今日")} - "1005" -> {sendMessage2Driver("车辆未登录、或没有任务")} - "1006" -> {sendMessage2Driver("车票路线信息与当前车辆执行任务的路线信息不符合")} - "1008" -> {sendMessage2Driver("车票剩余可用次数为0")} - "6001" -> {sendMessage2Driver("二维码已过期")} - "1012" -> {sendMessage2Driver("当前用户下单路线非当前的车辆所属公司")} + "6002" -> {sendMessage2Driver("同一订单核销间隔时间需大于2分钟",phoneNum)} + "1009" -> {sendMessage2Driver("车票所选乘车日期非今日",phoneNum)} + "1005" -> {sendMessage2Driver("车辆未登录、或没有任务",phoneNum)} + "1006" -> {sendMessage2Driver("车票路线信息与当前车辆执行任务的路线信息不符合",phoneNum)} + "1008" -> {sendMessage2Driver("车票剩余可用次数为0",phoneNum)} + "6001" -> {sendMessage2Driver("二维码已过期",phoneNum)} + "1012" -> {sendMessage2Driver("当前用户下单路线非当前的车辆所属公司",phoneNum)} else -> { - sendMessage2Driver(msg?:"") + sendMessage2Driver(msg?:"",phoneNum) } } } @@ -79,24 +86,21 @@ object TicketModel : StateChangeListener { } override fun onError(message: String) { - ScannerChainLogManager.writeChainLog(TAG +"onError","/och-vehicle/api/scanner/device/writeOff接口请求错误orderNo：${orderNo}__uid：${uid}__reaseon:${message}") - sendMessage2Driver("网络错误") + sendMessage2Driver("网络错误",phoneNum) } } ) } - private fun sendMessage2Driver(message:String){ - val msg = WriteOffMsg(false, "", 0, "", message,"") + private fun sendMessage2Driver(message:String,phone:String){ + val msg = WriteOffMsg(false, phone, 0, "", "验票失败，${message}","") CallerLogger.d(M_BUS_P + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg)) LanSocketManager.sendMsgToServer(msg) - ScannerChainLogManager.writeChainLog(TAG +"sendMessage2Driver","核验失败：message:${message}") } private fun sendMessage2DriverSuccess(message: PassengerWriteOffResponse.Result,orderNo: String){ val msg = WriteOffMsg(true, message.phone, message.ticketSize, message.ticketName, "",orderNo) CallerLogger.d(M_BUS_P + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg)) LanSocketManager.sendMsgToServer(msg) - ScannerChainLogManager.writeChainLog(TAG +"sendMessage2DriverSuccess","核验成功：message:${message}") } diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/network/PassengerServiceManager.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/network/PassengerServiceManager.kt index de87800908..45ac65db37 100644 --- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/network/PassengerServiceManager.kt +++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/network/PassengerServiceManager.kt @@ -1,13 +1,14 @@ package com.mogo.och.shuttle.passenger.network import android.content.Context -import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.getServerToken import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.common.module.biz.lansocket.LoginLanPassengerSocket import com.mogo.och.common.module.constant.OchCommonConst +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.network.OchCommonSubscribeImpl import com.mogo.och.common.module.network.interceptor.transformTry @@ -16,7 +17,6 @@ import com.mogo.och.shuttle.passenger.bean.request.PassengerWriteOffRequest import com.mogo.och.shuttle.passenger.bean.response.PassengerOperationStatusResponse import com.mogo.och.shuttle.passenger.bean.response.PassengerRoutesResponse import com.mogo.och.shuttle.passenger.bean.response.PassengerWriteOffResponse -import com.mogo.och.shuttle.passenger.manager.scnner.ScannerChainLogManager /** * Created on 2022/3/31 @@ -31,19 +31,6 @@ object PassengerServiceManager { MoGoRetrofitFactory.getInstance(OchCommonConst.getShuttleUrl()).create( ServiceApi::class.java) - /** - * 获取Bus司机端的sn - * @return - */ - val driverAppSn: String - get() { - val serverToken = getServerToken() - if (serverToken != driverSnCache && serverToken.isNotEmpty()) { - driverSnCache = serverToken - } - return driverSnCache - } - /** * 查询绑定行驶的小巴车路线 * @param context @@ -57,7 +44,7 @@ object PassengerServiceManager { MoGoAiCloudClientConfig.getInstance().serviceAppId, SharedPrefsMgr.getInstance().token, PassengerQueryLineRequest( - driverAppSn + LoginLanPassengerSocket.driverSn ) ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate",false)) @@ -76,7 +63,7 @@ object PassengerServiceManager { mShuttleBusPassengerServiceApi.queryDriverOperationStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, SharedPrefsMgr.getInstance().token, - driverAppSn + LoginLanPassengerSocket.driverSn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverOperationStatus")) @@ -94,10 +81,10 @@ object PassengerServiceManager { ticketInfo: PassengerWriteOffRequest, callback: OchCommonServiceCallback?, ) { - ticketInfo.sn = driverAppSn - if(StringUtils.isEmpty(driverAppSn)){ + ticketInfo.sn = LoginLanPassengerSocket.driverSn + if(StringUtils.isEmpty(LoginLanPassengerSocket.driverSn)){ ToastUtils.showShort("请链接司机屏${ticketInfo.uid}") - ScannerChainLogManager.writeChainLog(TAG +"onError","无司机屏sn请处理") + OchChainLogManager.writeChainLogScanner(TAG +"onError","无司机屏sn请处理") return } mShuttleBusPassengerServiceApi.writeOffTicket( diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java index 5e5eac6004..20d41fbdc6 100644 --- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java @@ -24,6 +24,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant; import com.mogo.eagle.core.utilcode.util.GsonUtils; import com.mogo.eagle.core.utilcode.util.StringUtils; import com.mogo.eagle.core.utilcode.util.ToastUtils; +import com.mogo.och.common.module.biz.lansocket.LoginLanPassengerSocket; import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener; import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager; import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager; @@ -199,18 +200,18 @@ public class BusPassengerModel { @Override public void onError() { CallerLogger.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = onError =" - + ", sn = " +PassengerServiceManager.INSTANCE.getDriverAppSn()); + + ", sn = " + LoginLanPassengerSocket.INSTANCE.getDriverSn()); queryDriverByLocalDriver(); } @Override public void onFail(int code, String msg) { CallerLogger.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = %s", msg - + ", sn = " +PassengerServiceManager.INSTANCE.getDriverAppSn()); + + ", sn = " +LoginLanPassengerSocket.INSTANCE.getDriverSn()); if (code == 1003){ queryDriverOperationDelay(); } - if (PassengerServiceManager.INSTANCE.getDriverAppSn().isEmpty()){ + if (LoginLanPassengerSocket.INSTANCE.getDriverSn().isEmpty()){ //此处拦截是为了防止过程中乘客屏和司机端断连，拿不到司机端sn, 造成请求失败去刷新了界面 return; } diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2DrivingModel.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2DrivingModel.kt index 5e0e60eadc..9f427ac5d5 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2DrivingModel.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2DrivingModel.kt @@ -27,6 +27,7 @@ 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.och.common.module.biz.lansocket.LoginLanPassengerSocket import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.pushAppOperationalMsgBox import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener @@ -373,7 +374,7 @@ class PM2DrivingModel private constructor() { CallerLogger.d( SceneConstant.Companion.M_BUS_P + TAG, "queryDriverSiteByCoordinate = onError =" - + ", sn = " + PassengerServiceManager.driverAppSn + + ", sn = " + LoginLanPassengerSocket.driverSn ) queryDriverByLocalDriver() } @@ -384,7 +385,7 @@ class PM2DrivingModel private constructor() { queryDriverOperationDelay() cleanStation("queryDriverSiteByCoordinate 1003") } - if (PassengerServiceManager.driverAppSn.isEmpty()){ + if (LoginLanPassengerSocket.driverSn.isEmpty()){ return } if (code == 1003) { diff --git a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml index d666101542..b76e888eac 100644 --- a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml +++ b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml @@ -31,7 +31,7 @@ android:layout_gravity="center" android:layout_marginStart="@dimen/dp_32" /> - , payload: String?) { val orderNo = params["orderNo"] val uid = params["uid"] + val phone = params["phone"] if(orderNo is String && uid is String){ - writeOffTicket(orderNo,uid) + var phoneNum = "" + if(phone is String){ + if (RegexUtils.isMobileExact(phone)) { + phoneNum = phone + } + } + writeOffTicket(orderNo,uid,phoneNum) }else{ // 通知司机屏二维码错误 - sendMessage2Driver("参数错误:${payload}") + sendMessage2Driver("参数错误:${payload}","") } } - private fun writeOffTicket(orderNo: String, uid: String) { + private fun writeOffTicket(orderNo: String, uid: String, phoneNum: String) { val passengerWriteOffRequest = PassengerWriteOffRequest(orderNo, uid) PassengerServiceManager.writeOffTicket(AbsMogoApplication.getApp(), passengerWriteOffRequest, @@ -53,25 +59,26 @@ object TicketModel : StateChangeListener { override fun onFail(code: Int, msg: String?) { CallerLogger.d(M_BUS_P + TAG, "核销失败 ${code}-----${msg}") + when (code) { - 6002 -> {sendMessage2Driver("同一订单核销间隔时间需大于2分钟")} - 1009 -> {sendMessage2Driver("车票所选乘车日期非今日")} - 1005 -> {sendMessage2Driver("车辆未登录、或没有任务")} - 1006 -> {sendMessage2Driver("车票路线信息与当前车辆执行任务的路线信息不符合")} - 1008 -> {sendMessage2Driver("车票剩余可用次数为0")} - 6001 -> {sendMessage2Driver("二维码已过期")} - 1012 -> {sendMessage2Driver("当前用户下单路线非当前的车辆所属公司")} + 6002 -> {sendMessage2Driver("同一订单核销间隔时间需大于2分钟",phoneNum)} + 1009 -> {sendMessage2Driver("车票所选乘车日期非今日",phoneNum)} + 1005 -> {sendMessage2Driver("车辆未登录、或没有任务",phoneNum)} + 1006 -> {sendMessage2Driver("车票路线信息与当前车辆执行任务的路线信息不符合",phoneNum)} + 1008 -> {sendMessage2Driver("车票剩余可用次数为0",phoneNum)} + 6001 -> {sendMessage2Driver("二维码已过期",phoneNum)} + 1012 -> {sendMessage2Driver("当前用户下单路线非当前的车辆所属公司",phoneNum)} else -> { when (msg) { - "6002" -> {sendMessage2Driver("同一订单核销间隔时间需大于2分钟")} - "1009" -> {sendMessage2Driver("车票所选乘车日期非今日")} - "1005" -> {sendMessage2Driver("车辆未登录、或没有任务")} - "1006" -> {sendMessage2Driver("车票路线信息与当前车辆执行任务的路线信息不符合")} - "1008" -> {sendMessage2Driver("车票剩余可用次数为0")} - "6001" -> {sendMessage2Driver("二维码已过期")} - "1012" -> {sendMessage2Driver("当前用户下单路线非当前的车辆所属公司")} + "6002" -> {sendMessage2Driver("同一订单核销间隔时间需大于2分钟",phoneNum)} + "1009" -> {sendMessage2Driver("车票所选乘车日期非今日",phoneNum)} + "1005" -> {sendMessage2Driver("车辆未登录、或没有任务",phoneNum)} + "1006" -> {sendMessage2Driver("车票路线信息与当前车辆执行任务的路线信息不符合",phoneNum)} + "1008" -> {sendMessage2Driver("车票剩余可用次数为0",phoneNum)} + "6001" -> {sendMessage2Driver("二维码已过期",phoneNum)} + "1012" -> {sendMessage2Driver("当前用户下单路线非当前的车辆所属公司",phoneNum)} else -> { - sendMessage2Driver(msg?:"") + sendMessage2Driver(msg?:"",phoneNum) } } } @@ -79,24 +86,21 @@ object TicketModel : StateChangeListener { } override fun onError(message: String) { - ScannerChainLogManager.writeChainLog(TAG +"onError","/och-vehicle/api/scanner/device/writeOff接口请求错误orderNo：${orderNo}__uid：${uid}__reaseon:${message}") - sendMessage2Driver("网络错误") + sendMessage2Driver("网络错误",phoneNum) } } ) } - private fun sendMessage2Driver(message:String){ - val msg = WriteOffMsg(false, "", 0, "", message,"") + private fun sendMessage2Driver(message:String,phone:String){ + val msg = WriteOffMsg(false, phone, 0, "", "验票失败，${message}","") CallerLogger.d(M_BUS_P + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg)) LanSocketManager.sendMsgToServer(msg) - ScannerChainLogManager.writeChainLog(TAG +"sendMessage2Driver","核验失败：message:${message}") } private fun sendMessage2DriverSuccess(message: PassengerWriteOffResponse.Result,orderNo: String){ val msg = WriteOffMsg(true, message.phone, message.ticketSize, message.ticketName, "",orderNo) CallerLogger.d(M_BUS_P + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg)) LanSocketManager.sendMsgToServer(msg) - ScannerChainLogManager.writeChainLog(TAG +"sendMessage2DriverSuccess","核验成功：message:${message}") } diff --git a/OCH/shuttle_weaknet/passenger/src/main/java/com/mogo/och/shuttle/passenger/network/PassengerServiceManager.kt b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/network/PassengerServiceManager.kt similarity index 81% rename from OCH/shuttle_weaknet/passenger/src/main/java/com/mogo/och/shuttle/passenger/network/PassengerServiceManager.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/network/PassengerServiceManager.kt index de87800908..45ac65db37 100644 --- a/OCH/shuttle_weaknet/passenger/src/main/java/com/mogo/och/shuttle/passenger/network/PassengerServiceManager.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/network/PassengerServiceManager.kt @@ -1,13 +1,14 @@ package com.mogo.och.shuttle.passenger.network import android.content.Context -import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.getServerToken import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.common.module.biz.lansocket.LoginLanPassengerSocket import com.mogo.och.common.module.constant.OchCommonConst +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.network.OchCommonSubscribeImpl import com.mogo.och.common.module.network.interceptor.transformTry @@ -16,7 +17,6 @@ import com.mogo.och.shuttle.passenger.bean.request.PassengerWriteOffRequest import com.mogo.och.shuttle.passenger.bean.response.PassengerOperationStatusResponse import com.mogo.och.shuttle.passenger.bean.response.PassengerRoutesResponse import com.mogo.och.shuttle.passenger.bean.response.PassengerWriteOffResponse -import com.mogo.och.shuttle.passenger.manager.scnner.ScannerChainLogManager /** * Created on 2022/3/31 @@ -31,19 +31,6 @@ object PassengerServiceManager { MoGoRetrofitFactory.getInstance(OchCommonConst.getShuttleUrl()).create( ServiceApi::class.java) - /** - * 获取Bus司机端的sn - * @return - */ - val driverAppSn: String - get() { - val serverToken = getServerToken() - if (serverToken != driverSnCache && serverToken.isNotEmpty()) { - driverSnCache = serverToken - } - return driverSnCache - } - /** * 查询绑定行驶的小巴车路线 * @param context @@ -57,7 +44,7 @@ object PassengerServiceManager { MoGoAiCloudClientConfig.getInstance().serviceAppId, SharedPrefsMgr.getInstance().token, PassengerQueryLineRequest( - driverAppSn + LoginLanPassengerSocket.driverSn ) ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate",false)) @@ -76,7 +63,7 @@ object PassengerServiceManager { mShuttleBusPassengerServiceApi.queryDriverOperationStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, SharedPrefsMgr.getInstance().token, - driverAppSn + LoginLanPassengerSocket.driverSn ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverOperationStatus")) @@ -94,10 +81,10 @@ object PassengerServiceManager { ticketInfo: PassengerWriteOffRequest, callback: OchCommonServiceCallback?, ) { - ticketInfo.sn = driverAppSn - if(StringUtils.isEmpty(driverAppSn)){ + ticketInfo.sn = LoginLanPassengerSocket.driverSn + if(StringUtils.isEmpty(LoginLanPassengerSocket.driverSn)){ ToastUtils.showShort("请链接司机屏${ticketInfo.uid}") - ScannerChainLogManager.writeChainLog(TAG +"onError","无司机屏sn请处理") + OchChainLogManager.writeChainLogScanner(TAG +"onError","无司机屏sn请处理") return } mShuttleBusPassengerServiceApi.writeOffTicket( diff --git a/OCH/shuttle_weaknet/passenger/src/main/java/com/mogo/och/shuttle/passenger/network/ServiceApi.java b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/network/ServiceApi.java similarity index 100% rename from OCH/shuttle_weaknet/passenger/src/main/java/com/mogo/och/shuttle/passenger/network/ServiceApi.java rename to OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/network/ServiceApi.java diff --git a/OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassegerDriverStatusCallback.java b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassegerDriverStatusCallback.java similarity index 100% rename from OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassegerDriverStatusCallback.java rename to OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassegerDriverStatusCallback.java diff --git a/OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerADASStatusCallback.java b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerADASStatusCallback.java similarity index 100% rename from OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerADASStatusCallback.java rename to OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerADASStatusCallback.java diff --git a/OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerAutopilotPlanningCallback.java b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerAutopilotPlanningCallback.java similarity index 100% rename from OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerAutopilotPlanningCallback.java rename to OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerAutopilotPlanningCallback.java diff --git a/OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerControllerStatusCallback.java b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerControllerStatusCallback.java similarity index 100% rename from OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerControllerStatusCallback.java rename to OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerControllerStatusCallback.java diff --git a/OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerRouteLineInfoCallback.java b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerRouteLineInfoCallback.java similarity index 100% rename from OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerRouteLineInfoCallback.java rename to OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerRouteLineInfoCallback.java diff --git a/OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java similarity index 98% rename from OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java rename to OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java index 5e5eac6004..20d41fbdc6 100644 --- a/OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java +++ b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java @@ -24,6 +24,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant; import com.mogo.eagle.core.utilcode.util.GsonUtils; import com.mogo.eagle.core.utilcode.util.StringUtils; import com.mogo.eagle.core.utilcode.util.ToastUtils; +import com.mogo.och.common.module.biz.lansocket.LoginLanPassengerSocket; import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener; import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager; import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager; @@ -199,18 +200,18 @@ public class BusPassengerModel { @Override public void onError() { CallerLogger.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = onError =" - + ", sn = " +PassengerServiceManager.INSTANCE.getDriverAppSn()); + + ", sn = " + LoginLanPassengerSocket.INSTANCE.getDriverSn()); queryDriverByLocalDriver(); } @Override public void onFail(int code, String msg) { CallerLogger.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = %s", msg - + ", sn = " +PassengerServiceManager.INSTANCE.getDriverAppSn()); + + ", sn = " +LoginLanPassengerSocket.INSTANCE.getDriverSn()); if (code == 1003){ queryDriverOperationDelay(); } - if (PassengerServiceManager.INSTANCE.getDriverAppSn().isEmpty()){ + if (LoginLanPassengerSocket.INSTANCE.getDriverSn().isEmpty()){ //此处拦截是为了防止过程中乘客屏和司机端断连，拿不到司机端sn, 造成请求失败去刷新了界面 return; } diff --git a/OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerModelLoopManager.java b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerModelLoopManager.java similarity index 100% rename from OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerModelLoopManager.java rename to OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerModelLoopManager.java diff --git a/OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/presenter/BaseBusPassengerPresenter.java similarity index 100% rename from OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/presenter/BaseBusPassengerPresenter.java rename to OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/presenter/BaseBusPassengerPresenter.java diff --git a/OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPBlueToothView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPBlueToothView.kt similarity index 96% rename from OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPBlueToothView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPBlueToothView.kt index 985057174c..a2be41157d 100644 --- a/OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPBlueToothView.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPBlueToothView.kt @@ -20,7 +20,7 @@ class BusPBlueToothView @JvmOverloads constructor( ) : BlueToothView(context, attrs, defStyleAttr),IMoGoDevaToolsListener { init { - LayoutInflater.from(context).inflate(R.layout.shuttle_p_jl_view_blue_tooth, this, true) + LayoutInflater.from(context).inflate(R.layout.shuttle_p_weak_jl_view_blue_tooth, this, true) } override fun mofangStatus(status: Boolean) { diff --git a/OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPStatusBarView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPStatusBarView.kt similarity index 98% rename from OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPStatusBarView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPStatusBarView.kt index cd2c21f70a..3bc03c2171 100644 --- a/OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPStatusBarView.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPStatusBarView.kt @@ -31,7 +31,7 @@ class BusPStatusBarView @JvmOverloads constructor( } init { - LayoutInflater.from(context).inflate(R.layout.shuttle_p_jl_view_status_bar, this, true) + LayoutInflater.from(context).inflate(R.layout.shuttle_p_weak_jl_view_status_bar, this, true) setBackgroundResource(R.drawable.shuttle_p_jl_bg_status_bar) isClickable = true isFocusable = true diff --git a/OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerBaseFragment.java b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerBaseFragment.java similarity index 97% rename from OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerBaseFragment.java rename to OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerBaseFragment.java index a15e0da496..63804746f9 100644 --- a/OCH/shuttle_weaknet/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerBaseFragment.java +++ b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerBaseFragment.java @@ -28,7 +28,7 @@ public abstract class BusPassengerBaseFragment - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/shuttle_weaknet/driver/src/main/res/raw/bus_di.mp3 b/OCH/shuttle_weaknet/driver/src/main/res/raw/bus_di.mp3 deleted file mode 100644 index 5f313f8970..0000000000 Binary files a/OCH/shuttle_weaknet/driver/src/main/res/raw/bus_di.mp3 and /dev/null differ diff --git a/OCH/shuttle_weaknet/driver/src/main/res/raw/end_marker.nt3d b/OCH/shuttle_weaknet/driver/src/main/res/raw/end_marker.nt3d deleted file mode 100644 index 4d4f356f0b..0000000000 Binary files a/OCH/shuttle_weaknet/driver/src/main/res/raw/end_marker.nt3d and /dev/null differ diff --git a/OCH/shuttle_weaknet/passenger/src/main/assets/m2_map_style.data b/OCH/shuttle_weaknet/passenger/src/main/assets/m2_map_style.data deleted file mode 100755 index 77da1f0284..0000000000 Binary files a/OCH/shuttle_weaknet/passenger/src/main/assets/m2_map_style.data and /dev/null differ diff --git a/OCH/shuttle_weaknet/passenger/src/main/assets/m2_map_style_extra.data b/OCH/shuttle_weaknet/passenger/src/main/assets/m2_map_style_extra.data deleted file mode 100755 index 6b25c39519..0000000000 Binary files a/OCH/shuttle_weaknet/passenger/src/main/assets/m2_map_style_extra.data and /dev/null differ diff --git a/OCH/shuttle_weaknet/passenger/src/main/assets/map_style.data b/OCH/shuttle_weaknet/passenger/src/main/assets/map_style.data deleted file mode 100644 index 085e06a2db..0000000000 Binary files a/OCH/shuttle_weaknet/passenger/src/main/assets/map_style.data and /dev/null differ diff --git a/OCH/shuttle_weaknet/passenger/src/main/assets/map_style_extra.data b/OCH/shuttle_weaknet/passenger/src/main/assets/map_style_extra.data deleted file mode 100644 index 892eda73f9..0000000000 Binary files a/OCH/shuttle_weaknet/passenger/src/main/assets/map_style_extra.data and /dev/null differ diff --git a/OCH/shuttle_weaknet/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerChainLogManager.kt b/OCH/shuttle_weaknet/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerChainLogManager.kt deleted file mode 100644 index abc506434e..0000000000 --- a/OCH/shuttle_weaknet/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerChainLogManager.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.mogo.och.shuttle.passenger.manager.scnner - -import android.text.TextUtils -import com.mogo.commons.debug.DebugConfig -import com.mogo.commons.storage.SharedPrefsMgr -import com.mogo.commons.utils.MogoAnalyticUtils -import com.mogo.eagle.core.data.app.AppConfigInfo -import com.mogo.eagle.core.data.deva.chain.ChainConstant -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.eagle.core.utilcode.util.DateTimeUtils -import com.zhjt.service.chain.ChainLog - -object ScannerChainLogManager { - - private val TAG = ScannerChainLogManager::class.java.simpleName - - const val EVENT_KEY_INFE_WITH_CHANGE = "event_key_och_scanner_info" - - /** - * @param Info 事件 - * @param changeInfo 数据 - */ - @ChainLog( - linkChainLog = ChainConstant.CHAIN_TYPE_OCH, - linkCode = ChainConstant.CHAIN_SOURCE_OCH, - nodeAliasCode = ChainConstant.CHAIN_CODE_OCH_COMMON_DISTANCE, - paramIndexes = [0,1] - ) - @JvmStatic - fun writeChainLog(info: String, changeInfo: String,upload:Boolean = true,eventID:String=EVENT_KEY_INFE_WITH_CHANGE) { - try { - d(SceneConstant.M_OCHCOMMON + TAG, info+changeInfo) - if(upload) { - val plateNum = AppConfigInfo.plateNumber - val params = HashMap() - params["sn"] = SharedPrefsMgr.getInstance().sn - params["env"] = DebugConfig.getNetMode() - params["plate_number"] = if (TextUtils.isEmpty(plateNum)) "" else plateNum - params["time"] = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd_HH_mm_ss) - params[info] = changeInfo - MogoAnalyticUtils.track(eventID, params) - } - }catch (e:Exception){ - e.printStackTrace() - } - } - -} \ No newline at end of file diff --git a/OCH/shuttle_weaknet/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/StateChangeListener.kt b/OCH/shuttle_weaknet/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/StateChangeListener.kt deleted file mode 100644 index 12698fa45e..0000000000 --- a/OCH/shuttle_weaknet/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/StateChangeListener.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.mogo.och.shuttle.passenger.manager.scnner - -interface StateChangeListener { - fun stateChange(newBindValue:BindStatus,newOpentValue:OpenStatus){} - fun parseData(params: MutableMap, payload: String?){} -} \ No newline at end of file diff --git a/OCH/shuttle_weaknet/passenger/src/main/res/m2/raw/star_marker.nt3d b/OCH/shuttle_weaknet/passenger/src/main/res/m2/raw/star_marker.nt3d deleted file mode 100644 index 94440d9eb6..0000000000 Binary files a/OCH/shuttle_weaknet/passenger/src/main/res/m2/raw/star_marker.nt3d and /dev/null differ diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt index eb1fd52eb5..878c209b40 100644 --- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt @@ -13,7 +13,7 @@ import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.och.common.module.biz.provider.CommonService import com.mogo.och.common.module.constant.OchCommonConst -import com.mogo.och.common.module.utils.ProjectUtils +import com.mogo.commons.env.ProjectUtils import com.mogo.och.taxi.passenger.common.R import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_map_visual import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_map_visual_cro diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/ProjectUtils.kt b/foudations/mogo-commons/src/main/java/com/mogo/commons/env/ProjectUtils.kt similarity index 96% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/utils/ProjectUtils.kt rename to foudations/mogo-commons/src/main/java/com/mogo/commons/env/ProjectUtils.kt index a16951fb2f..73abf2e994 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/ProjectUtils.kt +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/env/ProjectUtils.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.utils +package com.mogo.commons.env import com.mogo.commons.debug.DebugConfig diff --git a/settings.gradle b/settings.gradle index 8f1dc21e73..6667fd94ea 100644 --- a/settings.gradle +++ b/settings.gradle @@ -81,11 +81,12 @@ include ':OCH:charter:passenger' include ':OCH:shuttle:driver' include ':OCH:shuttle:passenger' -include ':OCH:offline:driver' -include ':OCH:offline:passenger' -include ':OCH:shuttle_weaknet:driver' -include ':OCH:shuttle_weaknet:passenger' +include ':OCH:shuttle:driver_weaknet' +include ':OCH:shuttle:passenger_weaknet' + +include ':OCH:offline:driver' + include ':core:function-impl:mogo-core-function-patch'