lizhanwei
2020-03-23 e9f78e3f56c8fe8df1569e0bab1ac7938686a958
查看车载信号 speed除以10.0; 修改信号物理索引
4个文件已修改
81 ■■■■■ 已修改文件
app/src/main/assets/roadmap.json 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/assets/signal_config_file.json 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/InspectSignalFragment.java 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/layout_signal_slice.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/assets/roadmap.json
@@ -1,5 +1,6 @@
{
  "points": [0, 1, 1.6, 1, 2.55, 1, 3.05, 1, 4.55, 1, 5.003, 1, 6.003, 1, 9.003, 1, 9.003, 4, 0, 0.5, 9.003, 0.5, 0, 0, 1.6, 0, 2.55, 0, 3.05, 0, 4.55, 0, 5.003, 0, 5.003, -2, 5.003, -3, 5.003, -4, 6.003, -4, 7.003, -4, 9.003, -4, 10.003, -4, 10.003, -3, 10.003, 4, 6.003, 0, 9.003, 0, 6.003, 0, 6.003, -3, 9.003, -3, 9.003, 0, 5.503, 0, 5.503, -2, 5.503, -3.5, 7.003, -3.5, 9.503, -3.5, 9.503, 4, 1.6, 1, 1.6, 0, 2.55, 1, 2.55, 0, 3.05, 0, 3.05, 1, 4.55, 1, 4.55, 0, 5.003, 1, 5.003, 0, 6.003, 0, 6.003, 1, 6.003, -2, 5.003, -2, 6.003, -3, 5.003, -3, 5.003, -4, 6.003, -4, 9.003, -1, 10.003, -1, 9.003, 0, 10.003, 0, 10.003, 1, 9.003, 1],
  "points": [0, 1, 1.6, 1, 2.55, 1, 3.05, 1, 4.55, 1, 5.003, 1, 6.003, 1, 9.003, 1, 9.003, 4, 0, 0.5, 9.003, 0.5, 0, 0, 1.6, 0, 2.55, 0, 3.05, 0, 4.55, 0, 5.003, 0, 5.003, -2, 5.003, -3, 5.003, -4, 6.003, -4, 7.003, -4, 9.003, -4, 10.003, -4, 10.003, -3, 10.003, 4, 6.003, 0, 9.003, 0, 6.003, 0, 6.003, -3, 9.003, -3, 9.003, 0, 5.503, 0, 5.503, -2, 5.503, -3.5, 7.003, -3.5, 9.503, -3.5, 9.503, 4, 1.6, 1, 1.6, 0, 2.55, 1, 2.55, 0, 3.05, 0, 3.05, 1, 4.55, 1, 4.55, 0, 5.003, 1, 5.003, 0, 6.003, 0, 6.003, 1, 6.003, -2, 5.003, -2, 6.003, -3, 5.003, -3, 5.003, -4, 6.003, -4, 9.003, -1, 10.003, -1, 9.003, 0, 10.003, 0, 10.003, 1, 9.003, 1,11.003,4,11.003,-4,10.5003,4,10.5003,-4,
    10.003,3,9.003,3,10.003,4,9.003,4,11.003,4,10.003,4,11.003,3,10.003,3],
  "maps": [{
    "id": 1000,
    "item": 100,
@@ -7,17 +8,20 @@
      [0, 1, 2, 3, 4, 5, 6, 7, 8],
      [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25],
      [26, 27],
      [28, 29, 30, 31]
      [28, 29, 30, 31],
      [62,63]
    ],
    "green_line": [
      [9, 10],
      [32, 33, 34, 35, 36, 37]
      [32, 33, 34, 35, 36, 37],
      [64, 65]
    ],
    "all_trigger_line": [
      [1002, 39, 38],
      [1003, 45, 44],
      [1004, 57, 56],
      [1005, 51, 50]
      [1005, 51, 50],
      [1006, 66, 67]
    ],
    "red_area": [
      [40, 41, 42, 43]
@@ -54,5 +58,12 @@
    "end_line": [54, 55],
    "area": [50,51,54,55],
    "stop_flag": 0
  }, {
    "id": 1006,
    "item": 110,
    "tts": "前方掉头",
    "stop_line": [68, 69],
    "area": [67,69,70,72],
    "stop_flag": 0
  }]
}
app/src/main/assets/signal_config_file.json
@@ -1,56 +1,56 @@
[
  {
    "signalName": "安全带",
    "signalName": "雾灯",
    "index":1,
    "id":0,
    "highLevel":2,
    "mainBoard":2
  },
  {
    "signalName": "左转向",
    "signalName": "三档",
    "index":2,
    "id":1,
    "highLevel":2,
    "mainBoard":2
  },
  {
    "signalName": "右转向",
    "signalName": "手刹",
    "index":3,
    "id":2,
    "highLevel":2,
    "mainBoard":2
  },
  {
    "signalName": "手刹",
    "signalName": "一档",
    "index":4,
    "id":3,
    "highLevel":2,
    "mainBoard":2
  },
  {
    "signalName": "脚刹",
    "signalName": "副刹",
    "index":5,
    "id":4,
    "highLevel":2,
    "mainBoard":2
  },
  {
    "signalName": "近光灯",
    "signalName": "安全带",
    "index":6,
    "id":5,
    "highLevel":2,
    "mainBoard":2
  },
  {
    "signalName": "远光灯",
    "signalName": "二档",
    "index":7,
    "id":6,
    "highLevel":2,
    "mainBoard":2
  },
  {
    "signalName": "门锁",
    "signalName": "脚刹",
    "index":8,
    "id":7,
    "highLevel":2,
@@ -64,49 +64,49 @@
    "mainBoard":2
  },
  {
    "signalName": "1档",
    "signalName": "门锁",
    "index":10,
    "id":9,
    "highLevel":2,
    "mainBoard":2
  },
  {
    "signalName": "2档",
    "signalName": "START位",
    "index":11,
    "id":10,
    "highLevel":2,
    "mainBoard":2
  },
  {
    "signalName": "3档",
    "signalName": "远光",
    "index":12,
    "id":11,
    "highLevel":2,
    "mainBoard":2
  },
  {
    "signalName": "4档",
    "signalName": "绕车一",
    "index":13,
    "id":12,
    "highLevel":2,
    "mainBoard":2
  },
  {
    "signalName": "5档",
    "signalName": "近光",
    "index":14,
    "id":13,
    "highLevel":2,
    "mainBoard":2
  },
  {
    "signalName": "倒档",
    "signalName": "左转",
    "index":15,
    "id":14,
    "highLevel":2,
    "mainBoard":2
  },
  {
    "signalName": "START位",
    "signalName": "右转",
    "index":16,
    "id":15,
    "highLevel":0,
app/src/main/java/safeluck/drive/evaluation/fragment/InspectSignalFragment.java
@@ -70,28 +70,28 @@
                                @Override
                                public void run() {
                                    bingding.tvRoateSpeed.setText(String.valueOf(mcuInfo.getEngine()));
                                    bingding.tvDangweiNum.setText(String.valueOf(mcuInfo.getSpeed()));
                                    bingding.tvDangweiNum.setText(String.valueOf(mcuInfo.getSpeed()/10.0));
                                    for (int i = 0; i < gpios.size(); i++) {
                                        Log.i(TAG, "run: gpio["+i+"]="+gpios.get(i));
                                    }
                                    bingding.inpsetSignalSlice.tvSeatBelt.setCompoundDrawablesWithIntrinsicBounds(gpios.get(0)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvTrunLeft.setCompoundDrawablesWithIntrinsicBounds(gpios.get(1)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvTurnRight.setCompoundDrawablesWithIntrinsicBounds(gpios.get(2)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvParkingBrake.setCompoundDrawablesWithIntrinsicBounds(gpios.get(3)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvFootBrake.setCompoundDrawablesWithIntrinsicBounds(gpios.get(4)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvLowLamp.setCompoundDrawablesWithIntrinsicBounds(gpios.get(5)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvHighBeam.setCompoundDrawablesWithIntrinsicBounds(gpios.get(6)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvSeatBelt.setCompoundDrawablesWithIntrinsicBounds(gpios.get(5)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvTrunLeft.setCompoundDrawablesWithIntrinsicBounds(gpios.get(14)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvTurnRight.setCompoundDrawablesWithIntrinsicBounds(gpios.get(15)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvParkingBrake.setCompoundDrawablesWithIntrinsicBounds(gpios.get(2)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvFootBrake.setCompoundDrawablesWithIntrinsicBounds(gpios.get(7)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvLowLamp.setCompoundDrawablesWithIntrinsicBounds(gpios.get(13)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvHighBeam.setCompoundDrawablesWithIntrinsicBounds(gpios.get(11)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvGateLock.setCompoundDrawablesWithIntrinsicBounds(gpios.get(7)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvGateLock.setCompoundDrawablesWithIntrinsicBounds(gpios.get(9)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvNullEngine.setCompoundDrawablesWithIntrinsicBounds(gpios.get(8)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvGearOne.setCompoundDrawablesWithIntrinsicBounds(gpios.get(9)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvGearTwo.setCompoundDrawablesWithIntrinsicBounds(gpios.get(10)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvGearThree.setCompoundDrawablesWithIntrinsicBounds(gpios.get(11)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvGearFour.setCompoundDrawablesWithIntrinsicBounds(gpios.get(12)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvGearOne.setCompoundDrawablesWithIntrinsicBounds(gpios.get(3)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvGearTwo.setCompoundDrawablesWithIntrinsicBounds(gpios.get(6)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvGearThree.setCompoundDrawablesWithIntrinsicBounds(gpios.get(1)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvGearFour.setCompoundDrawablesWithIntrinsicBounds(gpios.get(4)==VALIAD_NUM?leftGreen:leftGray,null,null,null);//副刹
                                    bingding.inpsetSignalSlice.tvGearFive.setCompoundDrawablesWithIntrinsicBounds(gpios.get(13)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvWindingOne.setCompoundDrawablesWithIntrinsicBounds(gpios.get(14)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvWindingTwo.setCompoundDrawablesWithIntrinsicBounds(gpios.get(15)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvWindingOne.setCompoundDrawablesWithIntrinsicBounds(gpios.get(12)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                    bingding.inpsetSignalSlice.tvWindingTwo.setCompoundDrawablesWithIntrinsicBounds(gpios.get(10)==VALIAD_NUM?leftGreen:leftGray,null,null,null);
                                }
                            });
                        }
app/src/main/res/layout/layout_signal_slice.xml
@@ -124,7 +124,7 @@
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="档位四"
            android:text="副刹"
            android:layout_marginLeft="30dp"
            android:id="@+id/tv_gear_four"
            android:drawableLeft="@drawable/gray_light"