Commit 2c25e05ce02d017cb058cd9bad178f89e2135547

Authored by 刘琴
2 parents 2b646f14 6769f08a

Merge branch 'master' of http://120.78.57.84/lee/Protocol

通讯协议-SDK应用部分.md
@@ -545,6 +545,7 @@ infos:{} @@ -545,6 +545,7 @@ infos:{}
545 |---|---|---| 545 |---|---|---|
546 |time|答题时间|单位秒| 546 |time|答题时间|单位秒|
547 |keySn|键盘Sn|| 547 |keySn|键盘Sn||
  548 +|keyId|键盘Id||
548 |keyValue|键值|键盘提交的值| 549 |keyValue|键值|键盘提交的值|
549 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)| 550 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)|
550 551
@@ -559,6 +560,7 @@ infos:{} @@ -559,6 +560,7 @@ infos:{}
559 "keyBattery":"2.52", 560 "keyBattery":"2.52",
560 "time": "2.42", 561 "time": "2.42",
561 "keySn": "1479824643", 562 "keySn": "1479824643",
  563 + "keyId": "00001",
562 "keyValue": "1234" 564 "keyValue": "1234"
563 }, 565 },
564 "packetTag": "1" 566 "packetTag": "1"
@@ -671,6 +673,7 @@ infos:{} @@ -671,6 +673,7 @@ infos:{}
671 |---|---|---| 673 |---|---|---|
672 |time|答题时间|单位秒| 674 |time|答题时间|单位秒|
673 |keySn|键盘Sn|| 675 |keySn|键盘Sn||
  676 +|keyId|键盘Id||
674 |keyValue|键值|键盘提交的值| 677 |keyValue|键值|键盘提交的值|
675 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)| 678 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)|
676 679
@@ -685,6 +688,7 @@ infos:{} @@ -685,6 +688,7 @@ infos:{}
685 "keyBattery":"2.52", 688 "keyBattery":"2.52",
686 "time": "0", 689 "time": "0",
687 "keySn": "1479824643", 690 "keySn": "1479824643",
  691 + "keyId": "00001",
688 "keyValue": "1234" 692 "keyValue": "1234"
689 }, 693 },
690 "packetTag": "1" 694 "packetTag": "1"
@@ -824,6 +828,7 @@ infos: {} @@ -824,6 +828,7 @@ infos: {}
824 |---|---|---| 828 |---|---|---|
825 |time|答题时间|单位秒| 829 |time|答题时间|单位秒|
826 |keySn|键盘Sn|| 830 |keySn|键盘Sn||
  831 +|keyId|键盘Id||
827 |keyValue|键值|键盘提交的值| 832 |keyValue|键值|键盘提交的值|
828 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)| 833 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)|
829 834
@@ -838,6 +843,7 @@ infos: {} @@ -838,6 +843,7 @@ infos: {}
838 "keyBattery":"2.52", 843 "keyBattery":"2.52",
839 "time": "2.42", 844 "time": "2.42",
840 "keySn": "1479824643", 845 "keySn": "1479824643",
  846 + "keyId": "00001",
841 "keyValue": "A" 847 "keyValue": "A"
842 }, 848 },
843 "packetTag": "1" 849 "packetTag": "1"
@@ -954,6 +960,7 @@ infos: {} @@ -954,6 +960,7 @@ infos: {}
954 |---|---|---| 960 |---|---|---|
955 | time|答题时间|单位秒| 961 | time|答题时间|单位秒|
956 |keySn|键盘Sn|| 962 |keySn|键盘Sn||
  963 +|keyId|键盘Id||
957 |keyValue|键值|键盘提交的值(1对、2错)| 964 |keyValue|键值|键盘提交的值(1对、2错)|
958 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)| 965 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)|
959 966
@@ -969,6 +976,7 @@ infos: {} @@ -969,6 +976,7 @@ infos: {}
969 "keyBattery":"2.52", 976 "keyBattery":"2.52",
970 "time": "2.42", 977 "time": "2.42",
971 "keySn": "1479824643", 978 "keySn": "1479824643",
  979 + "keyId": "00001",
