diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java index f46fc43e56..13112b4fff 100644 --- a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java +++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java @@ -193,26 +193,136 @@ public class CheckActivity extends AppCompatActivity { /** * **************************************************************************************软件测试 - * 时延 + * 自动驾驶侧: + * 1、车控节点 + *

+ * 2、轨迹地图加载节点 + *

+ * 3、轨迹规划节点 + *

+ * 4、定位转化节点 + *

+ * 5、融合节点 + *

+ * 6、yolov5节点(包含红绿灯检测) + *

+ * 7、激光雷达渲染节点 + *

+ * 8、摄像头驱动节点 + *

+ * 9、gnss定位驱动节点 + *

+ * 10、中激光驱动节点 + *

+ * 11、左激光解码节点 + *

+ * 12、左激光驱动节点 + *

+ * 13、右激光解码节点 + *

+ * 14、右激光驱动节点 + *

+ * 15、监控节点 + *

+ * 16、通讯交互节点 + *

+ * 17、轨迹录制节点 + *

+ * 18、can车辆控制节点 + *

+ * 数据上报频率 什么数据的上报频率 + *

+ * 时延 工控机->云 工控机->鹰眼 什么数据的时延 */ public void software() { - + time(); } /** * 时延 * 需要产品确认哪些指标? 定位+周边识别? */ - public void time() { + public long time() { final long start = System.nanoTime(); long adasDataTime = TimeUnit.NANOSECONDS.toMillis((System.nanoTime() - start)); Log.i("ADAS数据延时", "接收数据 -> 发出 cost :" + adasDataTime + "ms"); + return adasDataTime; } /** - * **************************************************************************************硬件测试 FROM ADAS + * **************************************************************************************硬件测试 + * 1、主激光雷达 + *

+ * 2、侧激光雷达-2个 + *

+ * 3、ADAS长焦摄像头-前 + *

+ * 4、ADAS广角摄像头-前 + *

+ * 5、ADAS标准摄像头-前 + *

+ * 6、ADAS广角摄像头-后 + *

+ * 7、RTK设备 + *

+ * 8、OBU设备 + *

+ * 9、路由器 */ public void hardware() { + CheckItemInfo itemInfo = new CheckItemInfo(); + itemInfo.setTitle("(下面 1 项存在异常)"); + itemInfo.setUsual(false); + + CheckItemInfo.DetailItem detailItem = new CheckItemInfo.DetailItem(); + detailItem.setTitle("主机光雷达"); + detailItem.setValue("异常"); + itemInfo.setItemList(detailItem); + + CheckItemInfo.DetailItem jiGuangLeft = new CheckItemInfo.DetailItem(); + jiGuangLeft.setTitle("左侧激光雷达"); + jiGuangLeft.setValue("异常"); + itemInfo.setItemList(jiGuangLeft); + + CheckItemInfo.DetailItem jiGuangRight = new CheckItemInfo.DetailItem(); + jiGuangRight.setTitle("右侧激光雷达"); + jiGuangRight.setValue("正常"); + itemInfo.setItemList(jiGuangRight); + + CheckItemInfo.DetailItem changjiao = new CheckItemInfo.DetailItem(); + changjiao.setTitle("ADAS长焦摄像头"); + changjiao.setValue("正常"); + itemInfo.setItemList(changjiao); + + CheckItemInfo.DetailItem guangJiaoFront = new CheckItemInfo.DetailItem(); + guangJiaoFront.setTitle("ADAS广焦摄像头-前"); + guangJiaoFront.setValue("正常"); + itemInfo.setItemList(guangJiaoFront); + + CheckItemInfo.DetailItem custom = new CheckItemInfo.DetailItem(); + custom.setTitle("ADAS标准摄像头"); + custom.setValue("正常"); + itemInfo.setItemList(custom); + + CheckItemInfo.DetailItem guangJiaoBe = new CheckItemInfo.DetailItem(); + guangJiaoBe.setTitle("ADAS广焦摄像头-后"); + guangJiaoBe.setValue("正常"); + itemInfo.setItemList(guangJiaoBe); + + CheckItemInfo.DetailItem rtk = new CheckItemInfo.DetailItem(); + rtk.setTitle("RTK设备"); + rtk.setValue("正常"); + itemInfo.setItemList(rtk); + + CheckItemInfo.DetailItem obu = new CheckItemInfo.DetailItem(); + obu.setTitle("OUB设备"); + obu.setValue("正常"); + itemInfo.setItemList(obu); + + CheckItemInfo.DetailItem luyou = new CheckItemInfo.DetailItem(); + luyou.setTitle("路由器"); + luyou.setValue("正常"); + itemInfo.setItemList(luyou); } diff --git a/modules/mogo-module-check/src/main/res/drawable/check_little_btn.xml b/modules/mogo-module-check/src/main/res/drawable/check_little_btn.xml new file mode 100644 index 0000000000..6ea2fa4947 --- /dev/null +++ b/modules/mogo-module-check/src/main/res/drawable/check_little_btn.xml @@ -0,0 +1,14 @@ + + + + //填充 + + //描边 + + + \ No newline at end of file diff --git a/modules/mogo-module-check/src/main/res/drawable/check_little_btn_green.xml b/modules/mogo-module-check/src/main/res/drawable/check_little_btn_green.xml new file mode 100644 index 0000000000..14b5651e19 --- /dev/null +++ b/modules/mogo-module-check/src/main/res/drawable/check_little_btn_green.xml @@ -0,0 +1,14 @@ + + + + //填充 + + //描边 + + + \ No newline at end of file diff --git a/modules/mogo-module-check/src/main/res/drawable/check_scan_first.png b/modules/mogo-module-check/src/main/res/drawable/check_scan_first.png new file mode 100644 index 0000000000..b5b5db831d Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/check_scan_first.png differ diff --git a/modules/mogo-module-check/src/main/res/drawable/check_scan_second.png b/modules/mogo-module-check/src/main/res/drawable/check_scan_second.png new file mode 100644 index 0000000000..2e82c94f54 Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/check_scan_second.png differ diff --git a/modules/mogo-module-check/src/main/res/layout/activity_check.xml b/modules/mogo-module-check/src/main/res/layout/activity_check.xml index f1189cb361..5777c7e7a6 100644 --- a/modules/mogo-module-check/src/main/res/layout/activity_check.xml +++ b/modules/mogo-module-check/src/main/res/layout/activity_check.xml @@ -4,13 +4,13 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".view.CheckActivity" - android:background="@color/blue_back_color"> + android:background="@color/blue_back_color" + tools:context=".view.CheckActivity"> + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-check/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-check/src/main/res/values-xhdpi-2560x1600/dimens.xml index 1b3f3ce780..a55589ed13 100644 --- a/modules/mogo-module-check/src/main/res/values-xhdpi-2560x1600/dimens.xml +++ b/modules/mogo-module-check/src/main/res/values-xhdpi-2560x1600/dimens.xml @@ -6,5 +6,8 @@ 133px 78px 50px + 1452px + 715px + 32px \ No newline at end of file diff --git a/modules/mogo-module-check/src/main/res/values/colors.xml b/modules/mogo-module-check/src/main/res/values/colors.xml index 640bbb1188..d98e77c4cb 100644 --- a/modules/mogo-module-check/src/main/res/values/colors.xml +++ b/modules/mogo-module-check/src/main/res/values/colors.xml @@ -3,5 +3,9 @@ #1A1F40 #4192FF #F03232 + #99FA1F21 + #FF1F1F + #997AFF87 + #7AFF87 \ No newline at end of file