diff --git a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml index ece99da0cc..fbba636209 100644 --- a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml +++ b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml @@ -80,23 +80,6 @@ tools:ignore="SpeakableTextPresentCheck" tools:visibility="visible" /> - - - - - - - - - - - - - - - - - - - - - { - - override fun target(msgType: Int): Class = V2XRoadXData::class.java - - override fun onMsgReceived(msgType: Int, data: V2XRoadXData?) { - if (msgType != 70001) { - return - } - if (data == null) { - return - } - CallerCloudListenerManager.invokeSocketAck(V2XEvent.RoadEventX(data = data)) - } -} - -internal class V2XMessageListener401012: IMogoCloudSocketOnMessageListener { - - override fun target(msgType: Int): Class = V2XMarkerCardResult::class.java - - override fun onMsgReceived(msgType: Int, data: V2XMarkerCardResult?) { - if (msgType != 401012) { - return - } - if (data == null) { - return - } - CallerCloudListenerManager.invokeSocketAck(V2XEvent.Road(data = data)) - } -} - -internal class V2XMessageListener401018: IMogoCloudSocketOnMessageListener { - - override fun target(msgType: Int): Class = V2XWarningTarget::class.java - - override fun onMsgReceived(msgType: Int, data: V2XWarningTarget?) { - if (msgType != 401018) { - return - } - if (data == null) { - return - } - CallerCloudListenerManager.invokeSocketAck(V2XEvent.Warning(data = data)) - } -} - -internal class V2XMessageListener402000: IMogoCloudSocketOnMessageListener { - - override fun target(msgType: Int): Class = V2XOptimalRoute::class.java - - override fun onMsgReceived(msgType: Int, data: V2XOptimalRoute?) { - if (msgType != 402000) { - return - } - if (data == null) { - return - } - CallerCloudListenerManager.invokeSocketAck(V2XEvent.OptimalRoute(data = data)) - } -} - -internal class V2XMessageListener404000: IMogoCloudSocketOnMessageListener { - - override fun target(msgType: Int): Class = V2XAdvanceWarning::class.java - - override fun onMsgReceived(msgType: Int, data: V2XAdvanceWarning?) { - if (msgType != 404000) { - return - } - if (data == null) { - return - } - CallerCloudListenerManager.invokeSocketAck(V2XEvent.ForwardsWarning(data = data)) - } -} - -internal class V2XMessageListener503000: IMogoCloudSocketOnMessageListener { - - override fun target(msgType: Int): Class = Road.RW_PB::class.java - - override fun onMsgReceived(msgType: Int, data: Road.RW_PB?) { - if (msgType != 503000) { - return - } - if (data == null) { - return - } - CallerCloudListenerManager.invokeSocketAck(V2XEvent.RoadAI(data = data)) - } -} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/biz/DataCenterBizProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/biz/DataCenterBizProvider.kt new file mode 100644 index 0000000000..6abaf130ee --- /dev/null +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/biz/DataCenterBizProvider.kt @@ -0,0 +1,34 @@ +package com.mogo.eagle.core.function.datacenter.biz + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.mogo.eagle.core.data.constants.MogoServicePaths +import com.mogo.eagle.core.data.enums.Carmodel +import com.mogo.eagle.core.function.api.datacenter.IDataCenterBizProvider +import com.mogo.eagle.core.function.call.datacenter.CallerDataCenterBizListener + +@Route(path = MogoServicePaths.PATH_DATA_CENTER_BIZ_FUNCTION) +class DataCenterBizProvider:IDataCenterBizProvider { + + override val functionName: String + get() = "DataCenterBizProvider" + + + override fun init(context: Context?) { + + } + + override fun notifyCarMode(carModel: Carmodel) { + CallerDataCenterBizListener.invokeCarRes(carModel.resId) + } + + override fun notifyPlateNumber(plateNumber: String?) { + CallerDataCenterBizListener.invokeCarNo(plateNumber) + } + + override fun onDestroy() { + + } + + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/SpeedLimitDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/SpeedLimitDispatcher.kt index 639072fbfa..9aebaa4298 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/SpeedLimitDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/SpeedLimitDispatcher.kt @@ -31,7 +31,6 @@ class SpeedLimitDispatcher : ILimitingVelocityListener { /** * 地图限速数据 */ -// @BizConfig(FuncBizConfig.V2I, "", FuncBizConfig.BIZ_SLW) //todo emArrow 重新考虑放的位置 override fun onUnion(limitingVelocity: Int, sourceType: DataSourceType) { super.onUnion(limitingVelocity, sourceType) when (sourceType) { // obu 优先级高于 map，体现链路能力 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneContainerView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneContainerView.kt index b67f897836..89b678a193 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneContainerView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneContainerView.kt @@ -5,8 +5,6 @@ import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout -import com.mogo.eagle.core.data.enums.Carmodel -import com.mogo.eagle.core.function.api.och.IOchFunctionCallNotify import com.mogo.eagle.core.function.call.och.CallerOchBizFunctionCall4EagleManager import com.mogo.eagle.core.function.hmi.R import kotlinx.android.synthetic.main.view_bone_container.view.clBoneBiz @@ -16,9 +14,9 @@ class BoneContainerView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : ConstraintLayout(context, attrs, defStyleAttr), IOchFunctionCallNotify { +) : ConstraintLayout(context, attrs, defStyleAttr) { - companion object{ + companion object { private const val TAG = "BoneContainerView" } @@ -29,14 +27,6 @@ class BoneContainerView @JvmOverloads constructor( private var logOut: (() -> Unit)? = null - override fun onAttachedToWindow() { - super.onAttachedToWindow() - } - - override fun onDetachedFromWindow() { - super.onDetachedFromWindow() - } - private fun initView() { clBoneTab.loginOut { CallerOchBizFunctionCall4EagleManager.logout() @@ -47,17 +37,8 @@ class BoneContainerView @JvmOverloads constructor( clBoneBiz.addView(view) } - fun loginOut(logOut:(() -> Unit)){ + fun loginOut(logOut: (() -> Unit)) { this.logOut = logOut } - override fun notifyCarMode(carModel: Carmodel?) { - super.notifyCarMode(carModel) - clBoneTab.setCarMode(carModel) - } - - override fun notifyPlateNumber(plateNumber: String?) { - super.notifyPlateNumber(plateNumber) - clBoneTab.setCarNo(plateNumber) - } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneTabLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneTabLayout.kt index 177d0e00e9..b0ddf476d8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneTabLayout.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneTabLayout.kt @@ -4,7 +4,6 @@ import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout -import com.mogo.eagle.core.data.enums.Carmodel import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxEventListener import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager import com.mogo.eagle.core.function.hmi.R @@ -115,18 +114,6 @@ class BoneTabLayout @JvmOverloads constructor( }) } - fun setCarNo(carNo: String?) { - carInfoTabView.setCarNo(carNo) - } - - fun setLoginInfo(loginNo: String) { - carInfoTabView.setLoginInfo(loginNo) - } - - fun setCarMode(carModel: Carmodel?) { - carInfoTabView.setCarMode(carModel) - } - fun loginOut(logOut: (() -> Unit)) { UiThreadHandler.post { this.logOut = logOut diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt index c6858591ac..ee7eb60681 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt @@ -4,21 +4,28 @@ import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.commons.debug.DebugConfig import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.data.enums.Carmodel import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener +import com.mogo.eagle.core.function.api.datacenter.IDataCenterBizListener +import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxEventListener import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener import com.mogo.eagle.core.function.api.hmi.autopilot.IMoGoCheckAutoPilotBtnListener +import com.mogo.eagle.core.function.api.och.IOchFunctionCallNotify import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager +import com.mogo.eagle.core.function.call.datacenter.CallerDataCenterBizListener import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager +import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.function.hmi.bone.BoneTabLayout import com.mogo.eagle.core.function.hmi.ui.tools.OfflineMapDialog import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -29,13 +36,15 @@ 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.map.MogoData +import kotlinx.android.synthetic.main.view_bone_container.view.clBoneTab import kotlinx.android.synthetic.main.view_car_info_tab.view.ivCarType import kotlinx.android.synthetic.main.view_car_info_tab.view.tvADMapVersion -import kotlinx.android.synthetic.main.view_car_info_tab.view.tvADVersion +import kotlinx.android.synthetic.main.view_car_info_tab.view.tvADVersionName import kotlinx.android.synthetic.main.view_car_info_tab.view.tvCarExit import kotlinx.android.synthetic.main.view_car_info_tab.view.tvCarLoginInfo import kotlinx.android.synthetic.main.view_car_info_tab.view.tvCarNo import kotlinx.android.synthetic.main.view_car_info_tab.view.tvHDMapUpdate +import kotlinx.android.synthetic.main.view_car_info_tab.view.tvHDMapVersion import kotlinx.android.synthetic.main.view_car_info_tab.view.tvPADUpdate import kotlinx.android.synthetic.main.view_car_info_tab.view.tvPadVersion import kotlinx.android.synthetic.main.view_car_info_tab.view.tvSnInfo @@ -55,7 +64,7 @@ class CarInfoTabView @JvmOverloads constructor( attrs: AttributeSet? = null, defStyleAttr: Int = 0 ) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoCheckAutoPilotBtnListener, - IMoGoAutopilotStatusListener, IMoGoDevaToolsListener { + IMoGoAutopilotStatusListener, IMoGoDevaToolsListener, IDataCenterBizListener { companion object { private const val TAG = "CarInfoTabView" @@ -77,6 +86,7 @@ class CarInfoTabView @JvmOverloads constructor( CallerHmiListenerManager.addListener(TAG, this) CallerAutoPilotStatusListenerManager.addListener(TAG, this) CallerDevaToolsListenerManager.addListener(TAG, this) + CallerDataCenterBizListener.addListener(TAG, this) } override fun onDetachedFromWindow() { @@ -84,6 +94,7 @@ class CarInfoTabView @JvmOverloads constructor( CallerHmiListenerManager.removeListener(TAG) CallerAutoPilotStatusListenerManager.removeListener(TAG) CallerDevaToolsListenerManager.removeListener(TAG) + CallerDataCenterBizListener.removeListener(TAG) } private fun initView() { @@ -110,6 +121,7 @@ class CarInfoTabView @JvmOverloads constructor( CallerDevaToolsManager.queryAppUpgrade() } + tvHDMapVersion.text = tvHDMapVersion.text.toString() + DebugConfig.getMapVersion() //高精地图 检查更新 tvHDMapUpdate.setOnClickListener { HmiActionLog.hmiAction( @@ -144,26 +156,24 @@ class CarInfoTabView @JvmOverloads constructor( tvPadVersion.text = tvPadVersion.text.toString() + AppUtils.getAppVersionName() } - fun setLoginInfo(loginNo: String) { + override fun invokeCarRes(res: Int) { + super.invokeCarRes(res) UiThreadHandler.post { - if (loginNo.isNotEmpty()) { - tvCarLoginInfo.text = loginNo.parsePhoneNo() - } else { - tvCarLoginInfo.text = "" - } + ivCarType.setImageResource(res) } } - fun setCarNo(carNo: String?) { + override fun invokeCarNo(no: String?) { + super.invokeCarNo(no) UiThreadHandler.post { // 监听工控的车牌信息，防止调试跳过无车牌内容(链接先后顺序不一致也会导致数据显示异常) - if (!carNo.isNullOrEmpty()) { - if (tvCarNo.text.isNotEmpty() && tvCarNo.text == carNo) { + if (!no.isNullOrEmpty()) { + if (tvCarNo.text.isNotEmpty() && tvCarNo.text == no) { CallerLogger.i("$M_HMI$TAG", "已存在车牌号") return@post } tvCarNo.visibility = VISIBLE - tvCarNo.text = carNo.parsePlateNo() + tvCarNo.text = no.parsePlateNo() } else { tvCarNo.visibility = GONE tvCarNo.text = "" @@ -171,13 +181,12 @@ class CarInfoTabView @JvmOverloads constructor( } } - fun setCarMode(carModel: Carmodel?){ + fun setLoginInfo(loginNo: String) { UiThreadHandler.post { - if(carModel == null){ - ivCarType.visibility = GONE - }else{ - ivCarType.visibility = VISIBLE - ivCarType.setImageResource(carModel.resId) + if (loginNo.isNotEmpty()) { + tvCarLoginInfo.text = loginNo.parsePhoneNo() + } else { + tvCarLoginInfo.text = "" } } } @@ -193,7 +202,7 @@ class CarInfoTabView @JvmOverloads constructor( private fun showCurrentAdVersion() { UiThreadHandler.post { CallerAutoPilotStatusListenerManager.getDockerVersion()?.let { - tvADVersion.text = tvADVersion.text.toString() + it + tvADVersionName.text = it } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OfflineMapDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OfflineMapDialog.kt index 7ae39f703b..3cbedff0f8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OfflineMapDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OfflineMapDialog.kt @@ -144,7 +144,7 @@ class OfflineMapDialog(context: Context) : BaseFloatDialog(context) { if (this@OfflineMapDialog.isShowing) { progressBar?.let { if (it.visibility == View.VISIBLE) { - it.progress = if (progress in 1..5) 5 else progress + it.progress = if (progress <= 5) 5 else progress val p = AutoSizeUtils.dp2px( context, 770f diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_corner_bg_test.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_corner_bg_test.xml index 28fd08b44e..a715ccaeae 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_corner_bg_test.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_corner_bg_test.xml @@ -3,8 +3,8 @@ @@ -33,9 +33,8 @@ + android:height="@dimen/dp_40" + android:gravity="center_vertical"> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_offline_map.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_offline_map.xml index ea3e3bf7e3..6230b00ce4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_offline_map.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_offline_map.xml @@ -61,10 +61,8 @@ android:layout_height="@dimen/dp_50" android:layout_marginTop="@dimen/dp_296" android:max="100" - android:progress="5" + android:progress="0" android:visibility="gone" - android:paddingStart="@dimen/dp_0" - android:paddingEnd="@dimen/dp_0" android:progressDrawable="@drawable/progressbar_corner_bg_test" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml index 10ffbf69ed..a64774b9fd 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml @@ -7,7 +7,6 @@ android:background="@drawable/bg_tab_item"> @@ -151,15 +151,28 @@ + + + app:layout_constraintTop_toBottomOf="@+id/tvADVersionName" /> + app:layout_constraintTop_toBottomOf="@+id/tvADMapVersion" /> () { - - override fun create(context: Context): Boolean { - ARouter.getInstance().build(MogoServicePaths.PATH_AI_CLOUD).navigation() - return true - } - - override fun callCreateOnMainThread(): Boolean { - return true - } - - override fun waitOnMainThread(): Boolean { - return false - } - - override fun dependenciesByName(): List { - val deps = arrayListOf() - deps.add("com.mogo.eagle.core.function.startup.stagetwo.DataCenterStartUp") - return deps - } -} \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java index 61809ce8b4..d94623aaf8 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java @@ -52,12 +52,6 @@ public class MogoServicePaths { @Keep public static final String PATH_AUTO_PILOT = "/auto_pilot/api"; - /** - * AiCloud socket 数据透出业务模块 - */ - @Keep - public static final String PATH_AI_CLOUD = "/ai_cloud/api"; - /** * 业务Biz 模块 */ @@ -99,6 +93,9 @@ public class MogoServicePaths { @Keep public static final String PATH_DATA_CENTER_MODULE = "/data_center/api"; + @Keep + public static final String PATH_DATA_CENTER_BIZ_FUNCTION = "/data_center_biz/function"; + @Keep public static final String PATH_CERT_DOWN_LOAD_PROVIDER = "/cert_file/api"; 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 index fbef6ebc9e..768e41d0c7 100644 --- 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 @@ -9,7 +9,7 @@ enum class Carmodel(val serverName:String,@RawRes val rawValue: Int, val resId: B1("B1", R.raw.xiaoba, R.drawable.icon_car_b1), B2("B2", R.raw.m2, R.drawable.icon_car_b2), M1("M1", R.raw.m1, R.drawable.icon_car_m1), - C1("C1", R.raw.huanwei, R.drawable.icon_car_t1),; //todo c1替换 + C1("C1", R.raw.huanwei, R.drawable.icon_car_c1),; companion object{ fun getCarModelFromServerName(serverName:String?): Carmodel { diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/IDataCenterBizListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/IDataCenterBizListener.kt new file mode 100644 index 0000000000..4b92108bf5 --- /dev/null +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/IDataCenterBizListener.kt @@ -0,0 +1,8 @@ +package com.mogo.eagle.core.function.api.datacenter + +interface IDataCenterBizListener { + + fun invokeCarRes(res:Int){} + + fun invokeCarNo(no:String?){} +} \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/IDataCenterBizProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/IDataCenterBizProvider.kt new file mode 100644 index 0000000000..62e84c4cbd --- /dev/null +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/IDataCenterBizProvider.kt @@ -0,0 +1,9 @@ +package com.mogo.eagle.core.function.api.datacenter + +import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider +import com.mogo.eagle.core.function.api.och.IOchFunctionCallNotify + +interface IDataCenterBizProvider: IMoGoFunctionServerProvider, IOchFunctionCallNotify { + + +} \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCallNotify.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCallNotify.kt index 4347ba17c9..173907c39b 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCallNotify.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCallNotify.kt @@ -13,10 +13,10 @@ interface IOchFunctionCallNotify { fun notifyLoginInfo() {} // 车型变化回调 - fun notifyCarMode(carModel: Carmodel?){} + fun notifyCarMode(carModel: Carmodel) // 车牌变化回调 - fun notifyPlateNumber(plateNumber: String?){} + fun notifyPlateNumber(plateNumber: String?) fun LoginOut() {} diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizListener.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizListener.kt new file mode 100644 index 0000000000..60a8141e88 --- /dev/null +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizListener.kt @@ -0,0 +1,30 @@ +package com.mogo.eagle.core.function.call.datacenter + +import com.mogo.eagle.core.function.api.datacenter.IDataCenterBizListener +import com.mogo.eagle.core.function.call.base.CallerBase + +object CallerDataCenterBizListener : CallerBase() { + + private var res:Int = 0 + private var no:String? = null + + override fun doSomeAfterAddListener(tag: String, listener: IDataCenterBizListener) { + super.doSomeAfterAddListener(tag, listener) + listener.invokeCarRes(res) + listener.invokeCarNo(no) + } + + fun invokeCarRes(res: Int) { + this.res = res + M_LISTENERS.forEach { + it.value.invokeCarRes(res) + } + } + + fun invokeCarNo(no: String?) { + this.no = no + M_LISTENERS.forEach { + it.value.invokeCarNo(no) + } + } +} \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizManager.kt new file mode 100644 index 0000000000..b5c63cf408 --- /dev/null +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizManager.kt @@ -0,0 +1,24 @@ +package com.mogo.eagle.core.function.call.datacenter + +import com.alibaba.android.arouter.launcher.ARouter +import com.mogo.eagle.core.data.constants.MogoServicePaths +import com.mogo.eagle.core.data.enums.Carmodel +import com.mogo.eagle.core.function.api.datacenter.IDataCenterBizProvider +import com.mogo.eagle.core.function.api.och.IOchFunctionCallNotify + +object CallerDataCenterBizManager: IOchFunctionCallNotify { + + private val dataCenterBizProviderApi + get() = ARouter.getInstance().build(MogoServicePaths.PATH_DATA_CENTER_BIZ_FUNCTION) + .navigation() as? IDataCenterBizProvider + + override fun notifyCarMode(carModel: Carmodel) { + dataCenterBizProviderApi?.notifyCarMode(carModel) + } + + override fun notifyPlateNumber(plateNumber: String?) { + dataCenterBizProviderApi?.notifyPlateNumber(plateNumber) + } + + +} \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerEagleBaseFunctionCall4OchManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerEagleBaseFunctionCall4OchManager.kt index c30357fd08..ea06b31bd5 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerEagleBaseFunctionCall4OchManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerEagleBaseFunctionCall4OchManager.kt @@ -6,6 +6,7 @@ import com.mogo.eagle.core.function.api.och.IEagleBaseFunctionCall4Och import com.mogo.eagle.core.function.api.och.toolkit.IToolKitItemClickListener import com.mogo.eagle.core.function.api.och.toolkit.ToolKitCustomItemAddParam import com.mogo.eagle.core.function.api.och.toolkit.ToolKitDefaultItemAddParam +import com.mogo.eagle.core.function.call.datacenter.CallerDataCenterBizManager import com.mogo.eagle.core.function.call.hmi.CallerHmiManager /** @@ -89,13 +90,13 @@ object CallerEagleBaseFunctionCall4OchManager : IEagleBaseFunctionCall4Och { * Och设置车型 E70 H9 B1 B2 M1 金旅牌XML6606JEVY0(小巴车) NJL6450ICEV(小巴) BJ5122TXSEV-H1(环卫车) */ override fun setOchCarModel(carModel: Carmodel) { - //this.carModel = carModel + CallerDataCenterBizManager.notifyCarMode(carModel) } /** * Och设置 车牌 */ override fun setOchPlateNumber(plateNumber: String?) { - // this.plateNumber = plateNumber + CallerDataCenterBizManager.notifyPlateNumber(plateNumber) } } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/order/CallerOrderListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/order/CallerOrderListenerManager.kt index 6f4d2da0b1..78ae49b4b5 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/order/CallerOrderListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/order/CallerOrderListenerManager.kt @@ -6,7 +6,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import java.util.concurrent.atomic.AtomicBoolean /** - * @author XuXinChao + * @author XuXinChao //todo emArrow 合并dataCenter * @date 2023/4/20 * 订单监听管理 */ diff --git a/core/mogo-core-res/src/main/res/drawable-nodpi/icon_car_c1.png b/core/mogo-core-res/src/main/res/drawable-nodpi/icon_car_c1.png new file mode 100644 index 0000000000..6794109400 Binary files /dev/null and b/core/mogo-core-res/src/main/res/drawable-nodpi/icon_car_c1.png differ diff --git a/core/mogo-core-res/src/main/res/drawable-nodpi/icon_car_default.png b/core/mogo-core-res/src/main/res/drawable-nodpi/icon_car_default.png new file mode 100644 index 0000000000..00c6c9ecde Binary files /dev/null and b/core/mogo-core-res/src/main/res/drawable-nodpi/icon_car_default.png differ diff --git a/core/mogo-core-res/src/main/res/drawable-nodpi/icon_car_t1.png b/core/mogo-core-res/src/main/res/drawable-nodpi/icon_car_t1.png index b1a42e2bbc..b74958d03e 100644 Binary files a/core/mogo-core-res/src/main/res/drawable-nodpi/icon_car_t1.png and b/core/mogo-core-res/src/main/res/drawable-nodpi/icon_car_t1.png differ diff --git a/core/mogo-core-res/src/main/res/drawable-nodpi/icon_car_t2.png b/core/mogo-core-res/src/main/res/drawable-nodpi/icon_car_t2.png index b74958d03e..b1a42e2bbc 100644 Binary files a/core/mogo-core-res/src/main/res/drawable-nodpi/icon_car_t2.png and b/core/mogo-core-res/src/main/res/drawable-nodpi/icon_car_t2.png differ