972 "keyValue": "1" 980 "keyValue": "1"
973 }, 981 },
974 "packetTag": "1" 982 "packetTag": "1"
@@ -1091,6 +1099,7 @@ infos: {} @@ -1091,6 +1099,7 @@ infos: {}
1091 |---|---|---| 1099 |---|---|---|
1092 |time|答题时间|单位秒| 1100 |time|答题时间|单位秒|
1093 |keySn|键盘Sn|| 1101 |keySn|键盘Sn||
  1102 +|keyId|键盘Id||
1094 |keyValue|键值|键盘提交的值| 1103 |keyValue|键值|键盘提交的值|
1095 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)| 1104 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)|
1096 1105
@@ -1105,6 +1114,7 @@ infos: {} @@ -1105,6 +1114,7 @@ infos: {}
1105 "keyBattery":"2.52", 1114 "keyBattery":"2.52",
1106 "time": "2.42", 1115 "time": "2.42",
1107 "keySn": "1479824643", 1116 "keySn": "1479824643",
  1117 + "keyId": "00001",
1108 "keyValue": "AACDBDADBD" 1118 "keyValue": "AACDBDADBD"
1109 }, 1119 },
1110 "packetTag": "1" 1120 "packetTag": "1"
@@ -1441,6 +1451,7 @@ infos: {} @@ -1441,6 +1451,7 @@ infos: {}
1441 |---|---|---| 1451 |---|---|---|
1442 |time|答题时间|单位秒| 1452 |time|答题时间|单位秒|
1443 |keySn|键盘Sn|| 1453 |keySn|键盘Sn||
  1454 +|keyId|键盘Id||
1444 |keyValue|键值|键盘提交的值| 1455 |keyValue|键值|键盘提交的值|
1445 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)| 1456 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)|
1446 1457
@@ -1455,6 +1466,7 @@ infos: {} @@ -1455,6 +1466,7 @@ infos: {}
1455 "keyBattery":"2.52", 1466 "keyBattery":"2.52",
1456 "time": "1.42", 1467 "time": "1.42",
1457 "keySn": "1479824643", 1468 "keySn": "1479824643",
  1469 + "keyId": "00001",
1458 "keyValue": "1" 1470 "keyValue": "1"
1459 }, 1471 },
1460 "packetTag": "1" 1472 "packetTag": "1"
@@ -1577,6 +1589,7 @@ infos: {} @@ -1577,6 +1589,7 @@ infos: {}
1577 |---|---|---| 1589 |---|---|---|
1578 |time|答题时间|单位秒| 1590 |time|答题时间|单位秒|
1579 |keySn|键盘Sn|| 1591 |keySn|键盘Sn||
  1592 +|keyId|键盘Id||
1580 |keyValue|键值|键盘提交的值| 1593 |keyValue|键值|键盘提交的值|
1581 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)| 1594 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)|
1582 1595
@@ -1592,6 +1605,7 @@ infos: {} @@ -1592,6 +1605,7 @@ infos: {}
1592 "keyBattery":"2.52", 1605 "keyBattery":"2.52",
1593 "time": "2.42", 1606 "time": "2.42",
1594 "keySn": "1479824643", 1607 "keySn": "1479824643",
  1608 + "keyId": "00001",
1595 "keyValue": "12" 1609 "keyValue": "12"
1596 }, 1610 },
1597 "packetTag": "1" 1611 "packetTag": "1"
@@ -5117,7 +5131,10 @@ infos:{ &quot;keySn&quot;:&quot;1479824643&quot;}//返回键盘反馈模式参数值 @@ -5117,7 +5131,10 @@ infos:{ &quot;keySn&quot;:&quot;1479824643&quot;}//返回键盘反馈模式参数值
5117 5131
5118 | **Json字段** | **字段含义** | **赋值及含义** | 5132 | **Json字段** | **字段含义** | **赋值及含义** |
5119 | --- | --- | --- | 5133 | --- | --- | --- |
  5134 +|hModel|键盘型号代码||
