diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index 2434ecc359..707a69bcf0 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -84,7 +84,6 @@ class TaxiPassengerBaseFragment() : override fun setSettingAndMusicShow(settingShow: Boolean, musicShow: Boolean) { clSettingView.visibility = if(settingShow) View.VISIBLE else View.GONE mv_music_info.visibility = if(musicShow) View.VISIBLE else View.GONE -// CallerHmiViewControlListenerManager.invokeV2XEvent(View.VISIBLE) //todo emArrow test } }) diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml index 1c70f9a316..024bb68d79 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -194,9 +194,10 @@ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml index 2422f3dfe1..88f23f3945 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml @@ -98,9 +98,10 @@ diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/MapBizProvider.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/MapBizProvider.kt index e695d2c0f7..4e36536284 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/MapBizProvider.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/MapBizProvider.kt @@ -9,6 +9,7 @@ import com.mogo.eagle.core.function.api.map.roma.IMogoRoma import com.mogo.eagle.core.function.business.MapPointCloudSubscriber import com.mogo.eagle.core.function.business.SpeedLimitDataManager import com.mogo.eagle.core.function.business.ai.AiCloudIdentifyDataManager.Companion.aiCloudIdentifyDataManager +import com.mogo.eagle.core.function.business.ai.RomaManager import com.mogo.eagle.core.function.business.ai.RomaManager.Companion.romaManager import com.mogo.eagle.core.function.business.identify.MapIdentifySubscriber import com.mogo.eagle.core.function.business.roadcross.RoadCrossCameraManager @@ -33,6 +34,7 @@ class MapBizProvider :IMoGoFunctionServerProvider, IMogoRoma { RoadCrossCameraManager.instance.init(context) SpeedLimitDataManager.getInstance().start() if(DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()){ //todo 新增稳定设备类型需要添加，目的避免在nuc设备上使用此类功能 + romaManager.init() aiCloudIdentifyDataManager.initServer(AbsMogoApplication.getApp()) } // 视角切换功能初始化，监听路口及停止线回调 diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/RomaManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/RomaManager.kt index 457425ec7a..a2a2da4ab9 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/RomaManager.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/RomaManager.kt @@ -77,7 +77,7 @@ class RomaManager() : IMoGoPlanningRottingListener, @Volatile private var inRange = false - init { + fun init(){ CallerAutoPilotStatusListenerManager.addListener(TAG, this) CallerPlanningRottingListenerManager.addListener(TAG, this) CallerMapRomaListener.addListener(TAG, this) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapRoamView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapRoamView.kt index d78b80c3b8..f473f3e2d7 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapRoamView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapRoamView.kt @@ -101,6 +101,16 @@ class MapRoamView(context: Context?, attrs: AttributeSet?) : MogoMapView(context } } + fun updateLoc(){ + val latLng = CallerMapRoadListenerManager.getStopLineLatLng() + latLng?.let { + val loc = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() + loc.latitude = latLng.first + loc.longitude = latLng.second + setExtraGPSData(loc) + } + } + override fun response(requestStatus: Boolean, errorMsg: String?) { trace(TAG, mapOf("response" to requestStatus, "errorMsg" to (errorMsg ?: ""))) } 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 4b1da441b0..71ee3cfba3 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 @@ -110,13 +110,6 @@ class RoadCrossRoamView @JvmOverloads constructor( } } - override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { - super.onSizeChanged(w, h, oldw, oldh) - Log.i("emArrow","roadCrossRoamView anim width : $w , old w : $oldw" + - "height : $h , old h : $oldh" + - "marginTop : ${this.marginTop} , marginBottom : ${this.marginBottom}") - } - override fun v2xEventVisible(v: Int, tag: String) { super.v2xEventVisible(v, tag) if (this.visibility == View.GONE) { @@ -127,7 +120,7 @@ class RoadCrossRoamView @JvmOverloads constructor( } if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { if (tag == V2X_EVENT_TAG && v == View.VISIBLE) { - val anim = ValueAnimator.ofInt(height, 460) + val anim = ValueAnimator.ofInt(height, 410) anim.duration = 500 anim.addUpdateListener { animation -> val value = animation.animatedValue as Int @@ -135,7 +128,7 @@ class RoadCrossRoamView @JvmOverloads constructor( } anim.start() - val animMap = ValueAnimator.ofInt(160, 90) + val animMap = ValueAnimator.ofInt(160, 84) animMap.duration = 500 animMap.addUpdateListener { animation -> val value = animation.animatedValue as Int @@ -143,18 +136,27 @@ class RoadCrossRoamView @JvmOverloads constructor( (clScanningBg.layoutParams as? MarginLayoutParams)?.topMargin = value } animMap.start() + + val animTxt = ValueAnimator.ofInt(32, 22) + animTxt.duration = 500 + animTxt.addUpdateListener { animation -> + val value = animation.animatedValue as Int + (tvRoadRoamTitle.layoutParams as? MarginLayoutParams)?.topMargin = value + } + animTxt.start() + + (tvRoadRoamTitle.layoutParams as? MarginLayoutParams)?.leftMargin = 0 (mapRoamView.layoutParams as? MarginLayoutParams)?.height = 280 (clScanningBg.layoutParams as? MarginLayoutParams)?.height = 280 mapRoamView.requestLayout() clScanningBg.requestLayout() + tvRoadRoamTitle.requestLayout() + + mapRoamView.updateLoc() lvRoadCrossRoamTip.visibility = View.GONE ivZhiRoadRoamSet.visibility = View.GONE ivZhiRoadRoamView.visibility = View.GONE - tvRoadRoamTitle.setTextSize( - TypedValue.COMPLEX_UNIT_PX, - AutoSizeUtils.dp2px(context, 30f).toFloat() - ) tvRoadRoamTitle.text = "为您全面扫描潜在风险" animScale = true } @@ -197,9 +199,6 @@ class RoadCrossRoamView @JvmOverloads constructor( return } - Log.i("emArrow","roadCrossRoamView width : ${this.layoutParams.width} , " + - "height : ${this.layoutParams.height} , " + - "margin : ${this.marginTop} , ${this.marginBottom}") // 没有路线不做提示 // if (CallerAutoPilotStatusListenerManager.getLineId() == 0L) { // return @@ -278,15 +277,12 @@ class RoadCrossRoamView @JvmOverloads constructor( } if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) && animScale) { - setHeight(AutoSizeUtils.dp2px(context, 948f)) + setHeight(AutoSizeUtils.dp2px(context, 900f)) (mapRoamView.layoutParams as? MarginLayoutParams)?.topMargin = 160 (clScanningBg.layoutParams as? MarginLayoutParams)?.topMargin = 160 + (tvRoadRoamTitle.layoutParams as? MarginLayoutParams)?.leftMargin = 35 lvRoadCrossRoamTip.visibility = View.VISIBLE ivZhiRoadRoamSet.visibility = View.VISIBLE - tvRoadRoamTitle.setTextSize( - TypedValue.COMPLEX_UNIT_PX, - AutoSizeUtils.dp2px(context, 24f).toFloat() - ) ivZhiRoadRoamView.visibility = View.VISIBLE tvRoadRoamTitle.text = context.resources.getString(R.string.road_cross_roam_tip) @@ -294,6 +290,7 @@ class RoadCrossRoamView @JvmOverloads constructor( (clScanningBg.layoutParams as? MarginLayoutParams)?.height = 300 mapRoamView.requestLayout() clScanningBg.requestLayout() + tvRoadRoamTitle.requestLayout() animScale = false } CallerHmiViewControlListenerManager.invokeV2XEvent(View.GONE, TAG) diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam_light.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam_light.xml index 317a1b2a36..7e95a141d8 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam_light.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam_light.xml @@ -13,12 +13,13 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintBottom_toBottomOf="parent"> + @@ -93,14 +93,12 @@ + app:layout_constraintTop_toBottomOf="@+id/mapRoamView" />