diff --git a/OCH/shuttle/passenger_weaknet/src/main/AndroidManifest.xml b/OCH/shuttle/passenger_weaknet/src/main/AndroidManifest.xml index 549784ca83..8f53c58eed 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/AndroidManifest.xml +++ b/OCH/shuttle/passenger_weaknet/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.mogo.och.shuttle.weaknet.passenger"> \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/ShuttlePassengerProvider.kt b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/ShuttlePassengerProvider.kt similarity index 85% rename from OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/ShuttlePassengerProvider.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/ShuttlePassengerProvider.kt index 7f150fff19..f991e74e61 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/ShuttlePassengerProvider.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/ShuttlePassengerProvider.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger +package com.mogo.och.shuttle.weaknet.passenger import android.content.Context import android.view.View @@ -12,11 +12,11 @@ import com.mogo.eagle.core.utilcode.util.MultiDisplayUtils import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.biz.provider.CommonServiceImpl import com.mogo.och.common.module.wigets.media.MediaPlayerActivity -import com.mogo.och.shuttle.passenger.model.TicketModel -import com.mogo.och.shuttle.passenger.ui.BusPStatusBarView -import com.mogo.och.shuttle.passenger.ui.BusPassengerRouteFragment -import com.mogo.och.shuttle.passenger.ui.PM2BaseFragment -import com.mogo.och.shuttle.passenger.ui.widget.M2StatusBarView +import com.mogo.och.shuttle.weaknet.passenger.model.TicketModel +import com.mogo.och.shuttle.weaknet.passenger.ui.BusPStatusBarView +import com.mogo.och.shuttle.weaknet.passenger.ui.BusPassengerRouteFragment +import com.mogo.och.shuttle.weaknet.passenger.ui.PM2BaseFragment +import com.mogo.och.shuttle.weaknet.passenger.ui.widget.M2StatusBarView /** * 网约车-Bus-乘客端 diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/request/PassengerQueryLineRequest.java b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/request/PassengerQueryLineRequest.java similarity index 79% rename from OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/request/PassengerQueryLineRequest.java rename to OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/request/PassengerQueryLineRequest.java index 48c312b288..e1a437c0d4 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/request/PassengerQueryLineRequest.java +++ b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/request/PassengerQueryLineRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.bean.request; +package com.mogo.och.shuttle.weaknet.passenger.bean.request; public /** diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/request/PassengerWriteOffRequest.java b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/request/PassengerWriteOffRequest.java similarity index 93% rename from OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/request/PassengerWriteOffRequest.java rename to OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/request/PassengerWriteOffRequest.java index 1ff5c160a6..5dbe768bb8 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/request/PassengerWriteOffRequest.java +++ b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/request/PassengerWriteOffRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.bean.request; +package com.mogo.och.shuttle.weaknet.passenger.bean.request; public /** diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/response/PassengerOperationStatusResponse.java b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/response/PassengerOperationStatusResponse.java similarity index 88% rename from OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/response/PassengerOperationStatusResponse.java rename to OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/response/PassengerOperationStatusResponse.java index b6781937bb..7bd3515d85 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/response/PassengerOperationStatusResponse.java +++ b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/response/PassengerOperationStatusResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.bean.response; +package com.mogo.och.shuttle.weaknet.passenger.bean.response; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/response/PassengerRoutesResponse.java b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/response/PassengerRoutesResponse.java similarity index 90% rename from OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/response/PassengerRoutesResponse.java rename to OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/response/PassengerRoutesResponse.java index 3b9fbe3ec1..8314b57226 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/response/PassengerRoutesResponse.java +++ b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/response/PassengerRoutesResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.bean.response; +package com.mogo.och.shuttle.weaknet.passenger.bean.response; import com.mogo.eagle.core.data.BaseData; import com.mogo.och.data.bean.BusRoutesResult; diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/response/PassengerWriteOffResponse.kt b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/response/PassengerWriteOffResponse.kt similarity index 81% rename from OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/response/PassengerWriteOffResponse.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/response/PassengerWriteOffResponse.kt index d46146c23c..6f0b74b093 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/bean/response/PassengerWriteOffResponse.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/bean/response/PassengerWriteOffResponse.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.bean.response +package com.mogo.och.shuttle.weaknet.passenger.bean.response import com.mogo.eagle.core.data.BaseData diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/constant/BusPassengerConst.kt b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/constant/BusPassengerConst.kt similarity index 94% rename from OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/constant/BusPassengerConst.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/constant/BusPassengerConst.kt index 82b5f1ef09..95a7bc1b98 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/constant/BusPassengerConst.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/constant/BusPassengerConst.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.constant +package com.mogo.och.shuttle.weaknet.passenger.constant /** * Created on 2021/12/6 diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/TicketModel.kt similarity index 56% rename from OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/TicketModel.kt index 5f82e1c20c..3b1e34943d 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/TicketModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.model +package com.mogo.och.shuttle.weaknet.passenger.model import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -8,11 +8,11 @@ import com.mogo.eagle.core.utilcode.util.RegexUtils import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffMsg import com.mogo.och.common.module.manager.socket.lan.LanSocketManager import com.mogo.och.common.module.network.OchCommonServiceCallback -import com.mogo.och.shuttle.passenger.bean.request.PassengerWriteOffRequest -import com.mogo.och.shuttle.passenger.bean.response.PassengerWriteOffResponse +import com.mogo.och.shuttle.weaknet.passenger.bean.request.PassengerWriteOffRequest +import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerWriteOffResponse import com.mogo.och.common.module.manager.scnner.ScannerManager import com.mogo.och.common.module.manager.scnner.StateChangeListener -import com.mogo.och.shuttle.passenger.network.PassengerServiceManager +import com.mogo.och.shuttle.weaknet.passenger.network.PassengerServiceManager object TicketModel : StateChangeListener { @@ -61,22 +61,50 @@ object TicketModel : StateChangeListener { CallerLogger.d(M_BUS_P + TAG, "核销失败 ${code}-----${msg}") when (code) { - 6002 -> {sendMessage2Driver("同一订单核销间隔时间需大于2分钟",phoneNum)} - 1009 -> {sendMessage2Driver("车票所选乘车日期非今日",phoneNum)} - 1005 -> {sendMessage2Driver("车辆未登录、或没有任务",phoneNum)} - 1006 -> {sendMessage2Driver("车票路线信息与当前车辆执行任务的路线信息不符合",phoneNum)} - 1008 -> {sendMessage2Driver("车票剩余可用次数为0",phoneNum)} - 6001 -> {sendMessage2Driver("二维码已过期",phoneNum)} - 1012 -> {sendMessage2Driver("当前用户下单路线非当前的车辆所属公司",phoneNum)} + 6002 -> { + sendMessage2Driver("同一订单核销间隔时间需大于2分钟",phoneNum) + } + 1009 -> { + sendMessage2Driver("车票所选乘车日期非今日",phoneNum) + } + 1005 -> { + sendMessage2Driver("车辆未登录、或没有任务",phoneNum) + } + 1006 -> { + sendMessage2Driver("车票路线信息与当前车辆执行任务的路线信息不符合",phoneNum) + } + 1008 -> { + sendMessage2Driver("车票剩余可用次数为0",phoneNum) + } + 6001 -> { + sendMessage2Driver("二维码已过期",phoneNum) + } + 1012 -> { + sendMessage2Driver("当前用户下单路线非当前的车辆所属公司",phoneNum) + } else -> { when (msg) { - "6002" -> {sendMessage2Driver("同一订单核销间隔时间需大于2分钟",phoneNum)} - "1009" -> {sendMessage2Driver("车票所选乘车日期非今日",phoneNum)} - "1005" -> {sendMessage2Driver("车辆未登录、或没有任务",phoneNum)} - "1006" -> {sendMessage2Driver("车票路线信息与当前车辆执行任务的路线信息不符合",phoneNum)} - "1008" -> {sendMessage2Driver("车票剩余可用次数为0",phoneNum)} - "6001" -> {sendMessage2Driver("二维码已过期",phoneNum)} - "1012" -> {sendMessage2Driver("当前用户下单路线非当前的车辆所属公司",phoneNum)} + "6002" -> { + sendMessage2Driver("同一订单核销间隔时间需大于2分钟",phoneNum) + } + "1009" -> { + sendMessage2Driver("车票所选乘车日期非今日",phoneNum) + } + "1005" -> { + sendMessage2Driver("车辆未登录、或没有任务",phoneNum) + } + "1006" -> { + sendMessage2Driver("车票路线信息与当前车辆执行任务的路线信息不符合",phoneNum) + } + "1008" -> { + sendMessage2Driver("车票剩余可用次数为0",phoneNum) + } + "6001" -> { + sendMessage2Driver("二维码已过期",phoneNum) + } + "1012" -> { + sendMessage2Driver("当前用户下单路线非当前的车辆所属公司",phoneNum) + } else -> { sendMessage2Driver(msg?:"",phoneNum) } @@ -97,7 +125,7 @@ object TicketModel : StateChangeListener { CallerLogger.d(M_BUS_P + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg)) LanSocketManager.sendMsgToServer(msg) } - private fun sendMessage2DriverSuccess(message: PassengerWriteOffResponse.Result,orderNo: String){ + private fun sendMessage2DriverSuccess(message: PassengerWriteOffResponse.Result, orderNo: String){ val msg = WriteOffMsg(true, message.phone, message.ticketSize, message.ticketName, "",orderNo) CallerLogger.d(M_BUS_P + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg)) LanSocketManager.sendMsgToServer(msg) diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/network/PassengerServiceManager.kt b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/network/PassengerServiceManager.kt similarity index 87% rename from OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/network/PassengerServiceManager.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/network/PassengerServiceManager.kt index 45ac65db37..a556695e69 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/network/PassengerServiceManager.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/network/PassengerServiceManager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.network +package com.mogo.och.shuttle.weaknet.passenger.network import android.content.Context import com.mogo.cloud.passport.MoGoAiCloudClientConfig @@ -12,11 +12,11 @@ import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.network.OchCommonSubscribeImpl import com.mogo.och.common.module.network.interceptor.transformTry -import com.mogo.och.shuttle.passenger.bean.request.PassengerQueryLineRequest -import com.mogo.och.shuttle.passenger.bean.request.PassengerWriteOffRequest -import com.mogo.och.shuttle.passenger.bean.response.PassengerOperationStatusResponse -import com.mogo.och.shuttle.passenger.bean.response.PassengerRoutesResponse -import com.mogo.och.shuttle.passenger.bean.response.PassengerWriteOffResponse +import com.mogo.och.shuttle.weaknet.passenger.bean.request.PassengerQueryLineRequest +import com.mogo.och.shuttle.weaknet.passenger.bean.request.PassengerWriteOffRequest +import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerOperationStatusResponse +import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerRoutesResponse +import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerWriteOffResponse /** * Created on 2022/3/31 diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/network/ServiceApi.java b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/network/ServiceApi.java similarity index 75% rename from OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/network/ServiceApi.java rename to OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/network/ServiceApi.java index 4394df464f..672bfb345d 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/passenger/network/ServiceApi.java +++ b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/network/ServiceApi.java @@ -1,10 +1,10 @@ -package com.mogo.och.shuttle.passenger.network; +package com.mogo.och.shuttle.weaknet.passenger.network; -import com.mogo.och.shuttle.passenger.bean.request.PassengerQueryLineRequest; -import com.mogo.och.shuttle.passenger.bean.request.PassengerWriteOffRequest; -import com.mogo.och.shuttle.passenger.bean.response.PassengerOperationStatusResponse; -import com.mogo.och.shuttle.passenger.bean.response.PassengerRoutesResponse; -import com.mogo.och.shuttle.passenger.bean.response.PassengerWriteOffResponse; +import com.mogo.och.shuttle.weaknet.passenger.bean.request.PassengerQueryLineRequest; +import com.mogo.och.shuttle.weaknet.passenger.bean.request.PassengerWriteOffRequest; +import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerOperationStatusResponse; +import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerRoutesResponse; +import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerWriteOffResponse; import io.reactivex.Observable; import retrofit2.http.Body; diff --git a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/callback/IBusPassegerDriverStatusCallback.java similarity index 73% rename from OCH/shuttle/passenger_weaknet/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/weaknet/passenger/callback/IBusPassegerDriverStatusCallback.java index 73b44accf1..ec1a0ebc5f 100644 --- a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/callback/IBusPassegerDriverStatusCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.callback; +package com.mogo.och.shuttle.weaknet.passenger.callback; /** * @author: wangmingjun diff --git a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/callback/IBusPassengerADASStatusCallback.java similarity index 86% rename from OCH/shuttle/passenger_weaknet/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/weaknet/passenger/callback/IBusPassengerADASStatusCallback.java index b410513938..f68f593932 100644 --- a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/callback/IBusPassengerADASStatusCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.callback; +package com.mogo.och.shuttle.weaknet.passenger.callback; /** * Created on 2022/3/31 diff --git a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/callback/IBusPassengerAutopilotPlanningCallback.java similarity index 74% rename from OCH/shuttle/passenger_weaknet/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/weaknet/passenger/callback/IBusPassengerAutopilotPlanningCallback.java index 37d813d299..2bf2d2ea0e 100644 --- a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/callback/IBusPassengerAutopilotPlanningCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.callback; +package com.mogo.och.shuttle.weaknet.passenger.callback; /** * Created on 2022/3/31 diff --git a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/callback/IBusPassengerControllerStatusCallback.java similarity index 85% rename from OCH/shuttle/passenger_weaknet/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/weaknet/passenger/callback/IBusPassengerControllerStatusCallback.java index 29407a28dc..08c3b3344a 100644 --- a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/callback/IBusPassengerControllerStatusCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.callback; +package com.mogo.och.shuttle.weaknet.passenger.callback; import com.mogo.eagle.core.data.map.MogoLocation; diff --git a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/callback/IBusPassengerRouteLineInfoCallback.java similarity index 86% rename from OCH/shuttle/passenger_weaknet/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/weaknet/passenger/callback/IBusPassengerRouteLineInfoCallback.java index aeebb9dfd4..ebe945edfe 100644 --- a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/callback/IBusPassengerRouteLineInfoCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.callback; +package com.mogo.och.shuttle.weaknet.passenger.callback; import com.mogo.och.data.bean.BusStationBean; diff --git a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/model/BusPassengerModel.java similarity index 94% rename from OCH/shuttle/passenger_weaknet/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/weaknet/passenger/model/BusPassengerModel.java index 20d41fbdc6..d1ff6af4cc 100644 --- a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/model/BusPassengerModel.java @@ -1,8 +1,8 @@ -package com.mogo.och.shuttle.passenger.model; +package com.mogo.och.shuttle.weaknet.passenger.model; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P; -import static com.mogo.och.shuttle.passenger.constant.BusPassengerConst.QUERY_BUS_P_STATION_DELAY; -import static com.mogo.och.shuttle.passenger.constant.BusPassengerConst.STATION_STATUS_STOPPED; +import static com.mogo.och.shuttle.weaknet.passenger.constant.BusPassengerConst.QUERY_BUS_P_STATION_DELAY; +import static com.mogo.och.shuttle.weaknet.passenger.constant.BusPassengerConst.STATION_STATUS_STOPPED; import android.content.Context; import android.content.Intent; @@ -32,7 +32,7 @@ import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager; import com.mogo.och.common.module.manager.socket.lan.LanSocketManager; import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType; import com.mogo.och.common.module.voice.VoiceNotice; -import com.mogo.och.shuttle.passenger.R; +import com.mogo.och.shuttle.weaknet.passenger.R; import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg; import com.mogo.och.common.module.manager.socket.lan.bean.BaseDPMsg; import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType; @@ -48,21 +48,21 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.NetworkUtils; -import com.mogo.och.shuttle.passenger.bean.response.PassengerOperationStatusResponse; -import com.mogo.och.shuttle.passenger.bean.response.PassengerRoutesResponse; -import com.mogo.och.shuttle.passenger.callback.IBusPassegerDriverStatusCallback; -import com.mogo.och.shuttle.passenger.callback.IBusPassengerADASStatusCallback; -import com.mogo.och.shuttle.passenger.callback.IBusPassengerAutopilotPlanningCallback; -import com.mogo.och.shuttle.passenger.callback.IBusPassengerControllerStatusCallback; -import com.mogo.och.shuttle.passenger.callback.IBusPassengerRouteLineInfoCallback; -import com.mogo.och.shuttle.passenger.constant.BusPassengerConst; -import com.mogo.och.shuttle.passenger.network.BusPassengerModelLoopManager; +import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerOperationStatusResponse; +import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerRoutesResponse; +import com.mogo.och.shuttle.weaknet.passenger.callback.IBusPassegerDriverStatusCallback; +import com.mogo.och.shuttle.weaknet.passenger.callback.IBusPassengerADASStatusCallback; +import com.mogo.och.shuttle.weaknet.passenger.callback.IBusPassengerAutopilotPlanningCallback; +import com.mogo.och.shuttle.weaknet.passenger.callback.IBusPassengerControllerStatusCallback; +import com.mogo.och.shuttle.weaknet.passenger.callback.IBusPassengerRouteLineInfoCallback; +import com.mogo.och.shuttle.weaknet.passenger.constant.BusPassengerConst; +import com.mogo.och.shuttle.weaknet.passenger.network.BusPassengerModelLoopManager; import com.mogo.och.common.module.network.OchCommonServiceCallback; import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager; import com.mogo.och.data.bean.BusRoutesResult; import com.mogo.och.data.bean.BusStationBean; import com.mogo.och.data.bean.BusTransferData; -import com.mogo.och.shuttle.passenger.network.PassengerServiceManager; +import com.mogo.och.shuttle.weaknet.passenger.network.PassengerServiceManager; import java.util.ArrayList; import java.util.List; diff --git a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/network/BusPassengerModelLoopManager.java similarity index 84% rename from OCH/shuttle/passenger_weaknet/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/weaknet/passenger/network/BusPassengerModelLoopManager.java index 09f7837cf5..cc8e38599e 100644 --- a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/network/BusPassengerModelLoopManager.java @@ -1,19 +1,18 @@ -package com.mogo.och.shuttle.passenger.network; +package com.mogo.och.shuttle.weaknet.passenger.network; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.och.shuttle.passenger.model.BusPassengerModel; +import com.mogo.och.shuttle.weaknet.passenger.model.BusPassengerModel; import java.util.concurrent.TimeUnit; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P; -import static com.mogo.och.shuttle.passenger.constant.BusPassengerConst.LOOP_DELAY; -import static com.mogo.och.shuttle.passenger.constant.BusPassengerConst.LOOP_LINE_2S; +import static com.mogo.och.shuttle.weaknet.passenger.constant.BusPassengerConst.LOOP_DELAY; +import static com.mogo.och.shuttle.weaknet.passenger.constant.BusPassengerConst.LOOP_LINE_2S; /** * Created on 2021/11/22 diff --git a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/presenter/BaseBusPassengerPresenter.java similarity index 90% rename from OCH/shuttle/passenger_weaknet/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/weaknet/passenger/presenter/BaseBusPassengerPresenter.java index 2d5a815653..54decac54b 100644 --- a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/presenter/BaseBusPassengerPresenter.java @@ -1,9 +1,7 @@ -package com.mogo.och.shuttle.passenger.presenter; +package com.mogo.och.shuttle.weaknet.passenger.presenter; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P; -import android.os.Looper; - import androidx.annotation.NonNull; import androidx.lifecycle.LifecycleOwner; @@ -13,13 +11,13 @@ import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.och.shuttle.passenger.callback.IBusPassegerDriverStatusCallback; -import com.mogo.och.shuttle.passenger.callback.IBusPassengerADASStatusCallback; -import com.mogo.och.shuttle.passenger.callback.IBusPassengerAutopilotPlanningCallback; -import com.mogo.och.shuttle.passenger.callback.IBusPassengerControllerStatusCallback; -import com.mogo.och.shuttle.passenger.callback.IBusPassengerRouteLineInfoCallback; -import com.mogo.och.shuttle.passenger.model.BusPassengerModel; -import com.mogo.och.shuttle.passenger.ui.BusPassengerRouteFragment; +import com.mogo.och.shuttle.weaknet.passenger.callback.IBusPassegerDriverStatusCallback; +import com.mogo.och.shuttle.weaknet.passenger.callback.IBusPassengerADASStatusCallback; +import com.mogo.och.shuttle.weaknet.passenger.callback.IBusPassengerAutopilotPlanningCallback; +import com.mogo.och.shuttle.weaknet.passenger.callback.IBusPassengerControllerStatusCallback; +import com.mogo.och.shuttle.weaknet.passenger.callback.IBusPassengerRouteLineInfoCallback; +import com.mogo.och.shuttle.weaknet.passenger.model.BusPassengerModel; +import com.mogo.och.shuttle.weaknet.passenger.ui.BusPassengerRouteFragment; import com.mogo.och.data.bean.BusStationBean; import java.util.List; diff --git a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/ui/BusPBlueToothView.kt similarity index 84% rename from OCH/shuttle/passenger_weaknet/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/weaknet/passenger/ui/BusPBlueToothView.kt index a2be41157d..2606e8fcdc 100644 --- a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/ui/BusPBlueToothView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.ui +package com.mogo.och.shuttle.weaknet.passenger.ui import android.content.Context import android.util.AttributeSet @@ -6,8 +6,8 @@ import android.view.LayoutInflater import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.shuttle.passenger.R -import kotlinx.android.synthetic.main.shuttle_p_jl_view_blue_tooth.view.blueView +import com.mogo.och.shuttle.weaknet.passenger.R +import kotlinx.android.synthetic.main.shuttle_p_weak_jl_view_blue_tooth.view.blueView /** * 魔戒蓝牙控件 diff --git a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/ui/BusPStatusBarView.kt similarity index 92% rename from OCH/shuttle/passenger_weaknet/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/weaknet/passenger/ui/BusPStatusBarView.kt index 3bc03c2171..c0c3f1a182 100644 --- a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/ui/BusPStatusBarView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.ui +package com.mogo.och.shuttle.weaknet.passenger.ui import android.annotation.* import android.content.Context @@ -13,8 +13,8 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager import com.mogo.eagle.core.utilcode.kotlin.* import com.mogo.eagle.core.utilcode.util.AppUtils -import com.mogo.och.shuttle.passenger.R -import kotlinx.android.synthetic.main.shuttle_p_jl_view_status_bar.view.tv_shuttle_b1_p_version +import com.mogo.och.shuttle.weaknet.passenger.R +import kotlinx.android.synthetic.main.shuttle_p_weak_jl_view_status_bar.view.tv_shuttle_b1_p_version import kotlinx.coroutines.* import me.jessyan.autosize.utils.AutoSizeUtils diff --git a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/ui/BusPassengerBaseFragment.java similarity index 95% rename from OCH/shuttle/passenger_weaknet/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/weaknet/passenger/ui/BusPassengerBaseFragment.java index 63804746f9..cc14edb921 100644 --- a/OCH/shuttle/passenger_weaknet/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/weaknet/passenger/ui/BusPassengerBaseFragment.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.ui; +package com.mogo.och.shuttle.weaknet.passenger.ui; import android.os.Bundle; import android.view.LayoutInflater; @@ -12,7 +12,7 @@ import com.mogo.commons.mvp.MvpFragment; import com.mogo.commons.mvp.Presenter; import com.mogo.eagle.core.function.hmi.ui.widget.RomaPassengerView; import com.mogo.eagle.core.function.view.MapBizView; -import com.mogo.och.shuttle.passenger.R; +import com.mogo.och.shuttle.weaknet.passenger.R; /** * Created on 2022/3/31 diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java similarity index 97% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java rename to OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java index c63249ee0e..79e02324b4 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java +++ b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.ui; +package com.mogo.och.shuttle.weaknet.passenger.ui; import android.content.Context; import android.graphics.drawable.AnimationDrawable; @@ -24,10 +24,10 @@ import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView; import com.mogo.map.overlay.IMoGoOverlayManager; import com.mogo.och.common.module.utils.ResourcesUtils; -import com.mogo.och.shuttle.passenger.R; -import com.mogo.och.shuttle.passenger.ui.adapter.BusPassengerLineStationsAdapter; -import com.mogo.och.shuttle.passenger.presenter.BaseBusPassengerPresenter; -import com.mogo.och.shuttle.passenger.ui.layoutmanager.CenterLayoutManager; +import com.mogo.och.shuttle.weaknet.passenger.R; +import com.mogo.och.shuttle.weaknet.passenger.ui.adapter.BusPassengerLineStationsAdapter; +import com.mogo.och.shuttle.weaknet.passenger.presenter.BaseBusPassengerPresenter; +import com.mogo.och.shuttle.weaknet.passenger.ui.layoutmanager.CenterLayoutManager; import com.mogo.och.common.module.wigets.mapdirectionview.MapDirectionView; import com.mogo.och.common.module.utils.NumberFormatUtil; import com.mogo.och.common.module.wigets.MarqueeTextView; diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerTrafficLightView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerTrafficLightView.kt similarity index 93% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerTrafficLightView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerTrafficLightView.kt index 3b326c6f7c..e353b04f2e 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerTrafficLightView.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerTrafficLightView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.ui +package com.mogo.och.shuttle.weaknet.passenger.ui import android.content.Context import android.util.AttributeSet @@ -9,10 +9,10 @@ import com.mogo.eagle.core.data.enums.TrafficLightEnum import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.shuttle.passenger.R -import kotlinx.android.synthetic.main.shuttle_p_jl_traffic_light_view.view.bus_p_traffic_light_bg -import kotlinx.android.synthetic.main.shuttle_p_jl_traffic_light_view.view.bus_p_traffic_light_iv -import kotlinx.android.synthetic.main.shuttle_p_jl_traffic_light_view.view.bus_p_traffic_light_time_tv +import com.mogo.och.shuttle.weaknet.passenger.R +import kotlinx.android.synthetic.main.shuttle_p_weak_jl_traffic_light_view.view.bus_p_traffic_light_bg +import kotlinx.android.synthetic.main.shuttle_p_weak_jl_traffic_light_view.view.bus_p_traffic_light_iv +import kotlinx.android.synthetic.main.shuttle_p_weak_jl_traffic_light_view.view.bus_p_traffic_light_time_tv /** * bus乘客端：红绿灯view diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/adapter/BusPassengerLineStationsAdapter.java b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/adapter/BusPassengerLineStationsAdapter.java similarity index 94% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/adapter/BusPassengerLineStationsAdapter.java rename to OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/adapter/BusPassengerLineStationsAdapter.java index f50cb875c7..162ebe88b5 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/adapter/BusPassengerLineStationsAdapter.java +++ b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/adapter/BusPassengerLineStationsAdapter.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.ui.adapter; +package com.mogo.och.shuttle.weaknet.passenger.ui.adapter; import android.content.Context; import android.text.TextUtils; @@ -11,16 +11,16 @@ import android.widget.ImageView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.mogo.och.shuttle.passenger.R; +import com.mogo.och.shuttle.weaknet.passenger.R; import com.mogo.och.common.module.utils.BlinkAnimationUtil; import com.mogo.och.common.module.wigets.MarqueeTextView; import com.mogo.och.data.bean.BusStationBean; import java.util.List; -import static com.mogo.och.shuttle.passenger.constant.BusPassengerConst.STATION_STATUS_ARRIVING; -import static com.mogo.och.shuttle.passenger.constant.BusPassengerConst.STATION_STATUS_LEAVING; -import static com.mogo.och.shuttle.passenger.constant.BusPassengerConst.STATION_STATUS_STOPPED; +import static com.mogo.och.shuttle.weaknet.passenger.constant.BusPassengerConst.STATION_STATUS_ARRIVING; +import static com.mogo.och.shuttle.weaknet.passenger.constant.BusPassengerConst.STATION_STATUS_LEAVING; +import static com.mogo.och.shuttle.weaknet.passenger.constant.BusPassengerConst.STATION_STATUS_STOPPED; /** * @author: wangmingjun diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/layoutmanager/CenterLayoutManager.java b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/layoutmanager/CenterLayoutManager.java similarity index 95% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/layoutmanager/CenterLayoutManager.java rename to OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/layoutmanager/CenterLayoutManager.java index d7b712d6ea..c52568c37a 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/layoutmanager/CenterLayoutManager.java +++ b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/layoutmanager/CenterLayoutManager.java @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.ui.layoutmanager; +package com.mogo.och.shuttle.weaknet.passenger.ui.layoutmanager; import android.content.Context; import android.util.AttributeSet; diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/widget/BusPTurnLightView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPTurnLightView.kt similarity index 91% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/widget/BusPTurnLightView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPTurnLightView.kt index 9c844e39f2..c47d4499cb 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/widget/BusPTurnLightView.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPTurnLightView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.ui.widget +package com.mogo.och.shuttle.weaknet.passenger.ui.widget import android.animation.AnimatorSet import android.animation.ObjectAnimator @@ -13,13 +13,14 @@ import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTurnLightListener import com.mogo.eagle.core.function.call.v2x.CallerTurnLightListenerManager import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.shuttle.passenger.R +import com.mogo.och.shuttle.weaknet.passenger.R import com.mogo.och.common.module.manager.light.TurnLightManager -import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.left_nor_image -import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.left_select_image -import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.right_nor_image -import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.right_select_image -import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.turn_light_layout + +import kotlinx.android.synthetic.main.shuttle_p_weak_jl_turn_light_status.view.left_nor_image +import kotlinx.android.synthetic.main.shuttle_p_weak_jl_turn_light_status.view.left_select_image +import kotlinx.android.synthetic.main.shuttle_p_weak_jl_turn_light_status.view.right_nor_image +import kotlinx.android.synthetic.main.shuttle_p_weak_jl_turn_light_status.view.right_select_image +import kotlinx.android.synthetic.main.shuttle_p_weak_jl_turn_light_status.view.turn_light_layout /** * @author: wangmingjun diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/ADASCallback.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/callback/ADASCallback.kt similarity index 76% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/ADASCallback.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/callback/ADASCallback.kt index b5b490e29d..2e85bac134 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/ADASCallback.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/callback/ADASCallback.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.callback +package com.mogo.och.shuttle.weaknet.passenger.callback /** * @author: wangmingjun diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/AutoPilotStatusCallback.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/callback/AutoPilotStatusCallback.kt similarity index 81% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/AutoPilotStatusCallback.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/callback/AutoPilotStatusCallback.kt index 44b2075170..1f68457985 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/AutoPilotStatusCallback.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/callback/AutoPilotStatusCallback.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.callback +package com.mogo.och.shuttle.weaknet.passenger.callback /** * @author: wangmingjun diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/DrivingInfoCallback.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/callback/DrivingInfoCallback.kt similarity index 91% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/DrivingInfoCallback.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/callback/DrivingInfoCallback.kt index 88ab043327..e6630a0c39 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/DrivingInfoCallback.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/callback/DrivingInfoCallback.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.callback +package com.mogo.och.shuttle.weaknet.passenger.callback import com.mogo.och.data.bean.BusStationBean diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/constant/M2Const.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/constant/M2Const.kt similarity index 83% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/constant/M2Const.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/constant/M2Const.kt index fd9097ad64..f5e0910c57 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/constant/M2Const.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/constant/M2Const.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.constant +package com.mogo.och.shuttle.weaknet.passenger.constant /** * Created on 2021/12/6 diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ADASModel.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/model/PM2ADASModel.kt similarity index 90% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ADASModel.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/model/PM2ADASModel.kt index 3994625de7..088dd77d43 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ADASModel.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/model/PM2ADASModel.kt @@ -1,7 +1,7 @@ -package com.mogo.och.shuttle.passenger.model +package com.mogo.och.shuttle.weaknet.passenger.model import android.content.Context -import com.mogo.och.shuttle.passenger.callback.ADASCallback +import com.mogo.och.shuttle.weaknet.passenger.callback.ADASCallback import com.mogo.och.data.bean.BusStationBean /** diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2DrivingModel.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/model/PM2DrivingModel.kt similarity index 91% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2DrivingModel.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/model/PM2DrivingModel.kt index 9f427ac5d5..589ec6afc1 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2DrivingModel.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/model/PM2DrivingModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.model +package com.mogo.och.shuttle.weaknet.passenger.model import android.content.Context import android.media.AudioAttributes @@ -50,13 +50,13 @@ import com.mogo.och.common.module.voice.VoiceNotice.showNotice import com.mogo.och.data.bean.BusRoutesResult import com.mogo.och.data.bean.BusStationBean import com.mogo.och.data.bean.BusTransferData -import com.mogo.och.shuttle.passenger.R -import com.mogo.och.shuttle.passenger.bean.response.PassengerOperationStatusResponse -import com.mogo.och.shuttle.passenger.bean.response.PassengerRoutesResponse -import com.mogo.och.shuttle.passenger.callback.AutoPilotStatusCallback -import com.mogo.och.shuttle.passenger.callback.DrivingInfoCallback -import com.mogo.och.shuttle.passenger.constant.BusPassengerConst -import com.mogo.och.shuttle.passenger.network.PassengerServiceManager +import com.mogo.och.shuttle.weaknet.passenger.R +import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerOperationStatusResponse +import com.mogo.och.shuttle.weaknet.passenger.bean.response.PassengerRoutesResponse +import com.mogo.och.shuttle.weaknet.passenger.callback.AutoPilotStatusCallback +import com.mogo.och.shuttle.weaknet.passenger.callback.DrivingInfoCallback +import com.mogo.och.shuttle.weaknet.passenger.constant.BusPassengerConst +import com.mogo.och.shuttle.weaknet.passenger.network.PassengerServiceManager import io.reactivex.schedulers.Schedulers import kotlin.math.abs @@ -283,7 +283,7 @@ class PM2DrivingModel private constructor() { override fun onAutopilotStatusResponse(state: Int) { super.onAutopilotStatusResponse(state) - d(SceneConstant.M_BUS_P+TAG, "onAutopilotStatusResponse ===== $state") + d(SceneConstant.M_BUS_P+ TAG, "onAutopilotStatusResponse ===== $state") if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING != state){ //美化模式下且行程中 if (FunctionBuildConfig.isDemoMode && @@ -301,7 +301,8 @@ class PM2DrivingModel private constructor() { } private fun queryDriverOperationDelay() { - handler.sendEmptyMessageDelayed(MSG_QUERY_BUS_P_STATION, + handler.sendEmptyMessageDelayed( + MSG_QUERY_BUS_P_STATION, BusPassengerConst.QUERY_BUS_P_STATION_DELAY ) } @@ -315,7 +316,7 @@ class PM2DrivingModel private constructor() { if (data?.data == null) return if (data.data.driverStatus != operationStatus?.driverStatus || data.data.plateNumber != operationStatus?.plateNumber){ - d(SceneConstant.M_BUS_P+TAG, "queryDriverOperationStatus ===== 车牌或者登陆状态有变更") + d(SceneConstant.M_BUS_P+ TAG, "queryDriverOperationStatus ===== 车牌或者登陆状态有变更") mDrivingInfoCallback?.changeOperationStatus(data.data.driverStatus == 1) } operationStatus = data.data as PassengerOperationStatusResponse.Result @@ -348,13 +349,13 @@ class PM2DrivingModel private constructor() { if (routesResult != null) { routesResult = null updateLocalOrder() - d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate= result is null") + d(SceneConstant.M_BUS_P+ TAG, "queryDriverSiteByCoordinate= result is null") return } return } if (data.result != null && data.result.equals(routesResult)){ - d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate= not update") + d(SceneConstant.M_BUS_P+ TAG, "queryDriverSiteByCoordinate= not update") return } @@ -380,7 +381,7 @@ class PM2DrivingModel private constructor() { } override fun onFail(code: Int, msg: String?) { - d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate = %s", msg) + d(SceneConstant.M_BUS_P+ TAG, "queryDriverSiteByCoordinate = %s", msg) if (code == 1003){ queryDriverOperationDelay() cleanStation("queryDriverSiteByCoordinate 1003") @@ -415,11 +416,11 @@ class PM2DrivingModel private constructor() { } if (routesResult != null && routesResult!!.lineId != result.lineId){ - d(SceneConstant.M_BUS_P+TAG, "lineId change= clearCustomPolyline") + d(SceneConstant.M_BUS_P+ TAG, "lineId change= clearCustomPolyline") mDrivingInfoCallback?.clearCustomPolyline() } - d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate= update") + d(SceneConstant.M_BUS_P+ TAG, "queryDriverSiteByCoordinate= update") routesResult = result mDrivingInfoCallback?.updateLine(result.name, result.runningDur) @@ -434,8 +435,8 @@ class PM2DrivingModel private constructor() { if (station.drivingStatus == BusPassengerConst.STATION_STATUS_STOPPED && station.isLeaving && i + 1 < stations.size) { mDrivingInfoCallback?.updateStationsInfo(stations as MutableList, i + 1, false) - d(SceneConstant.M_BUS_P+TAG,"och-rotting--mNextStationIndex = $mNextStationIndex , i = $i") - d(SceneConstant.M_BUS_P+TAG,"och-rotting--start ") + d(SceneConstant.M_BUS_P+ TAG,"och-rotting--mNextStationIndex = $mNextStationIndex , i = $i") + d(SceneConstant.M_BUS_P+ TAG,"och-rotting--start ") isGoingToNextStation = true mNextStationIndex = i + 1 val startStation = mStations[i] @@ -443,8 +444,8 @@ class PM2DrivingModel private constructor() { setTrajectoryStation(startStation, endStation, result.lineId) return } else if (station.drivingStatus == BusPassengerConst.STATION_STATUS_STOPPED && !station.isLeaving) { - d(SceneConstant.M_BUS_P+TAG,"och-rotting--mNextStationIndex = $mNextStationIndex , i = $i") - d(SceneConstant.M_BUS_P+TAG,"och-rotting--arrived ") + d(SceneConstant.M_BUS_P+ TAG,"och-rotting--mNextStationIndex = $mNextStationIndex , i = $i") + d(SceneConstant.M_BUS_P+ TAG,"och-rotting--arrived ") if (i == stations.size - 1) { cleanStation("updatePassengerRouteInfo最后一个站点") } diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2ADASPresenter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt similarity index 71% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2ADASPresenter.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt index 4e28ee57de..19f68964c6 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2ADASPresenter.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt @@ -1,11 +1,11 @@ -package com.mogo.och.shuttle.passenger.presenter +package com.mogo.och.shuttle.weaknet.passenger.presenter import androidx.lifecycle.LifecycleOwner import com.mogo.commons.mvp.Presenter -import com.mogo.och.shuttle.passenger.callback.ADASCallback -import com.mogo.och.shuttle.passenger.constant.M2Const.Companion.M2_MAP_STATION_MAKER -import com.mogo.och.shuttle.passenger.model.PM2ADASModel -import com.mogo.och.shuttle.passenger.ui.PM2HPMapFragment +import com.mogo.och.shuttle.weaknet.passenger.callback.ADASCallback +import com.mogo.och.shuttle.weaknet.passenger.constant.M2Const.Companion.M2_MAP_STATION_MAKER +import com.mogo.och.shuttle.weaknet.passenger.model.PM2ADASModel +import com.mogo.och.shuttle.weaknet.passenger.ui.PM2HPMapFragment class PM2ADASPresenter(view: PM2HPMapFragment?) : Presenter(view), ADASCallback { diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2DrivingPresenter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2DrivingPresenter.kt similarity index 90% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2DrivingPresenter.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2DrivingPresenter.kt index 419f50e7ac..8d7ca7b8ec 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2DrivingPresenter.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2DrivingPresenter.kt @@ -1,14 +1,14 @@ -package com.mogo.och.shuttle.passenger.presenter +package com.mogo.och.shuttle.weaknet.passenger.presenter import androidx.lifecycle.LifecycleOwner import com.amap.api.maps.model.LatLng import com.mogo.commons.mvp.Presenter import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.shuttle.passenger.callback.AutoPilotStatusCallback -import com.mogo.och.shuttle.passenger.callback.DrivingInfoCallback -import com.mogo.och.shuttle.passenger.model.PM2ADASModel -import com.mogo.och.shuttle.passenger.model.PM2DrivingModel -import com.mogo.och.shuttle.passenger.ui.PM2DrivingInfoFragment +import com.mogo.och.shuttle.weaknet.passenger.callback.AutoPilotStatusCallback +import com.mogo.och.shuttle.weaknet.passenger.callback.DrivingInfoCallback +import com.mogo.och.shuttle.weaknet.passenger.model.PM2ADASModel +import com.mogo.och.shuttle.weaknet.passenger.model.PM2DrivingModel +import com.mogo.och.shuttle.weaknet.passenger.ui.PM2DrivingInfoFragment import com.mogo.och.data.bean.BusStationBean class PM2DrivingPresenter(view: PM2DrivingInfoFragment?) : diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2Presenter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2Presenter.kt similarity index 50% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2Presenter.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2Presenter.kt index 450109ef98..2759ccf2cd 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2Presenter.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2Presenter.kt @@ -1,7 +1,7 @@ -package com.mogo.och.shuttle.passenger.presenter +package com.mogo.och.shuttle.weaknet.passenger.presenter import com.mogo.commons.mvp.Presenter -import com.mogo.och.shuttle.passenger.ui.PM2BaseFragment +import com.mogo.och.shuttle.weaknet.passenger.ui.PM2BaseFragment class PM2Presenter(view: PM2BaseFragment?) : Presenter(view) \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2BaseFragment.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt similarity index 93% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2BaseFragment.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt index 38717d851a..fd4a77054a 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2BaseFragment.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt @@ -1,9 +1,9 @@ -package com.mogo.och.shuttle.passenger.ui +package com.mogo.och.shuttle.weaknet.passenger.ui import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.utilcode.util.AppUtils -import com.mogo.och.shuttle.passenger.R -import com.mogo.och.shuttle.passenger.presenter.PM2Presenter +import com.mogo.och.shuttle.weaknet.passenger.R +import com.mogo.och.shuttle.weaknet.passenger.presenter.PM2Presenter import com.mogo.och.common.module.wigets.media.MediaPlayerFragment import kotlinx.android.synthetic.main.shuttle_p_m2_fragment.tv_shuttle_b2_p_version diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2DrivingInfoFragment.kt similarity index 98% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2DrivingInfoFragment.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2DrivingInfoFragment.kt index 7f36c761cc..93d191b4a3 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2DrivingInfoFragment.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2DrivingInfoFragment.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.ui +package com.mogo.och.shuttle.weaknet.passenger.ui import android.graphics.BitmapFactory import android.graphics.drawable.AnimationDrawable @@ -11,8 +11,8 @@ import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView import com.mogo.eagle.core.function.view.SiteMarkerBean import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider -import com.mogo.och.shuttle.passenger.R -import com.mogo.och.shuttle.passenger.presenter.PM2DrivingPresenter +import com.mogo.och.shuttle.weaknet.passenger.R +import com.mogo.och.shuttle.weaknet.passenger.presenter.PM2DrivingPresenter import com.mogo.och.common.module.utils.DateTimeUtil.* import com.mogo.och.common.module.utils.NumberFormatUtil import com.mogo.och.data.bean.BusStationBean diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2HPMapFragment.kt similarity index 93% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2HPMapFragment.kt index f0efcd42e8..e07596ae1c 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2HPMapFragment.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.ui +package com.mogo.och.shuttle.weaknet.passenger.ui import android.os.Bundle import com.mogo.commons.mvp.MvpFragment @@ -7,9 +7,9 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.map.overlay.core.Level import com.mogo.map.overlay.point.Point import com.mogo.map.MapDataWrapper -import com.mogo.och.shuttle.passenger.R -import com.mogo.och.shuttle.passenger.constant.M2Const.Companion.TYPE_MARKER_M2_LINE -import com.mogo.och.shuttle.passenger.presenter.PM2ADASPresenter +import com.mogo.och.shuttle.weaknet.passenger.R +import com.mogo.och.shuttle.weaknet.passenger.constant.M2Const.Companion.TYPE_MARKER_M2_LINE +import com.mogo.och.shuttle.weaknet.passenger.presenter.PM2ADASPresenter import com.mogo.och.common.module.utils.OCHThreadPoolManager import kotlinx.android.synthetic.main.shuttle_p_m2_hpmap_fragment.mapBizView diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2BlueToothView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2BlueToothView.kt similarity index 91% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2BlueToothView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2BlueToothView.kt index 42d43b81db..ac7550b0d4 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2BlueToothView.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2BlueToothView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.ui.widget +package com.mogo.och.shuttle.weaknet.passenger.ui.widget import android.content.Context import android.util.AttributeSet @@ -6,7 +6,7 @@ import android.view.LayoutInflater import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.shuttle.passenger.R +import com.mogo.och.shuttle.weaknet.passenger.R import kotlinx.android.synthetic.main.shuttle_p_m2_view_blue_tooth.view.blueView /** diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2PTrafficLightView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2PTrafficLightView.kt similarity index 98% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2PTrafficLightView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2PTrafficLightView.kt index 17e0c7e594..99130d0026 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2PTrafficLightView.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2PTrafficLightView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.ui.widget +package com.mogo.och.shuttle.weaknet.passenger.ui.widget import android.content.Context import android.util.AttributeSet @@ -9,7 +9,7 @@ import com.mogo.eagle.core.data.enums.TrafficLightEnum import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.shuttle.passenger.R +import com.mogo.och.shuttle.weaknet.passenger.R import kotlinx.android.synthetic.main.shuttle_p_m2_traffic_light_view.view.m2_p_traffic_light_bg import kotlinx.android.synthetic.main.shuttle_p_m2_traffic_light_view.view.m2_p_traffic_light_iv import kotlinx.android.synthetic.main.shuttle_p_m2_traffic_light_view.view.m2_p_traffic_light_time_tv diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2StatusBarView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt similarity index 97% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2StatusBarView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt index aa7044667e..d758473488 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2StatusBarView.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.ui.widget +package com.mogo.och.shuttle.weaknet.passenger.ui.widget import android.annotation.* import android.content.Context @@ -18,7 +18,7 @@ import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager import com.mogo.eagle.core.utilcode.kotlin.* import com.mogo.eagle.core.utilcode.util.ClickUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.shuttle.passenger.R +import com.mogo.och.shuttle.weaknet.passenger.R import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.progress import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.tv_power_cos import kotlinx.coroutines.* diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2TurnLightView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2TurnLightView.kt similarity index 94% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2TurnLightView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2TurnLightView.kt index a565d41a0e..2ded804a8c 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2TurnLightView.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2TurnLightView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.passenger.ui.widget +package com.mogo.och.shuttle.weaknet.passenger.ui.widget import android.animation.AnimatorSet import android.animation.ObjectAnimator @@ -13,13 +13,14 @@ import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTurnLightListener import com.mogo.eagle.core.function.call.v2x.CallerTurnLightListenerManager import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.shuttle.passenger.R +import com.mogo.och.shuttle.weaknet.passenger.R import com.mogo.och.common.module.manager.light.TurnLightManager -import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.left_nor_image -import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.left_select_image -import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.right_nor_image -import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.right_select_image -import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.turn_light_layout + +import kotlinx.android.synthetic.main.shuttle_p_m2_turn_light_status.view.left_nor_image +import kotlinx.android.synthetic.main.shuttle_p_m2_turn_light_status.view.left_select_image +import kotlinx.android.synthetic.main.shuttle_p_m2_turn_light_status.view.right_nor_image +import kotlinx.android.synthetic.main.shuttle_p_m2_turn_light_status.view.right_select_image +import kotlinx.android.synthetic.main.shuttle_p_m2_turn_light_status.view.turn_light_layout /** * @author: wangmingjun