5120 |keySn|键盘Sn|| 5135 |keySn|键盘Sn||
  5136 +|keyId|键盘Id||
  5137 +|keyVer|键盘固件版本||
5121 5138
5122 指令样例: 5139 指令样例:
5123 5140
@@ -5127,7 +5144,10 @@ infos:{ &quot;keySn&quot;:&quot;1479824643&quot;}//返回键盘反馈模式参数值 @@ -5127,7 +5144,10 @@ infos:{ &quot;keySn&quot;:&quot;1479824643&quot;}//返回键盘反馈模式参数值
5127 "baseId": 1, 5144 "baseId": 1,
5128 "baseSn":"2023031402", 5145 "baseSn":"2023031402",
5129 "infos": { 5146 "infos": {
5130 - "keySn": "1479824643" 5147 + "hModel": "79",
  5148 + "keyId": "00001",
  5149 + "keySn": "1479824643",
  5150 + "keyVer": "2.1.12"
5131 }, 5151 },
5132 "packetTag": "0" 5152 "packetTag": "0"
5133 } 5153 }
@@ -5752,12 +5772,12 @@ infos:{} //数组对象 @@ -5752,12 +5772,12 @@ infos:{} //数组对象
5752 "infos": [{ 5772 "infos": [{
5753 "baseId": "1", 5773 "baseId": "1",
5754 "keySn": "1837454011", 5774 "keySn": "1837454011",
5755 - "ver": "1.0.6" 5775 + "keyVer": "1.0.6"
5756 }, 5776 },
5757 { 5777 {
5758 "baseId": "1", 5778 "baseId": "1",
5759 "keySn": "1837454012", 5779 "keySn": "1837454012",
5760 - "ver": "1.0.6" 5780 + "keyVer": "1.0.6"
5761 } 5781 }
5762 ], 5782 ],
5763 "packetTag": "1" 5783 "packetTag": "1"
@@ -5783,7 +5803,6 @@ params:{ @@ -5783,7 +5803,6 @@ params:{
5783 "times":1 //基站扫描键盘时长,单位秒 范围1-10秒 5803 "times":1 //基站扫描键盘时长,单位秒 范围1-10秒
5784 } // 5804 } //
5785 5805
5786 -  
5787 指令样例: 5806 指令样例:
5788 5807
5789 ```json 5808 ```json
通讯协议-SDK应用部分[内部].md
@@ -545,6 +545,7 @@ infos:{} @@ -545,6 +545,7 @@ infos:{}
545 |---|---|---| 545 |---|---|---|
546 |time|答题时间|单位秒| 546 |time|答题时间|单位秒|
547 |keySn|键盘Sn|| 547 |keySn|键盘Sn||
  548 +|keyId|键盘Id||
548 |keyValue|键值|键盘提交的值| 549 |keyValue|键值|键盘提交的值|
549 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)| 550 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)|
550 551
@@ -559,6 +560,7 @@ infos:{} @@ -559,6 +560,7 @@ infos:{}
559 "keyBattery":"2.52", 560 "keyBattery":"2.52",
560 "time": "2.42", 561 "time": "2.42",
561 "keySn": "1479824643", 562 "keySn": "1479824643",
  563 + "keyId": "00001",
562 "keyValue": "1234" 564 "keyValue": "1234"
563 }, 565 },
564 "packetTag": "1" 566 "packetTag": "1"
@@ -671,6 +673,7 @@ infos:{} @@ -671,6 +673,7 @@ infos:{}
671 |---|---|---| 673 |---|---|---|
672 |time|答题时间|单位秒| 674 |time|答题时间|单位秒|
673 |keySn|键盘Sn|| 675 |keySn|键盘Sn||
  676 +|keyId|键盘Id||
