From ce926a6412ad66e5d0c37c8865382c84b8098382 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 23 Sep 2024 16:51:21 +0800 Subject: [PATCH] =?UTF-8?q?[6.6.0]=20[fea]=20[=E8=BD=A6=E5=9E=8B=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=E3=80=81=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/biz/login/LoginProvider.kt | 5 +- .../common/module/wigets/CommonLoadingView.kt | 32 ++----------- .../response/CarExecutableTaskResponse.kt | 27 +++++++++-- .../weaknet/ui/switchline/SwitchLineView.kt | 15 +++--- .../mogo/eagle/core/data/enums/Carmodel.kt | 48 +++++++++++++++++++ .../core/function/api/och/IOchFunctionCall.kt | 4 +- .../call/och/CallerOchFunctionCallManager.kt | 8 ++-- 7 files changed, 96 insertions(+), 43 deletions(-) create mode 100644 core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/Carmodel.kt diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt index e31a1747e7..486fef22f7 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt @@ -5,6 +5,7 @@ import android.view.View import androidx.fragment.app.Fragment import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.data.enums.Carmodel import com.mogo.eagle.core.function.call.och.CallerOchFunctionCallManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -151,8 +152,8 @@ class LoginProvider : LoginService { this.loginInfo = loginInfo } - CallerOchFunctionCallManager.setCarModel(loginInfo.carModel) - CallerOchFunctionCallManager.setPlateNumber(loginInfo.plateNumber) + CallerOchFunctionCallManager.setOchCarModel(Carmodel.getCarModelFromServerName(loginInfo.carModel)) + CallerOchFunctionCallManager.setOchPlateNumber(loginInfo.plateNumber) } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/CommonLoadingView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/CommonLoadingView.kt index ce74bff7f9..42ec975dec 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/CommonLoadingView.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/CommonLoadingView.kt @@ -6,6 +6,7 @@ import android.util.AttributeSet import android.view.LayoutInflater import android.view.animation.LinearInterpolator import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.data.enums.Carmodel import com.mogo.commons.module.status.MogoStatusManager import com.mogo.eagle.core.data.config.HdMapBuildConfig import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager @@ -57,33 +58,10 @@ class CommonLoadingView @JvmOverloads constructor( HdMapBuildConfig.isMapLoaded = true // 设置地图样式 MogoMapListenerHandler.mogoMapListenerHandler.onMapModeChanged(EnumMapUI.MAP_STYLE_DAY_VR) - when (LoginStatusManager.getLoginInfo()?.carModel) { - "E70" -> { - HdMapBuildConfig.currentCarVrIconRes = com.mogo.eagle.core.data.R.raw.chuzuche - } - "H9" -> { - HdMapBuildConfig.currentCarVrIconRes = com.mogo.eagle.core.data.R.raw.hq_h9 - } - "B1" -> { - HdMapBuildConfig.currentCarVrIconRes = com.mogo.eagle.core.data.R.raw.xiaoba - } - "B2" -> { - HdMapBuildConfig.currentCarVrIconRes = com.mogo.eagle.core.data.R.raw.m2 - } - "M1" -> { - HdMapBuildConfig.currentCarVrIconRes = R.raw.m1 - } - "金旅牌XML6606JEVY0"-> { - HdMapBuildConfig.currentCarVrIconRes = com.mogo.eagle.core.data.R.raw.xiaoba - } - "NJL6450ICEV"-> { - HdMapBuildConfig.currentCarVrIconRes = com.mogo.eagle.core.data.R.raw.xiaoba - } - "BJ5122TXSEV-H1"-> { - HdMapBuildConfig.currentCarVrIconRes = R.raw.huanwei - } - else -> {} - } + + val carModel = Carmodel.getCarModelFromServerName(LoginStatusManager.getLoginInfo()?.carModel) + HdMapBuildConfig.currentCarVrIconRes = carModel.rawValue + CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(HdMapBuildConfig.currentCarVrIconRes) UiThreadHandler.postDelayed({ visibility = GONE },2_000,UiThreadHandler.MODE.QUEUE) } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/CarExecutableTaskResponse.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/CarExecutableTaskResponse.kt index 1c1185ca7d..5dc574c402 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/CarExecutableTaskResponse.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/CarExecutableTaskResponse.kt @@ -16,13 +16,31 @@ import com.mogo.och.weaknet.repository.db.repository.TaskDb data class CarExecutableTaskResponse(val data: List?) : BaseData(){ data class Result( - var line: LineDataBean?, + var line: LineDataBeanInsert?, var siteList: List?,//站点名称 val contrail: ContrailDataBean?,//站点名称 val taskList: List?,//站点名称 ) + data class LineDataBeanInsert( + + /** + * 线路id + */ + var lineId: Long? = null, + + /** + * 线路名称 + */ + var lineName: String? = null, + /** + * 终点站点名称 + */ + var endStationName: String? = null, + + ) + companion object{ /** * 保存 线路信息、自驾轨迹信息、站点信息和任务到数据库 @@ -35,9 +53,12 @@ data class CarExecutableTaskResponse(val data: List?) : BaseData(){ data.data?.forEach { dataInfo-> var lineId:Long?=null dataInfo.line?.let { lineInfo-> + val tempLineInfo = LineDataBean() lineId = lineInfo.lineId - lineInfo.endStationName = dataInfo.siteList?.last()?.name?:"" - lineList.add(lineInfo) + tempLineInfo.lineId = lineInfo.lineId + tempLineInfo.lineName = lineInfo.lineName + tempLineInfo.endStationName = dataInfo.siteList?.last()?.name?:"" + lineList.add(tempLineInfo) } dataInfo.contrail?.let { contrailInfo-> contrailInfo.lineId = lineId diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineView.kt index 9915cdc459..c4a4f6fc03 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineView.kt @@ -13,6 +13,7 @@ import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.view.SpacesItemDecoration import com.mogo.eagle.core.utilcode.util.UiThreadHandler +import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.utils.ResourcesUtils import com.mogo.och.common.module.wigets.WindowRelativeLayout import com.mogo.och.shuttle.weaknet.R @@ -129,12 +130,14 @@ class SwitchLineView: WindowRelativeLayout, SwtichLineModel.SwtichLineViewCallba * @param b */ private fun showNoData(b: Boolean) { - if (b) { - switch_line_rv.visibility = View.GONE - no_order_data_view.visibility = View.VISIBLE - } else { - switch_line_rv.visibility = View.VISIBLE - no_order_data_view.visibility = View.GONE + BizLoopManager.runInMainThread{ + if (b) { + switch_line_rv.visibility = View.GONE + no_order_data_view.visibility = View.VISIBLE + } else { + switch_line_rv.visibility = View.VISIBLE + no_order_data_view.visibility = View.GONE + } } } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/Carmodel.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/Carmodel.kt new file mode 100644 index 0000000000..2edba4960c --- /dev/null +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/Carmodel.kt @@ -0,0 +1,48 @@ +package com.mogo.eagle.core.data.enums + +import androidx.annotation.RawRes +import com.mogo.eagle.core.data.R + +enum class Carmodel(val serverName:String,@RawRes val rawValue: Int) { + T1("E70", R.raw.chuzuche), + T2("H9", R.raw.hq_h9), + B1("B1", R.raw.xiaoba), + B2("B2", R.raw.m2), + M1("M1", R.raw.m1), + C1("C1", R.raw.huanwei),; + + companion object{ + fun getCarModelFromServerName(serverName:String?): Carmodel { + return when (serverName) { + "E70" -> { + T1 + } + "H9" -> { + T2 + } + "B1" -> { + B1 + } + "金旅牌XML6606JEVY0" -> { + B1 + } + "NJL6450ICEV" -> { + B1 + } + "B2" -> { + B2 + } + "M1" -> { + M1 + } + "BJ5122TXSEV-H1" -> { + C1 + } + else -> { + B1 + } + } + } + } + +} \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCall.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCall.kt index 41b936908d..38566052e9 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCall.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCall.kt @@ -1,5 +1,7 @@ package com.mogo.eagle.core.function.api.och +import com.mogo.eagle.core.data.enums.Carmodel + /** * 定义给 Och 业务层调用的接口 */ @@ -11,7 +13,7 @@ interface IOchFunctionCall { fun registerToolKitDefaultItemClickListener(tag: String, listener: IToolKitItemClickListener) {} // 车型变化回调 - fun invokeCarMode(carModel: String?){} + fun invokeCarMode(carModel: Carmodel?){} // 车牌变化回调 fun invokePlateNumber(plateNumber: String?){} diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerOchFunctionCallManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerOchFunctionCallManager.kt index b83c509bad..8af48ba92c 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerOchFunctionCallManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerOchFunctionCallManager.kt @@ -1,5 +1,6 @@ package com.mogo.eagle.core.function.call.och +import com.mogo.eagle.core.data.enums.Carmodel import com.mogo.eagle.core.function.api.och.IOchCommonFunctionCall import com.mogo.eagle.core.function.api.och.IOchFunctionCall import com.mogo.eagle.core.function.api.och.IToolKitItemClickListener @@ -20,7 +21,7 @@ object CallerOchFunctionCallManager : CallerBase() { } // 车的类型 - private var carModel:String? by Delegates.observable(null) { _, oldValue, newValue -> + private var carModel: Carmodel? by Delegates.observable(null) { _, oldValue, newValue -> if (oldValue != newValue) { M_LISTENERS.forEach { it.value.invokeCarMode(carModel) @@ -52,12 +53,11 @@ object CallerOchFunctionCallManager : CallerBase() { } // 车型 E70 H9 B1 B2 M1 金旅牌XML6606JEVY0(小巴车) NJL6450ICEV(小巴) BJ5122TXSEV-H1(环卫车) - fun setCarModel(carModel: String?) { + fun setOchCarModel(carModel: Carmodel) { this.carModel = carModel - } // 车牌 - fun setPlateNumber(plateNumber:String?){ + fun setOchPlateNumber(plateNumber:String?){ this.plateNumber = plateNumber }