yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.5.0] fix ui

Browse Source
This commit is contained in:
EmArrow
2024-07-22 13:49:03 +08:00
parent aecd524aca
commit f8e9b81f0e
15 changed files with 54 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
View File

@@ -194,10 +194,9 @@
<!-- 前方路况探查 -->
<com.mogo.eagle.core.function.view.RoadCrossRoamView
android:layout_width="@dimen/dp_590"
android:layout_height="@dimen/dp_900"
android:layout_marginTop="@dimen/dp_425"
android:layout_marginEnd="@dimen/dp_29"
android:layout_width="@dimen/dp_648"
android:layout_height="@dimen/dp_970"
android:layout_marginTop="@dimen/dp_410"
android:visibility="gone"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -228,10 +227,9 @@
<!-- 地图marker点击触发路侧直播 -->
<com.mogo.eagle.core.function.hmi.ui.camera.RoadCrossLiveView
android:layout_width="@dimen/dp_590"
android:layout_height="@dimen/dp_408"
android:layout_marginTop="@dimen/dp_425"
android:layout_marginEnd="@dimen/dp_29"
android:layout_width="@dimen/dp_648"
android:layout_height="@dimen/dp_470"
android:layout_marginTop="@dimen/dp_410"
android:visibility="gone"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -241,7 +239,7 @@
android:id="@+id/roadV2NEventWindowView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-80dp"
android:layout_marginBottom="-100dp"
app:layout_constraintBottom_toTopOf="@+id/aciv_xiaozhi_normal"
app:layout_constraintRight_toRightOf="parent"
android:visibility="gone"/>

16
OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
View File

@@ -98,10 +98,9 @@
<!-- 前方路况探查 -->
<com.mogo.eagle.core.function.view.RoadCrossRoamView
android:layout_width="@dimen/dp_590"
android:layout_height="@dimen/dp_900"
android:layout_marginTop="@dimen/dp_425"
android:layout_marginEnd="@dimen/dp_29"
android:layout_width="@dimen/dp_648"
android:layout_height="@dimen/dp_970"
android:layout_marginTop="@dimen/dp_410"
android:visibility="gone"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -120,10 +119,9 @@
<!-- 地图marker点击触发路侧直播 -->
<com.mogo.eagle.core.function.hmi.ui.camera.RoadCrossLiveView
android:layout_width="@dimen/dp_590"
android:layout_height="@dimen/dp_408"
android:layout_marginTop="@dimen/dp_425"
android:layout_marginEnd="@dimen/dp_29"
android:layout_width="@dimen/dp_648"
android:layout_height="@dimen/dp_470"
android:layout_marginTop="@dimen/dp_410"
android:visibility="gone"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -252,7 +250,7 @@
android:id="@+id/roadV2NEventWindowView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-80dp"
android:layout_marginBottom="-100dp"
app:layout_constraintBottom_toTopOf="@+id/aciv_xiaozhi_normal"
app:layout_constraintRight_toRightOf="parent"
android:visibility="gone"/>

4
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
View File