674 |keyValue|键值|键盘提交的值| 677 |keyValue|键值|键盘提交的值|
675 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)| 678 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)|
676 679
@@ -685,6 +688,7 @@ infos:{} @@ -685,6 +688,7 @@ infos:{}
685 "keyBattery":"2.52", 688 "keyBattery":"2.52",
686 "time": "0", 689 "time": "0",
687 "keySn": "1479824643", 690 "keySn": "1479824643",
  691 + "keyId": "00001",
688 "keyValue": "1234" 692 "keyValue": "1234"
689 }, 693 },
690 "packetTag": "1" 694 "packetTag": "1"
@@ -824,6 +828,7 @@ infos: {} @@ -824,6 +828,7 @@ infos: {}
824 |---|---|---| 828 |---|---|---|
825 |time|答题时间|单位秒| 829 |time|答题时间|单位秒|
826 |keySn|键盘Sn|| 830 |keySn|键盘Sn||
  831 +|keyId|键盘Id||
827 |keyValue|键值|键盘提交的值| 832 |keyValue|键值|键盘提交的值|
828 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)| 833 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)|
829 834
@@ -838,6 +843,7 @@ infos: {} @@ -838,6 +843,7 @@ infos: {}
838 "keyBattery":"2.52", 843 "keyBattery":"2.52",
839 "time": "2.42", 844 "time": "2.42",
840 "keySn": "1479824643", 845 "keySn": "1479824643",
  846 + "keyId": "00001",
841 "keyValue": "A" 847 "keyValue": "A"
842 }, 848 },
843 "packetTag": "1" 849 "packetTag": "1"
@@ -954,6 +960,7 @@ infos: {} @@ -954,6 +960,7 @@ infos: {}
954 |---|---|---| 960 |---|---|---|
955 | time|答题时间|单位秒| 961 | time|答题时间|单位秒|
956 |keySn|键盘Sn|| 962 |keySn|键盘Sn||
  963 +|keyId|键盘Id||
957 |keyValue|键值|键盘提交的值(1对、2错)| 964 |keyValue|键值|键盘提交的值(1对、2错)|
958 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)| 965 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)|
959 966
@@ -969,6 +976,7 @@ infos: {} @@ -969,6 +976,7 @@ infos: {}
969 "keyBattery":"2.52", 976 "keyBattery":"2.52",
970 "time": "2.42", 977 "time": "2.42",
971 "keySn": "1479824643", 978 "keySn": "1479824643",
  979 + "keyId": "00001",
972 "keyValue": "1" 980 "keyValue": "1"
973 }, 981 },
974 "packetTag": "1" 982 "packetTag": "1"
@@ -1091,6 +1099,7 @@ infos: {} @@ -1091,6 +1099,7 @@ infos: {}
1091 |---|---|---| 1099 |---|---|---|
1092 |time|答题时间|单位秒| 1100 |time|答题时间|单位秒|
1093 |keySn|键盘Sn|| 1101 |keySn|键盘Sn||
  1102 +|keyId|键盘Id||
1094 |keyValue|键值|键盘提交的值| 1103 |keyValue|键值|键盘提交的值|
1095 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)| 1104 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)|
1096 1105
@@ -1105,6 +1114,7 @@ infos: {} @@ -1105,6 +1114,7 @@ infos: {}
1105 "keyBattery":"2.52", 1114 "keyBattery":"2.52",
1106 "time": "2.42", 1115 "time": "2.42",
1107 "keySn": "1479824643", 1116 "keySn": "1479824643",
  1117 + "keyId": "00001",
