From 8735b56eefde751618c819f5b331a56a62274a5c Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 14 五月 2020 18:30:22 +0800
Subject: [PATCH] Merge branch 'newUI'

---
 app/src/main/assets/signal_config_file.json |   28 ++++++++--------------------
 1 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/app/src/main/assets/signal_config_file.json b/app/src/main/assets/signal_config_file.json
index 5285544..523379f 100644
--- a/app/src/main/assets/signal_config_file.json
+++ b/app/src/main/assets/signal_config_file.json
@@ -4,7 +4,6 @@
     "signalName": "闆剧伅",
     "index":1,
     "func_id":21,
-    "id":0,
     "highLevel":1,
     "mainBoard":2
   },
@@ -12,14 +11,12 @@
     "signalName": "涓夋。",
     "index":2,
     "func_id":11,
-    "id":1,
     "highLevel":1,
     "mainBoard":2
   },
   {
     "signalName": "鎵嬪埞",
     "index":3,
-    "id":2,
     "func_id":3,
     "highLevel":1,
     "mainBoard":2
@@ -28,7 +25,6 @@
     "signalName": "涓�妗�",
     "index":4,
     "func_id":9,
-    "id":3,
     "highLevel":1,
     "mainBoard":2
   },
@@ -36,14 +32,12 @@
     "signalName": "鍓埞",
     "index":5,
     "func_id":16,
-    "id":4,
     "highLevel":1,
     "mainBoard":2
   },
   {
     "signalName": "瀹夊叏甯�",
     "index":6,
-    "id":5,
     "func_id":0,
     "highLevel":1,
     "mainBoard":2
@@ -51,7 +45,6 @@
   {
     "signalName": "浜屾。",
     "index":7,
-    "id":6,
     "func_id":10,
     "highLevel":1,
     "mainBoard":2
@@ -59,7 +52,6 @@
   {
     "signalName": "鑴氬埞",
     "index":8,
-    "id":7,
     "func_id":4,
     "highLevel":1,
     "mainBoard":2
@@ -68,38 +60,33 @@
     "signalName": "绌烘尅",
     "index":9,
     "func_id":8,
-    "id":8,
     "highLevel":1,
     "mainBoard":2
   },
   {
     "signalName": "闂ㄩ攣",
-    "index":10,
     "func_id":7,
-    "id":9,
+    "index":10,
     "highLevel":1,
     "mainBoard":2
   },
   {
     "signalName": "START浣�",
-    "index":11,
     "func_id":15,
-    "id":10,
     "highLevel":1,
+    "index":11,
     "mainBoard":2
   },
   {
     "signalName": "杩滃厜",
     "index":12,
     "func_id":6,
-    "id":11,
     "highLevel":1,
     "mainBoard":2
   },
   {
     "signalName": "缁曡溅涓�",
     "index":13,
-    "id":12,
     "func_id":17,
     "highLevel":1,
     "mainBoard":2
@@ -108,7 +95,6 @@
     "signalName": "杩戝厜",
     "index":14,
     "func_id":5,
-    "id":13,
     "highLevel":1,
     "mainBoard":2
   },
@@ -116,14 +102,12 @@
     "signalName": "宸﹁浆",
     "index":15,
     "func_id":1,
-    "id":14,
     "highLevel":1,
     "mainBoard":2
   },
   {
     "signalName": "鍙宠浆",
     "index":16,
-    "id":15,
     "func_id":2,
     "highLevel":1,
     "mainBoard":2
@@ -139,7 +123,6 @@
   {
     "signalName": "缁曡溅涓�",
     "index":18,
-    "id":17,
     "func_id":19,
     "highLevel":1,
     "mainBoard":2
@@ -147,9 +130,14 @@
   {
     "signalName": "缁曡溅鍥�",
     "index":19,
-    "id":17,
     "func_id":20,
     "highLevel":1,
     "mainBoard":2
+  } , {
+    "signalName": "绀哄粨鐏�",
+    "index":20,
+    "func_id":22,
+    "highLevel":1,
+    "mainBoard":2
   }
 ]
\ No newline at end of file

--
Gitblit v1.8.0