@@ -1038,7 +1038,7 @@ class MoGoAdasListenerImpl : OnAdasListener {
if (unableAutopilotReasons != null) {
reason = unableAutopilotReasons.toString()
}
autopilotAbilityCheck(isAutopilotAbility, reason, launchConditionData)
autopilotAbilityCheck(isAutopilotAbility, reason, launchConditionData.json)
invokeAutopilotAbility(isAutopilotAbility, launchConditionData, unableAutopilotReasons)
}
@@ -1064,7 +1064,7 @@ class MoGoAdasListenerImpl : OnAdasListener {
nodeAliasCode = CHAIN_CODE_ADAS_ABILITY,
paramIndexes = [0, 1, 2]
)
private fun autopilotAbilityCheck(isAutopilotAbility: Boolean, reason: String, launchConditionData: LaunchConditionData) {
private fun autopilotAbilityCheck(isAutopilotAbility: Boolean, reason: String, launchConditionDataJson: String) {
}

11
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml
View File

@@ -4,17 +4,18 @@
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/bg_hmi_nor_test_light">
android:background="@drawable/bg_right_base_light">
<TextView
android:text="@string/road_cross_live_tip"
android:textColor="@color/color_131415"
android:textSize="@dimen/dp_28"
android:layout_marginTop="@dimen/dp_23"
android:layout_marginTop="@dimen/dp_20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="@+id/roadCrossLivePlayer"/>
android:layout_marginStart="@dimen/dp_30"
app:layout_constraintLeft_toLeftOf="parent"/>
<ImageView
android:id="@+id/roadCrossLiveClose"
@@ -32,7 +33,7 @@
android:id="@+id/roadCrossLiveBg"
android:layout_width="@dimen/dp_498"
android:layout_height="@dimen/dp_280"
android:layout_margin="@dimen/dp_80"
android:layout_marginTop="@dimen/dp_78"
android:background="@drawable/bg_road_cross_live_light_empty"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
@@ -54,7 +55,7 @@
android:id="@+id/roadCrossLivePlayer"
android:layout_width="@dimen/dp_498"
android:layout_height="@dimen/dp_280"
android:layout_margin="@dimen/dp_80"
android:layout_marginTop="@dimen/dp_78"
android:visibility="visible"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintLeft_toLeftOf="parent"

5
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/RomaManager.kt
View File

@@ -150,7 +150,7 @@ class RomaManager() : IMoGoPlanningRottingListener,
}
private fun openRoma() {
CallerMapIdentifyManager.roam = Pair(TAG, true)
CallerMapIdentifyManager.updateRoam(TAG, true)
CallerMapUIServiceManager.getMapUIController()?.visualAngleLock(true)
CallerMapUIServiceManager.getMapUIController()?.setScrollGesturesEnable(false)
updateLongSightLevel(true)
@@ -159,7 +159,6 @@ class RomaManager() : IMoGoPlanningRottingListener,
@Synchronized
private fun closeRoma(manual: Boolean = true) {
CallerMapIdentifyManager.roam = Pair("", false)
CallerMapUIServiceManager.getMapUIController()?.visualAngleLock(false)
CallerMapUIServiceManager.getMapUIController()?.setScrollGesturesEnable(true)
updateLongSightLevel(false)
@@ -222,6 +221,7 @@ class RomaManager() : IMoGoPlanningRottingListener,
)
updateLongSightLevel(false)
CallerMapRomaListener.invokeMapRoma(false)
CallerMapIdentifyManager.updateRoam("", false)
if (DebugConfig.isDebug()) {
ToastUtils.showShort("漫游请求异常，msg:$errorMsg")
}
@@ -252,6 +252,7 @@ class RomaManager() : IMoGoPlanningRottingListener,
mutableMapOf("delay" to true),
true
)
CallerMapIdentifyManager.updateRoam("", false)
MapIdentifySubscriber.instance.clearAiCloudRoma()
}
}

2
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt
View File

@@ -111,7 +111,6 @@ class RoadCrossCameraManager : IMoGoMapRoadListener {
}
private fun addCameraDeviceMarker(cameraDeviceInfo: CameraDeviceInfo) {
CallerLogger.d("$M_MAP$TAG", "add marker:${cameraDeviceInfo.deviceIp}")
mContext?.let {
val builder =
Point.Options.Builder(TAG, Level.MAP_MARKER)
@@ -136,6 +135,7 @@ class RoadCrossCameraManager : IMoGoMapRoadListener {
traceError(" ${cameraDeviceInfo.deviceIp} click request error :$errorMsg")
})
}
CallerLogger.d("$M_MAP$TAG", "add marker:$cameraDeviceInfo")
overlayManager?.showOrUpdatePoint(builder.build())
}
}

6
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapRoamView.kt
View File

