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

Merge branch 'dev_robotaxi-d_240227_6.3.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_240227_6.3.0

Browse Source
This commit is contained in:
xinfengkun
2024-02-29 14:54:50 +08:00
parent 9d2374659f 160afcfc9c
commit c7b738417d
21 changed files with 361 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt
View File

@@ -19,6 +19,8 @@ import com.mogo.eagle.core.function.angle.scenes.Default
import com.mogo.eagle.core.function.angle.scenes.RoadEvent
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
import com.mogo.eagle.core.function.api.hmi.xiaozhi.event.Event
import com.mogo.eagle.core.function.api.hmi.xiaozhi.state.State
import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerV2XListenerManager.V2NCarTypeCheck
@@ -233,6 +235,7 @@ internal object V2NIdentifyDrawer {
object : IMoGoWarningStatusListener {
override fun onShow() {
super.onShow()
CallerHmiManager.notifyXiaoZhiStatusChanged(Event.V2N, State.START)
CallerVisualAngleManager.changeAngle(
RoadEvent(
lon,
@@ -244,6 +247,7 @@ internal object V2NIdentifyDrawer {
override fun onDismiss() {
super.onDismiss()
CallerHmiManager.notifyXiaoZhiStatusChanged(Event.V2N, State.STOP)
CallerVisualAngleManager.changeAngle(Default())
}
},

6
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java
View File

@@ -1,5 +1,7 @@
package com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.road;
import android.telecom.Call;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.eagle.core.data.enums.CommunicationType;
import com.mogo.eagle.core.data.enums.DataSourceType;
@@ -15,6 +17,8 @@ import com.mogo.eagle.core.data.msgbox.V2XMsg;
import com.mogo.eagle.core.function.angle.scenes.Default;
import com.mogo.eagle.core.function.angle.scenes.RoadEvent;
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener;
import com.mogo.eagle.core.function.api.hmi.xiaozhi.event.Event;
import com.mogo.eagle.core.function.api.hmi.xiaozhi.state.State;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager;
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager;
@@ -157,6 +161,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
@Override
public void onShow() {
CallerHmiManager.INSTANCE.notifyXiaoZhiStatusChanged(Event.V2N, State.START);
V2XMessageEntity<V2XRoadEventEntity> entity = getV2XMessageEntity();
if (entity != null) {
V2XRoadEventEntity content = entity.getContent();
@@ -185,6 +190,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
@Override
public void onDismiss() {
CallerHmiManager.INSTANCE.notifyXiaoZhiStatusChanged(Event.V2N, State.STOP);
if (isNeedChangeAngle()) {
CallerVisualAngleManager.INSTANCE.changeAngle(new Default(3, TimeUnit.SECONDS));
}

2
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt
View File

@@ -191,6 +191,8 @@ class DevaToolsProvider : IDevaToolsProvider {
.enableEvilMethodTrace(true) // 慢方法
.enableAnrTrace(true) // anr
.enableStartup(true) // app启动
.enableTouchEventTrace(true)// 监听View的Touch事件卡顿
.enableIdleHandlerTrace(true)// 监听IdleHandler中的卡顿
.isDebug(true) // debug包
.isDevEnv(true) // dev环境
.build()

3
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/block/MoGoBlockProviderImpl.kt
View File

@@ -28,7 +28,8 @@ internal class MoGoBlockProviderImpl: IMoGoBlockProvider, IBlockListener {
.isDebug(false)
.period(5, SECONDS)
.junkRateThreshold(0.6f)
.recorder(null, 500, 500)
.maxDuration(SECONDS.toMillis(15))
.maxCount(1000)
.build())
hasInit = true
}

16
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt
View File

@@ -41,14 +41,20 @@ internal class StatusAdapter(val ctx: Context, var data: ArrayList<Status>): Rec
}
fun bind(status: Status) {
itemView.onClick {
// ToastUtils.showShort(getText(status))
if (status is OverViewStatus) {
if (status !is OverViewStatus) {
itemView.setOnClickListener(null)
itemView.isClickable = false
if (iv.drawable != null) {
iv.setImageDrawable(null)
}
} else {
if (iv.background != null) {
iv.background = null
}
itemView.onClick {
CallerHmiManager.showStatusSummaryDialog()
}
}
iv.setBackgroundResource(0)
iv.setImageDrawable(null)
when(status) {
is IpcStatus -> {
if (status.enabled) {

7
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
View File

@@ -136,18 +136,11 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor(
sopLayout.setOnClickListener {
clickListener?.showSOPSettingView()
}
managerLayout.setOnClickListener {
//录包管理页面
clickListener?.showBadCaseManagerView()
}
//BadCase上报
CallerDevaToolsManager.initAiCollect(badCaseLayout)
ivDebugPanel.setOnClickListener {
clickListener?.showDebugPanelView()
}
ivDebugFeedback.onClick {
clickListener?.showFeedbackView()
}
if (AppConfigInfo.isConnectAutopilot) {
CallerAutoPilotControlManager.getCarConfig()

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
View File

@@ -262,7 +262,7 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,
.setSelectedSoList(
arrayOf(
"libhdmap", "libmap",
"libAMapSDK_NAVI_v8_0_1", "libZegoExpressEngine",
"libAMapSDK_NAVI_v9_8_3", "libZegoExpressEngine",
"libcntts"
)
)

96
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
View File

@@ -72,28 +72,26 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/feedback"
android:id="@+id/badCaseLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="@dimen/dp_216"
android:layout_marginStart="142dp">
<ImageView
android:id="@+id/ivDebugFeedback"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_centerHorizontal="true"
android:background="@drawable/debug_icon_feedback" />
android:background="@drawable/debug_icon_bad_case" />
<TextView
android:id="@+id/tvDebugFeedback"
android:layout_width="wrap_content"
android:layout_height="42dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="23dp"
android:text="@string/debug_panel_fb"
android:text="@string/debug_bad_case_report"
android:textColor="@color/color_FFA7B6F0"
android:textSize="32dp" />
</RelativeLayout>
<RelativeLayout
@@ -148,57 +146,14 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/managerLayout"
<com.mogo.eagle.core.function.hmi.ui.widget.CheckSystemView
android:id="@+id/checkSystemView"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_216"
android:layout_marginStart="142dp"
app:layout_constraintBottom_toBottomOf="@id/sopLayout"
app:layout_constraintLeft_toRightOf="@id/sopLayout"
app:layout_constraintTop_toTopOf="@id/sopLayout">
app:layout_constraintTop_toTopOf="@id/sopLayout" />
<ImageView
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_centerHorizontal="true"
android:background="@drawable/debug_icon_bag_manager" />
<TextView
android:layout_width="wrap_content"
android:layout_height="42dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="@string/debug_bad_case_manager"
android:textColor="@color/color_FFA7B6F0"
android:textSize="32dp" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/badCaseLayout"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_216"
android:layout_marginStart="142dp"
app:layout_constraintBottom_toBottomOf="@id/managerLayout"
app:layout_constraintLeft_toRightOf="@id/managerLayout"
app:layout_constraintTop_toTopOf="@id/managerLayout">
<ImageView
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_centerHorizontal="true"
android:background="@drawable/debug_icon_bad_case" />
<TextView
android:layout_width="wrap_content"
android:layout_height="42dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="@string/debug_bad_case_report"
android:textColor="@color/color_FFA7B6F0"
android:textSize="32dp" />
</RelativeLayout>
<TextView
android:id="@+id/tv_check_title"
@@ -316,39 +271,6 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:layout_width="14dp"
android:layout_height="50dp"
android:layout_marginStart="80dp"
android:layout_marginTop="94dp"
android:background="@color/color_FF2966EC"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/clSpeedSet" />
<TextView
android:id="@+id/tvSystemOperation"
android:layout_width="168dp"
android:layout_height="86dp"
android:layout_marginStart="113dp"
android:layout_marginTop="76dp"
android:gravity="center"
android:text="@string/check_system_operation"
android:textColor="@color/color_FFFFFF"
android:textSize="42dp"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/clSpeedSet" />
<com.mogo.eagle.core.function.hmi.ui.widget.CheckSystemView
android:id="@+id/checkSystemView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvSystemOperation" />
<View
android:id="@+id/viewSystemVersion"
android:layout_width="14dp"
@@ -357,7 +279,7 @@
android:layout_marginTop="94dp"
android:background="@color/color_FF2966EC"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/checkSystemView" />
app:layout_constraintTop_toBottomOf="@id/clSpeedSet" />
<TextView
android:id="@+id/tvSystemVersion"

2
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_system.xml
View File

@@ -35,7 +35,7 @@
android:id="@+id/viewCheckReboot"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_marginStart="113dp"
android:layout_marginStart="@dimen/dp_142"
android:clickable="true"
android:src="@drawable/check_reboot"
app:layout_constraintLeft_toLeftOf="parent"

4
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java
View File

@@ -230,7 +230,9 @@ public class RouteOverlayDrawer {
if (colors != null && !colors.isEmpty()) {
builder.colors(colors);
builder.setIsGradient(true);
builder.setLightOn(false);
builder.setLightOn(true);
builder.setLightColor(COLOR_LIGHT);
builder.setLightSpeed(0.5f);
}
}
builder.points(points);