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

fix bug and add biz lock state of view

Browse Source
This commit is contained in:
zhongchao
2022-09-26 17:45:22 +08:00
parent b113afe827
commit 4b07a4c98b
5 changed files with 105 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,7 +81,7 @@ class FuncConfigConst {
val foundationSubList = mutableListOf<SubBiz>()
foundationSubList.add(SubBiz(BIZ_BEAUTY_MODE, lock = false, state = false, dependNode = "", data = ""))
foundationSubList.add(SubBiz(BIZ_RAIN_MODE, lock = false, state = false, dependNode = "", data = ""))
foundationSubList.add(SubBiz(BIZ_FULL_LOG, lock = false, state = false, dependNode = "", data = ""))
foundationSubList.add(SubBiz(BIZ_FULL_LOG, lock = false, state = true, dependNode = "", data = ""))
foundationSubList.add(SubBiz(BIZ_TRACE_LOG, lock = false, state = true, dependNode = "", data = ""))
foundationSubList.add(SubBiz(BIZ_BAG_RECORD, lock = false, state = true, dependNode = "", data = ""))
foundationSubList.add(SubBiz(BIZ_WARNING_UPLOAD, lock = false, state = true, dependNode = "", data = ""))

36
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
View File

@@ -1857,28 +1857,48 @@ class DebugSettingView @JvmOverloads constructor(
override fun updateBizData(type: String, state: Boolean, lock: Boolean, data: String?) {
when (type) {
BIZ_BEAUTY_MODE -> tbIsDemoMode.isClickable = !lock
BIZ_RAIN_MODE -> tbIsRainMode.isClickable = !lock
BIZ_WARNING_UPLOAD -> tbReportWarning.isClickable = !lock
BIZ_BEAUTY_MODE -> {
tbIsDemoMode.isClickable = !lock
if(lock){
tbIsDemoMode.background = resources.getDrawable(R.drawable.radio_button_lock_background)
}else{
tbIsDemoMode.background = resources.getDrawable(R.drawable.radio_button_normal_background_right)
}
}
BIZ_RAIN_MODE -> {
tbIsRainMode.isClickable = !lock
if(lock){
tbIsRainMode.background = resources.getDrawable(R.drawable.radio_button_lock_background)
}else{
tbIsRainMode.background = resources.getDrawable(R.drawable.radio_button_normal_background_right)
}
}
BIZ_WARNING_UPLOAD -> {
tbReportWarning.isClickable = !lock
if(lock){
tbReportWarning.background = resources.getDrawable(R.drawable.radio_button_lock_background)
}else{
tbReportWarning.background = resources.getDrawable(R.drawable.radio_button_normal_background_right)
}
}
BIZ_BAG_RECORD -> {
if (lock) {
btnRecordBag.isClickable = false
btnRecordBag.background = resources.getDrawable(R.drawable.radio_button_lock_background)
} else {
btnRecordBag.isClickable = true
btnRecordBag.requestFocus()
btnRecordBag.background = resources.getDrawable(R.drawable.radio_button_normal_background_right)
}
}
BIZ_FULL_LOG -> {
if(state){
tbLogCatch.visibility = View.VISIBLE
}else{
tbLogCatch.visibility = View.GONE
}
if (lock) {
tbLogCatch.isClickable = false
tbLogCatch.background = resources.getDrawable(R.drawable.radio_button_lock_background)
} else {
tbLogCatch.isClickable = true
tbLogCatch.requestFocus()
tbLogCatch.background = resources.getDrawable(R.drawable.radio_button_normal_background_right)
}
}
}

15
core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_lock_background.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@android:color/darker_gray" />
<stroke
android:width="1px"
android:color="#337CC4" />
<padding
android:bottom="1px"
android:left="1px"
android:right="1px"
android:top="1px" />
<corners android:topRightRadius="4dp" android:bottomRightRadius="4dp" />
</shape>

134
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
View File

@@ -46,12 +46,12 @@
style="@style/DebugSettingText"
android:layout_width="0dp"
android:layout_height="0dp"
android:gravity="center_vertical"
app:layout_constraintBottom_toBottomOf="@id/tbReportMore"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/tbReportMore"
app:layout_constraintTop_toBottomOf="@id/vReportLine"
app:layout_constraintTop_toTopOf="@id/tbReportMore"
android:gravity="center_vertical"/>
app:layout_constraintTop_toTopOf="@id/tbReportMore" />
<View
android:id="@+id/vReportSrcLine"
@@ -143,8 +143,7 @@
android:id="@+id/tvAppVersionNameKey"
style="@style/DebugSettingText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:layout_height="wrap_content" />
<View
android:layout_width="match_parent"
@@ -155,8 +154,7 @@
android:id="@+id/tvPadSnKey"
style="@style/DebugSettingText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:layout_height="wrap_content" />
<View
android:layout_width="match_parent"
@@ -167,8 +165,7 @@
android:id="@+id/tvMoGoMapVersionKey"
style="@style/DebugSettingText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:layout_height="wrap_content" />
<View
android:layout_width="match_parent"
@@ -179,8 +176,7 @@
android:id="@+id/tvIpcVersionInfoKey"
style="@style/DebugSettingText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:layout_height="wrap_content" />
<View
android:layout_width="match_parent"
@@ -203,7 +199,7 @@
style="@style/DebugSettingText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minLines="7"/>
android:minLines="7" />
<View
android:layout_width="match_parent"
@@ -215,33 +211,33 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dp_10"
android:background="@drawable/radio_button_normal_background_right"
android:textColor="#000"
android:textOff="开启美化模式"
android:textOn="关闭美化模式"
android:textSize="@dimen/dp_24"
android:background="@drawable/radio_button_normal_background_right"/>
android:textSize="@dimen/dp_24" />
<ToggleButton
android:id="@+id/tbIsRainMode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dp_10"
android:background="@drawable/radio_button_normal_background_right"
android:textColor="#000"
android:textOff="开启雨天模式"
android:textOn="关闭雨天模式"
android:textSize="@dimen/dp_24"
android:background="@drawable/radio_button_normal_background_right"/>
android:textSize="@dimen/dp_24" />
<ToggleButton
android:id="@+id/tbBeautyMode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dp_10"
android:background="@drawable/radio_button_normal_background_right"
android:textColor="#000"
android:textOff="开启感知优化模式"
android:textOn="关闭感知优化模式"
android:textSize="@dimen/dp_24"
android:background="@drawable/radio_button_normal_background_right"/>
android:textSize="@dimen/dp_24" />
<ToggleButton
android:id="@+id/tbMojie"
@@ -263,8 +259,8 @@
android:paddingStart="@dimen/dp_20"
android:paddingEnd="@dimen/dp_20"
android:text="开启手势滑动"
android:visibility="gone"
android:textSize="@dimen/dp_24"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -273,10 +269,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dp_10"
android:text="重启IPC节点"
android:textSize="@dimen/dp_24"
android:background="@drawable/radio_button_normal_background_right"
/>
android:text="重启IPC节点"
android:textSize="@dimen/dp_24" />
<ToggleButton
android:id="@+id/tbDeviceBind"
@@ -311,18 +306,16 @@
android:id="@+id/tvPadSnClip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="复制"
android:layout_margin="@dimen/dp_10"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:textSize="14sp"
android:text="复制"
android:textColor="#0000FF"
/>
android:textSize="14sp" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
@@ -441,12 +434,11 @@
android:id="@+id/tvIpcVersionInfoClip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="复制"
android:textSize="14sp"
android:textColor="#0000FF"
android:layout_gravity="center"
android:gravity="center"
/>
android:text="复制"
android:textColor="#0000FF"
android:textSize="14sp" />
</LinearLayout>
@@ -624,13 +616,12 @@
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swDevelopMode"
style="@style/DebugSettingText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:text="开发者模式"
style="@style/DebugSettingText"
android:visibility="gone"
/>
android:visibility="gone" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/commonLayout"
@@ -652,19 +643,19 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#F0F0F0"
app:layout_constraintTop_toBottomOf="@id/tvIpcInfo"
/>
app:layout_constraintTop_toBottomOf="@id/tvIpcInfo" />
<Button
android:id="@+id/btnRecordBag"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/radio_button_normal_background_right"
android:gravity="center"
android:padding="@dimen/dp_5"
android:text="录制Bag包"
android:textSize="@dimen/dp_24"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvIpcInfoDivider"/>
app:layout_constraintTop_toBottomOf="@id/tvIpcInfoDivider" />
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp"
@@ -720,12 +711,11 @@
android:id="@+id/tvCarInfoCopyClip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="复制经纬度"
android:layout_marginStart="@dimen/dp_10"
android:textSize="14sp"
android:text="复制经纬度"
android:textColor="#0000FF"
app:layout_constraintTop_toBottomOf="@id/tvCarInfoCopy"
/>
android:textSize="14sp"
app:layout_constraintTop_toBottomOf="@id/tvCarInfoCopy" />
<TextView
android:id="@+id/tvIdentifyInfoCopy"
@@ -895,7 +885,7 @@
android:layout_height="1dp"
android:background="#F0F0F0"
app:layout_constraintTop_toBottomOf="@id/btnRecordPackage" />
<TextView
android:id="@+id/tvCarInfo"
style="@style/DebugSettingText"
@@ -1077,33 +1067,33 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dp_10"
android:orientation="horizontal"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:background="@drawable/debug_setting_edit_bg"
android:gravity="center_vertical">
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tvCurEnv"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:textColor="#000"
android:gravity="start"
android:layout_marginStart="@dimen/dp_10"
android:textSize="@dimen/dp_24"
android:layout_weight="1"
tools:text="当前环境:"/>
android:gravity="start"
android:textColor="#000"
android:textSize="@dimen/dp_24"
tools:text="当前环境:" />
<Button
android:id="@+id/btChangeEnv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_10"
android:padding="@dimen/dp_8"
android:text="切换环境"
android:textSize="@dimen/dp_24"
android:textColor="#1A1A1A"/>
android:textColor="#1A1A1A"
android:textSize="@dimen/dp_24" />
</androidx.appcompat.widget.LinearLayoutCompat>
<Button
@@ -1116,8 +1106,8 @@
android:paddingEnd="@dimen/dp_20"
android:text="设置刹车加速度阈值"
android:textSize="@dimen/dp_24"
app:layout_constraintTop_toBottomOf="@id/llChangeEnv"
app:layout_constraintLeft_toLeftOf="parent" />
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/llChangeEnv" />
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp"
@@ -1198,6 +1188,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dp_10"
android:background="@drawable/radio_button_normal_background_right"
android:textColor="#000"
android:textOff="开启异常上报提示"
android:textOn="关闭异常上报提示"
@@ -1205,6 +1196,7 @@
app:layout_constraintTop_toBottomOf="@id/btnConnectServerIp" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ToggleButton
android:id="@+id/tbHmiController"
android:layout_width="match_parent"
@@ -1618,9 +1610,9 @@
android:textOff="强制绘制路径规划"
android:textOn="强制绘制路径规划"
android:textSize="@dimen/dp_24"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintLeft_toRightOf="@id/tbIsDrawAutopilotTrajectoryData"
app:layout_constraintTop_toBottomOf="@id/tbIsDrawIdentifyData"/>
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/tbIsDrawIdentifyData" />
<ToggleButton
android:id="@+id/tbChangeAutoPilotStatus"
@@ -1631,9 +1623,9 @@
android:textOff="开启模拟自动驾驶中"
android:textOn="关闭模拟自动驾驶中"
android:textSize="@dimen/dp_24"
app:layout_constraintTop_toBottomOf="@id/tbIsDrawAutopilotTrajectoryData"
app:layout_constraintLeft_toLeftOf="@id/tbIsDrawAutopilotTrajectoryData"
app:layout_constraintRight_toRightOf="@id/tbIsDrawAutopilotTrajectoryData"/>
app:layout_constraintRight_toRightOf="@id/tbIsDrawAutopilotTrajectoryData"
app:layout_constraintTop_toBottomOf="@id/tbIsDrawAutopilotTrajectoryData" />
<ToggleButton
android:id="@+id/tbDrawPointCloudData"
@@ -1645,23 +1637,21 @@
android:textOff="开启渲染点云数据"
android:textOn="关闭渲染点云数据"
android:textSize="@dimen/dp_24"
app:layout_constraintTop_toBottomOf="@id/tbIsDrawAutopilotTrajectoryData"
app:layout_constraintLeft_toRightOf="@id/tbChangeAutoPilotStatus"
app:layout_constraintRight_toRightOf="parent"
/>
app:layout_constraintTop_toBottomOf="@id/tbIsDrawAutopilotTrajectoryData" />
<Button
android:id="@+id/btnPointCloudSize"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:padding="@dimen/dp_10"
android:layout_margin="2dp"
android:text="设置点云大小"
android:textSize="@dimen/dp_24"
app:layout_constraintTop_toBottomOf="@id/tbDrawPointCloudData"
app:layout_constraintLeft_toLeftOf="parent"
/>
app:layout_constraintTop_toBottomOf="@id/tbDrawPointCloudData" />
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/etPointCloudSize"
@@ -1676,24 +1666,22 @@
android:hint="请输入点云大小"
android:textColor="#1A1A1A"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="@id/btnPointCloudSize"
app:layout_constraintLeft_toRightOf="@id/btnPointCloudSize"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@id/btnPointCloudSize"
app:layout_constraintBottom_toBottomOf="@id/btnPointCloudSize"
/>
app:layout_constraintTop_toTopOf="@id/btnPointCloudSize" />
<Button
android:id="@+id/btnPointCloudColor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:padding="@dimen/dp_10"
android:layout_margin="2dp"
android:text="设置点云颜色"
android:textSize="@dimen/dp_24"
app:layout_constraintTop_toBottomOf="@id/btnPointCloudSize"
app:layout_constraintLeft_toLeftOf="parent"
/>
app:layout_constraintTop_toBottomOf="@id/btnPointCloudSize" />
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/etPointCloudColor"
@@ -1708,11 +1696,10 @@
android:hint="请输入点云颜色"
android:textColor="#1A1A1A"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="@id/btnPointCloudColor"
app:layout_constraintLeft_toRightOf="@id/btnPointCloudColor"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@id/btnPointCloudColor"
app:layout_constraintBottom_toBottomOf="@id/btnPointCloudColor"
/>
app:layout_constraintTop_toTopOf="@id/btnPointCloudColor" />
<RadioGroup
android:id="@+id/rgGpsProvider"
@@ -1926,8 +1913,7 @@
android:gravity="center"
android:textOff="打开「HD-MAP」Log"
android:textOn="关闭「HD-MAP」Log"
android:textSize="@dimen/dp_24"
/>
android:textSize="@dimen/dp_24" />
</com.google.android.flexbox.FlexboxLayout>

2
core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
View File

@@ -79,6 +79,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
return VipMessage::class.java
}
@BizConfig(V2N, "", BIZ_VIP)
override fun onMsgReceived(vipMessage: VipMessage?) {
CallerLogger.d("$M_V2X$TAG", "onMsgReceived vipMessage : ${vipMessage.toString()}")
vipMessage?.let {
@@ -189,7 +190,6 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
}
}
@BizConfig(V2N, "", BIZ_VIP)
private fun turnLight(controlTime: Int) {
if (result == null || mContext == null) return
val locationClient = CallerMapUIServiceManager.getSingletonLocationClient(mContext!!)