@@ -12,6 +12,7 @@ import com.mogo.eagle.core.function.business.ai.AiCloudIdentifyDataManager.Compa
import com.mogo.eagle.core.function.business.identify.MapIdentifySubscriber
import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
import com.mogo.eagle.core.function.call.map.CallerMapAiCloudDataManager
import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager
import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -97,6 +98,7 @@ class MapRoamView(context: Context?, attrs: AttributeSet?) : MogoMapView(context
TAG,
mapOf("startRoadRoam" to Pair("latLng" to latLng, "dis" to dis), "dis" to dis)
)
CallerMapIdentifyManager.updateRoam(RoadCrossRoamView.TAG, true)
aiCloudIdentifyDataManager.trigger(true, 1, 300, latLng.first, latLng.second)
}
}
@@ -113,6 +115,9 @@ class MapRoamView(context: Context?, attrs: AttributeSet?) : MogoMapView(context
override fun response(requestStatus: Boolean, errorMsg: String?) {
trace(TAG, mapOf("response" to requestStatus, "errorMsg" to (errorMsg ?: "")))
if(!requestStatus){
CallerMapIdentifyManager.updateRoam("", false)
}
}
override fun onAiIdentifyData(obj: SocketDownData.SocketDownDataProto?) {
@@ -133,7 +138,6 @@ class MapRoamView(context: Context?, attrs: AttributeSet?) : MogoMapView(context
latLng?.let {
aiCloudIdentifyDataManager.trigger(false, 1, 300, it.first, it.second)
}
CallerMapAiCloudDataManager.removeListener(RoadCrossRoamView.TAG)
MapIdentifySubscriber.instance.clearAiCloudRoma(MAP_ROAM)
this.onPause()
getUI()?.setVisible(false)

8
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt
View File

@@ -120,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, 410)
val anim = ValueAnimator.ofInt(height, 475)
anim.duration = 500
anim.addUpdateListener { animation ->
val value = animation.animatedValue as Int
@@ -204,6 +204,7 @@ class RoadCrossRoamView @JvmOverloads constructor(
if (CallerMapIdentifyManager.roam.first != TAG) {
ToastUtils.showLong("正在漫游中，不展示路口漫游")
}
CallerLogger.d("$M_MAP$TAG","正在漫游中，不展示路口漫游")
return
}
// 首页被遮挡不做提示
@@ -213,7 +214,6 @@ class RoadCrossRoamView @JvmOverloads constructor(
}
CallerHmiViewControlListenerManager.invokeV2XEvent(View.VISIBLE, TAG)
bringToFront()
CallerMapIdentifyManager.roam = Pair(TAG, true)
this.visibility = View.VISIBLE
ivZhiRoadRoamView.visibility = View.VISIBLE
mapRoamView.visibility = View.VISIBLE
@@ -265,7 +265,7 @@ class RoadCrossRoamView @JvmOverloads constructor(
}
mapRoamView.closeRoam()
mapRoamView.visibility = View.GONE
CallerMapIdentifyManager.roam = Pair("", false)
lvRoadCrossRoamTip.adapter = null
animator?.cancel()
if (lightMode) {
@@ -273,7 +273,7 @@ class RoadCrossRoamView @JvmOverloads constructor(
}
if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) && animScale) {
setHeight(AutoSizeUtils.dp2px(context, 900f))
setHeight(AutoSizeUtils.dp2px(context, 970f))
(mapRoamView.layoutParams as? MarginLayoutParams)?.topMargin = 160
(clScanningBg.layoutParams as? MarginLayoutParams)?.topMargin = 160
(tvRoadRoamTitle.layoutParams as? MarginLayoutParams)?.leftMargin = 35

BIN
core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_nor_test_light.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_right_base_light.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 125 KiB

BIN
core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_road_cross_roam_light.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 20 KiB

4
core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam_light.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg_nor_test_light">
android:background="@drawable/bg_right_base_light">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="@dimen/dp_580"
@@ -30,7 +30,7 @@
android:id="@+id/ivZhiRoadRoamSet"
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_50"
android:layout_marginStart="@dimen/dp_42"
android:layout_marginStart="@dimen/dp_58"
android:layout_marginTop="@dimen/dp_56"
android:src="@drawable/bg_road_roam_anim_set"
app:layout_constraintLeft_toLeftOf="parent"

9
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapIdentifyManager.kt
View File

@@ -3,14 +3,12 @@ package com.mogo.eagle.core.function.call.map
import com.alibaba.android.arouter.launcher.ARouter
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.eagle.core.function.api.map.roma.IMogoRoma
import java.util.concurrent.atomic.AtomicBoolean
object CallerMapIdentifyManager {
@Volatile
var roam = Pair("", false)
set(value) {
field = value
}
private val roamApi: IMogoRoma
get() = ARouter.getInstance().build(MogoServicePaths.PATH_MAP_BIZ)
@@ -20,4 +18,9 @@ object CallerMapIdentifyManager {
roamApi.trigger(roamStatus)
}
@Synchronized
fun updateRoam(roamId: String, status: Boolean) {
roam = Pair(roamId, status)
}
}

4
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt
View File

@@ -26,14 +26,14 @@ object CallerMsgBoxManager {
*/
fun saveMsgBox(bean: MsgBoxBean) {
CallerTrace.write(TAG,bean)
providerApi?.saveMsg(bean) //todo emArrow test
providerApi?.saveMsg(bean)
}
/**
* 存储含有pb的数据到消息盒子(区别与上述方法中的trace write)
*/
fun saveMsgBoxHasPB(bean: MsgBoxBean){
providerApi?.saveMsg(bean) //todo emArrow test
providerApi?.saveMsg(bean)
}
/**

13
libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java
View File

@@ -141,10 +141,10 @@ public class ObjectUtils {
try {
markerOptions = new MarkerSimpleData();
markerOptions.setId(aiData.getUuid().hashCode());
markerOptions.setColor("#00FF00FF");
int type = aiData.getType();
if(AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode) &&
AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
markerOptions.setColor("#90ABCAFF");
if(type == 3){
type = 103;
}else if(type == 6){
@@ -152,11 +152,16 @@ public class ObjectUtils {
}else if(type == 8){
type = 108;
}
if (type != 103 && type != 106 && type != 108) {
markerOptions.setColor("#90ABCAFF");
}else{
if(type == 103 || type == 106 || type == 108){
markerOptions.setColor("");
}
// if (type != 103 && type != 106 && type != 108) {
// markerOptions.setColor("#90ABCAFF");
// }else{
// markerOptions.setColor("");
// }
}else{
markerOptions.setColor("#00FF00FF");
}
markerOptions.setMarkerType(type);
markerOptions.setRotateAngle((float) aiData.getHeading());