diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/transform/OchTransform.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/transform/OchTransform.kt index 4a30c9b716..de2cc8562e 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/transform/OchTransform.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/transform/OchTransform.kt @@ -5,9 +5,6 @@ import com.mogo.eagle.core.function.call.base.CallerBase import com.mogo.eagle.core.function.call.och.CallerOchFunctionCallManager object OchTransform : CallerBase(),IOchCommonFunctionCall { - init { - CallerOchFunctionCallManager.setOchCommonFunctionCall(this) - } override fun logout() { M_LISTENERS.forEach { 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 24773287c9..14775ffd39 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,6 +5,7 @@ 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.IOchFunctionCall import com.mogo.eagle.core.function.call.och.CallerOchFunctionCallManager import com.mogo.eagle.core.function.hmi.R @@ -40,12 +41,8 @@ class BoneContainerView @JvmOverloads constructor( } private fun initView() { - clBoneTab.loginOut { //todo 判断没有logout caller出去 - if(logOut != null){ - logOut?.invoke() - }else{ - - } + clBoneTab.loginOut { + CallerOchFunctionCallManager.invokeLoginOut() } } @@ -57,7 +54,7 @@ class BoneContainerView @JvmOverloads constructor( this.logOut = logOut } - override fun invokeCarMode(carModel: String?) { + override fun invokeCarMode(carModel: Carmodel?) { super.invokeCarMode(carModel) clBoneTab.setCarMode(carModel) } 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 d72ae4626e..be956276d5 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,6 +4,7 @@ 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 @@ -92,7 +93,7 @@ class BoneTabLayout @JvmOverloads constructor( carInfoTabView.setLoginInfo(loginNo) } - fun setCarMode(carModel: String?) { + fun setCarMode(carModel: Carmodel?) { carInfoTabView.setCarMode(carModel) } 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 6733027530..13b88c837a 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 @@ -6,6 +6,7 @@ import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout 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.devatools.IMoGoDevaToolsListener @@ -168,19 +169,13 @@ class CarInfoTabView @JvmOverloads constructor( } } - fun setCarMode(carModel:String?){ + fun setCarMode(carModel: Carmodel?){ UiThreadHandler.post { - if(carModel.isNullOrEmpty()){ + if(carModel == null){ ivCarType.visibility = GONE }else{ ivCarType.visibility = VISIBLE - when(carModel){ - "b1" -> ivCarType.setImageResource(R.drawable.icon_car_b1) - "b2" -> ivCarType.setImageResource(R.drawable.icon_car_b2) - "t1" -> ivCarType.setImageResource(R.drawable.icon_car_t1) - "t2" -> ivCarType.setImageResource(R.drawable.icon_car_t2) - "m1" -> ivCarType.setImageResource(R.drawable.icon_car_m1) - } + ivCarType.setImageResource(carModel.resId) } } } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt index da4080179c..1d88be5f7f 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt @@ -119,15 +119,12 @@ class RoadCrossCameraManager : IMoGoMapRoadListener { val builder = Point.Options.Builder(TAG, Level.MAP_MARKER) .setId(cameraDeviceInfo.deviceIp) -// .anchor(0.5f, 1f) - .anchor(0.5f, 0.5f) -// .scale(0.6f) + .anchor(0.5f, 1f) + .scale(1.3f) .set3DMode(true) -// .flat(false) .isUseGps(true) .controlAngle(false) .icon3DRes(R.raw.cross_road_camera) -// .icon(BitmapFactory.decodeResource(it.resources, R.drawable.road_camera)) .moveToCenter(false) .longitude(cameraDeviceInfo.lon) .latitude(cameraDeviceInfo.lat) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/CameraMarkerView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/CameraMarkerView.kt deleted file mode 100644 index 9161be3786..0000000000 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/CameraMarkerView.kt +++ /dev/null @@ -1,76 +0,0 @@ -package com.mogo.eagle.core.function.view - -import android.content.Context -import android.util.AttributeSet -import android.view.View -import android.view.ViewGroup -import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener -import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager -import com.mogo.eagle.core.function.map.R -import com.mogo.eagle.core.utilcode.util.ThreadUtils -import me.jessyan.autosize.utils.AutoSizeUtils - - -class CameraMarkerView(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : - androidx.appcompat.widget.AppCompatImageView(context, attrs, defStyleAttr), - IMoGoSkinModeChangeListener { - - companion object { - private const val TAG = "CameraMarkerView" - } - - init { - if (this.layoutParams == null) { - this.setLayoutParams( - ViewGroup.LayoutParams( - ViewGroup.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.WRAP_CONTENT - ) - ) - } - modeChange(CallerSkinModeListenerManager.getMode()) - } - - override fun onAttachedToWindow() { - super.onAttachedToWindow() - CallerSkinModeListenerManager.addListener(TAG, this) - } - - override fun onSkinModeChange(skinMode: Int) { - ThreadUtils.runOnUiThread { - modeChange(skinMode) - } - } - - private fun modeChange(mode: Int) { - when (mode) { - 0 -> { - setImageResource(R.drawable.map_marker_camera_view_select) - resize(106, 121) - } - 1 -> { - setImageResource(R.drawable.map_marker_camera_view_right_light_select) - resize(74, 83) - } - else -> { - setImageResource(R.drawable.map_marker_camera_view_select) - resize(106, 121) - } - } - } - - private fun resize(width: Int, height: Int) { - //设置宽高 - val params = layoutParams - params.width = AutoSizeUtils.dp2px(context, width.toFloat()) - params.height = AutoSizeUtils.dp2px(context, height.toFloat()) - layoutParams = params - requestLayout() - } - - override fun onDetachedFromWindow() { - super.onDetachedFromWindow() - CallerSkinModeListenerManager.removeListener(TAG) - } - -} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt index ca47cd5208..fd536ecc21 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt @@ -192,22 +192,22 @@ class RoadCrossRoamView @JvmOverloads constructor( private fun attachView() { // 没有路线不做提示 -// if (CallerAutoPilotStatusListenerManager.getLineId() == 0L) { -// return -// } -// // 处于漫游模式下不做处理 -// if (CallerMapIdentifyManager.roam.second) { -// if (CallerMapIdentifyManager.roam.first != TAG) { -// ToastUtils.showLong("正在漫游中，不展示路口漫游") -// } -// CallerLogger.d("$M_MAP$TAG", "正在漫游中，不展示路口漫游") -// return -// } -// // 首页被遮挡不做提示 -// if (!CallerHmiViewControlListenerManager.getMainPageVisible()) { -// CallerLogger.d("$M_MAP$TAG", "attachView return , mainPageVisible is false") -// return -// } + if (CallerAutoPilotStatusListenerManager.getLineId() == 0L) { + return + } + // 处于漫游模式下不做处理 + if (CallerMapIdentifyManager.roam.second) { + if (CallerMapIdentifyManager.roam.first != TAG) { + ToastUtils.showLong("正在漫游中，不展示路口漫游") + } + CallerLogger.d("$M_MAP$TAG", "正在漫游中，不展示路口漫游") + return + } + // 首页被遮挡不做提示 + if (!CallerHmiViewControlListenerManager.getMainPageVisible()) { + CallerLogger.d("$M_MAP$TAG", "attachView return , mainPageVisible is false") + return + } //播放语音 val dis = CallerMapRoadListenerManager.getStopLineDistance()?.toInt() ?: 0 if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { 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 2edba4960c..fbef6ebc9e 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 @@ -3,13 +3,13 @@ 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),; +enum class Carmodel(val serverName:String,@RawRes val rawValue: Int, val resId: Int) { + T1("E70", R.raw.chuzuche, R.drawable.icon_car_t1), + T2("H9", R.raw.hq_h9, R.drawable.icon_car_t2), + 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替换 companion object{ fun getCarModelFromServerName(serverName:String?): Carmodel { 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 38566052e9..9f39cf0d91 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 @@ -12,6 +12,8 @@ interface IOchFunctionCall { */ fun registerToolKitDefaultItemClickListener(tag: String, listener: IToolKitItemClickListener) {} + fun LoginOut(){} + // 车型变化回调 fun invokeCarMode(carModel: Carmodel?){} 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 8af48ba92c..834301f169 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 @@ -37,11 +37,6 @@ object CallerOchFunctionCallManager : CallerBase() { } } - private var _ochCallFuncation:IOchCommonFunctionCall?=null - - val ochCallFuncation:IOchCommonFunctionCall? - get() = _ochCallFuncation - /** * 注册 工具箱 item点击事件监听 (默认样式item的点击事件监听，自定义样式的item的点击交给view自己处理) */ @@ -52,6 +47,12 @@ object CallerOchFunctionCallManager : CallerBase() { CallerHmiManager.registerToolKitDefaultItemClickListener(tag, listener) } + fun invokeLoginOut(){ + M_LISTENERS.forEach { + it.value.LoginOut() + } + } + // 车型 E70 H9 B1 B2 M1 金旅牌XML6606JEVY0(小巴车) NJL6450ICEV(小巴) BJ5122TXSEV-H1(环卫车) fun setOchCarModel(carModel: Carmodel) { this.carModel = carModel @@ -61,7 +62,4 @@ object CallerOchFunctionCallManager : CallerBase() { this.plateNumber = plateNumber } - fun setOchCommonFunctionCall(caller: IOchCommonFunctionCall){ - this._ochCallFuncation = caller - } } \ No newline at end of file