1108 "keyValue": "AACDBDADBD" 1118 "keyValue": "AACDBDADBD"
1109 }, 1119 },
1110 "packetTag": "1" 1120 "packetTag": "1"
@@ -1471,6 +1481,7 @@ infos: {} @@ -1471,6 +1481,7 @@ infos: {}
1471 |---|---|---| 1481 |---|---|---|
1472 |time|答题时间|单位秒| 1482 |time|答题时间|单位秒|
1473 |keySn|键盘Sn|| 1483 |keySn|键盘Sn||
  1484 +|keyId|键盘Id||
1474 |keyValue|键值|键盘提交的值| 1485 |keyValue|键值|键盘提交的值|
1475 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)| 1486 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)|
1476 1487
@@ -1485,6 +1496,7 @@ infos: {} @@ -1485,6 +1496,7 @@ infos: {}
1485 "keyBattery":"2.52", 1496 "keyBattery":"2.52",
1486 "time": "1.42", 1497 "time": "1.42",
1487 "keySn": "1479824643", 1498 "keySn": "1479824643",
  1499 + "keyId": "00001",
1488 "keyValue": "1" 1500 "keyValue": "1"
1489 }, 1501 },
1490 "packetTag": "1" 1502 "packetTag": "1"
@@ -1607,6 +1619,7 @@ infos: {} @@ -1607,6 +1619,7 @@ infos: {}
1607 |---|---|---| 1619 |---|---|---|
1608 |time|答题时间|单位秒| 1620 |time|答题时间|单位秒|
1609 |keySn|键盘Sn|| 1621 |keySn|键盘Sn||
  1622 +|keyId|键盘Id||
1610 |keyValue|键值|键盘提交的值| 1623 |keyValue|键值|键盘提交的值|
1611 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)| 1624 |keyBattery|电池状态|S6键盘电压值(V)<br>T2键盘电量值(%)|
1612 1625
@@ -1622,6 +1635,7 @@ infos: {} @@ -1622,6 +1635,7 @@ infos: {}
1622 "keyBattery":"2.52", 1635 "keyBattery":"2.52",
1623 "time": "2.42", 1636 "time": "2.42",
1624 "keySn": "1479824643", 1637 "keySn": "1479824643",
  1638 + "keyId": "00001",
1625 "keyValue": "12" 1639 "keyValue": "12"
1626 }, 1640 },
1627 "packetTag": "1" 1641 "packetTag": "1"
@@ -6291,7 +6305,10 @@ infos:{ &quot;keySn&quot;:&quot;1479824643&quot;}//返回键盘反馈模式参数值 @@ -6291,7 +6305,10 @@ infos:{ &quot;keySn&quot;:&quot;1479824643&quot;}//返回键盘反馈模式参数值
6291 6305
6292 | **Json字段** | **字段含义** | **赋值及含义** | 6306 | **Json字段** | **字段含义** | **赋值及含义** |
6293 | --- | --- | --- | 6307 | --- | --- | --- |
  6308 +|hModel|键盘型号代码||
6294 |keySn|键盘Sn|| 6309 |keySn|键盘Sn||
  6310 +|keyId|键盘Id||
  6311 +|keyVer|键盘固件版本||
6295 6312
6296 指令样例: 6313 指令样例:
6297 6314
@@ -6301,7 +6318,10 @@ infos:{ &quot;keySn&quot;:&quot;1479824643&quot;}//返回键盘反馈模式参数值 @@ -6301,7 +6318,10 @@ infos:{ &quot;keySn&quot;:&quot;1479824643&quot;}//返回键盘反馈模式参数值
6301 "baseId": 1, 6318 "baseId": 1,
6302 "baseSn":"2023031402", 6319 "baseSn":"2023031402",
6303 "infos": { 6320 "infos": {
6304 - "keySn": "1479824643" 6321 + "hModel": "79",
  6322 + "keyId": "00001",
  6323 + "keySn": "1479824643",
  6324 + "keyVer": "2.1.12"
6305 }, 6325 },
6306 "packetTag": "0" 6326 "packetTag": "0"
6307 } 6327 }