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

李傲寒
2 parents 9699367d 9bb38d00
Showing 1 changed file with 169 additions and 73 deletions
通讯协议-平台化-应用部分[内部].md
@@ -32,7 +32,7 @@ SunVote 莠梧ｬ｡蠑蜿&lt;br&gt;騾夊ｮｯ蜊剰ｮｮ
 <br>
 <br>
 <div  style="text-align: center;font-size: 30px;">
-Ver 1.0.13
+Ver 1.0.14
 </div>
 <br>
 <br>
@@ -48,7 +48,7 @@ Ver 1.0.13
 <br>
  
 <div  style="text-align: center;font-size: 30px;">
-莠後ｺ御ｺ泌ｹｴ荵晄怦
+莠後ｺ御ｺ泌ｹｴ蜊∽ｺ梧怦
 </div>
  
 <br>
@@ -80,6 +80,7 @@ Ver 1.0.13
 |1.0.11| 2025蟷ｴ7譛30譌･|蛻倡清|1. 蠅槫刈陦ｨ蜀ｳ蜉溯(證ょ宵譛我ｸ蛾醗陦ｨ蜀ｳ)|
 |1.0.12| 2025蟷ｴ9譛4譌･|蛻倡清|1. 蠅槫刈逋ｽ蜷榊黒讓｡蠑丈ｸ狗噪髞ｮ逶倡匳蠖穂ｿ｡諱ｯ檎畑菴應ｸ顔ｺｿ菫｡諱ｯ逧｡･蜈<br>2. 蠅槫刈遲秘｢伜渚鬥井ｺ倶ｻｶ荳ｭ逧慮髣ｴ謌ｳ霑泌屓<br>3. 菫ｮ謾ｹ諡咲蜿埼ｦ亥所霑泌屓莠倶ｻｶ逧磁蜿｣蜿よ焚|
 |1.0.13| 2025蟷ｴ9譛8譌･|蛻倡清|1. 蠅槫刈蝓ｺ遶呵ｿ樊磁莠倶ｻｶ霑泌屓蟄怜ｺ鍋沿譛ｬ<br>2. 蠅槫刈蜊慕峡隸ｻ蜿門渕遶吝ｭ怜ｺ鍋沿譛ｬ謗･蜿｣<br>3. 菫ｮ謾ｹ隶ｾ鄂ｮ隸ｻ蜿夜醗逶倩蜉ｨ莨醍悛遲臥ｺｧ蜥瑚ｿ泌屓莠倶ｻｶ荳ｺ螟夜Κ謖ｻ､|
+|1.0.14| 2025蟷ｴ12譛2譌･|蛻倡清|1. 蠅槫刈謖蛾醗蜿埼ｦ井ｺ倶ｻｶ逧eyId霑泌屓<br>2. 蠅槫刈謨ｰ蟄鈴我ｸｾ逶ｸ蜈ｳ謗･蜿｣|
  
 <br>
 <br>
@@ -118,7 +119,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 |get|	蠕惻迥ｶ諤∽ｸ玖執蜿門盾謨ｰ螻樊ｧ迥ｶ諤∝所謨ｰ謐ｮ	|蠕惻迥ｶ諤−
 |set|	蠕惻迥ｶ諤∽ｸ玖ｮｾ鄂ｮ蜿よ焚螻樊ｧ迥ｶ諤∝所謨ｰ謐ｮ	|蠕惻迥ｶ諤−
 |start|	霑占｡御ｸ荳ｪ蜊戊ｿ帷ｨ倶ｸ壼苅螳樔ｾ具ｼ亥謨ｰ	|蠕惻迥ｶ諤−
-|stop|	蛛懈ｭ｢荳荳ｪ蜊戊ｿ帷ｨ倶ｸ壼苅螳樔ｾ具ｼ亥謨ｰ	|蠕惻迥ｶ諤−
+|stop|	蛛懈ｭ｢荳荳ｪ蜊戊ｿ帷ｨ倶ｸ壼苅螳樔ｾ具ｼ亥謨ｰ	|蝨ｨ郤ｿ迥ｶ諤−
 |rtXXX|	蝨ｨ郤ｿ迥ｶ諤∽ｸ句庄螳樊慮謇ｧ陦梧婿豕募所蜃ｽ謨ｰ	||
  
 ## 莠倶ｻｶ隸ｴ譏
@@ -160,13 +161,11 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 |SDK霑樊磁 - 菫晄戟霑樊磁|隶ｾ鄂ｮ蠢ｷｳ髣ｴ髫培[setHeartbeatInterval](#setheartbeatinterval)|[fEvtHeartbeatInterval](#fevtheartbeatinterval)|
 |SDK隸悪 - SDK迚域悽|闔ｷ蜿亡DK迚域悽|[getSdkVersion](#getsdkversion)|[fEvtSdkVersion](#fevtsdkversion)|
 |SDK霑樊磁 - 扈域ｭ｢霑樊磁|蜈ｳ髣ｭSDK霑樊磁|[closeSdk](#closesdk)|-|
-
 ### 蜈ｬ蜈ｱ譁ｹ豕
 蜿ｯ莉･蝨ｨ螟夂ｧ堺ｸ壼苅荳ｭ隹畑逧夂畑譁ｹ豕
 |蜉溯蠖堤ｱｻ|蜉溯|API謖ｻ､|謖ｻ､/邉ｻ扈滉ｺ倶ｻｶ|
 |---|---|---|---|
 |蛛懈ｭ｢謚慕･ｨ|蜿ｯ蛛懈ｭ｢騾夊ｿｰ畑startXXX蜷ｯ蜉ｨ逧ｭ秘｢倅ｸ壼苅|[stopKpVote](#stopkpvote)|[sEvtStateCode](#sevtstatecode)||
-
 ### 蜈ｬ蜈ｱ莠倶ｻｶ
 譌髴隹畑謖ｻ､瑚蜉ｨ霑泌屓逧ｺ倶ｻｶ
 |蜉溯蠖堤ｱｻ|蜉溯|API謖ｻ､|謖ｻ､/邉ｻ扈滉ｺ倶ｻｶ|
@@ -182,7 +181,6 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 |蜈ｬ蜈ｱ莠倶ｻｶ|髞ｮ逶伜ｾ惻螳樊慮謖蛾醗蜿埼ｦ-|[sEvtKpRtFeedback](#sevtkprtfeedback)|
 |蜈ｬ蜈ｱ莠倶ｻｶ|髞ｮ逶倅ｸｾ謇矩醗螳樊慮謖蛾醗蜿埼ｦ-|[sEvtKpHandUp](#sevtkphandup)|
 |蜈ｬ蜈ｱ莠倶ｻｶ|驕･謗ｧ蝎ｨ螳樊慮謖蛾醗蜿埼ｦ-|[sEvtKpRemoteControl](#sevtkpremotecontrol)|
-
 ### 蝓ｺ遶咏ｮ｡逅
 |蜉溯蠖堤ｱｻ|蜉溯|API謖ｻ､|謖ｻ､/邉ｻ扈滉ｺ倶ｻｶ|
 |---|---|---|---|
@@ -336,7 +334,11 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 ||貂勁閾ｪ螳壻ｹ画ｵ矩ｪ碁｢伜梛譬｢伜螳ｹ|[clearKpExamQuesTitle](#clearkpexamquestitle)|[sEvtStateCode](#sevtstatecode)<br>[fEvtClearKpExamQuesTitle](#fevtclearkpexamquestitle)|
 |閾ｪ螳壻ｹ臥ｧ醍岼蜷咲ｧｰ|閾ｪ螳壻ｹ臥ｧ醍岼蜷咲ｧｰ|[setKpExamSubject](#setkpexamsubject)|[sEvtStateCode](#sevtstatecode)<br>[fEvtKpExamSubject](#fevtkpexamsubject)|
 ||貂勁閾ｪ螳壻ｹ臥ｧ醍岼蜷咲ｧｰ|[clearKpExamSubject](#clearkpexamsubject)|[sEvtStateCode](#sevtstatecode)<br>[fEvtClearKpExamSubject](#fevtclearkpexamsubject)|
-
+### 騾我ｸｾ
+|蜉溯蠖堤ｱｻ|蜉溯|API謖ｻ､|謖ｻ､莠倶ｻｶ|
+|---|---|---|---|
+|謨ｰ蟄鈴我ｸｾ|蜷ｯ蜉ｨ謨ｰ蟄鈴我ｸｾ|[startQADigitalElection](#startqadigitalelection)|[sEvtStateCode](#sevtstatecode)<br>[fEvtDigitalElection](#fevtdigitalelection)|
+||蛛懈ｭ｢謨ｰ蟄鈴我ｸｾ|[stopKpVote](#stopkpvote)|[sEvtStateCode](#sevtstatecode)|
 ## SDK邂｡逅
 ### 譁ｹ豕
 #### heartbeat
@@ -478,11 +480,13 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 |-----|-----|-----|-----|-----|
 |fun|string|-|譏ｯ|莠倶ｻｶ邀ｻ蝙弓
 |dataTag|string||蜷ｦ|謨ｰ謐ｮ蛹ｯｼ御ｸ埼怙隕∵慮蜿ｯ莨遨ｺ蟄礼ｬｦ荳ｲ|
+|baseSn|string||譏ｯ|蝓ｺ遶咏噪蜃ｺ蜴らｼ也−
  
 - **遉ｺ萓倶ｻ｣遐**
 ```json
 {
     "fun":"stopKpVote",
+    "baseSn":"2024061101",
     "dataTag":"1"
 }
 ```
@@ -713,6 +717,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 |baseSn|string||譏ｯ|蝓ｺ遶咏噪蜃ｺ蜴らｼ也−
 |data|array|-|譏ｯ|莨騾∝盾謨ｰ逧ｯｹ雎｡謨ｰ扈л
 |++keySn|string||譏ｯ|髞ｮ逶牢N|
+|++keyId|int||譏ｯ|髞ｮ逶倡ｼ門捷,65535莉｣陦ｨ髞ｮ逶俶悴郛門捷|
 |++keyValue|string||譏ｯ|髞ｮ逶俶署莠､逧潔髞ｮ蛟ｼ|
 |++voltage|double||譏ｯ|髞ｮ逶倡鳩驥楯
 |++retryCount|int||譏ｯ|髞ｮ逶俶署莠､謨ｰ謐ｮ逧蜿第ｬ｡謨ｰ|
@@ -725,6 +730,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
     "baseSn":"2024061101",
     "data":[{ 
         "keySn":"1234567890",
+        "keyId":1,
         "keyValue":"A",
         "voltage":2.6,
         "retryCount":1
@@ -744,6 +750,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 |baseSn|string||譏ｯ|蝓ｺ遶咏噪蜃ｺ蜴らｼ也−
 |data|object|-|譏ｯ|莨騾∝盾謨ｰ逧ｯｹ雎｡|
 |+keySn|string||譏ｯ|荳ｾ謇狗噪髞ｮ逶牢N|
+|+keyId|int||譏ｯ|髞ｮ逶倡ｼ門捷,65535莉｣陦ｨ髞ｮ逶俶悴郛門捷|
  
 - **遉ｺ萓倶ｻ｣遐**
 ```json
@@ -752,7 +759,8 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
     "dataTag":"1",
     "baseSn":"2024061101",
     "data":{ 
-        "keySn":"1234567890"
+        "keySn":"1234567890",
+        "keyId":1
     }
 }
 ```
@@ -901,7 +909,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
         "modelName":"BS200",
         "version":"1.0.3",
         "fontLibVer":"1.0.0",
-        "baseSn":"2024041401"
+        "baseSn":"2024061101"
     }
 }
 ```
@@ -4775,8 +4783,47 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 ##### [sEvtStateCode](#sevtstatecode)
 蜿鷹∵欠莉､蜷手ｿ泌屓謗･謾ｶ迥ｶ諤
  
-##### [fEvtKpSignIn](#fevtkpsignin)
-霑泌屓髞ｮ逶俶署莠､逧ｭｾ蛻ｰ謨ｰ謐ｮ
+##### fEvtKpSignIn
+- **荳ｻ鬚**/basestation/{baseSn}/receive
+- **蜉溯謠剰ｿｰ**夊ｿ泌屓髞ｮ逶俶署莠､遲ｾ蛻ｰ菫｡諱ｯ
+- **蜿よ焚隸ｴ譏**
+
+|蜿よ焚蜷鋼邀ｻ蝙弓髯仙宛|髱樒ｩｺ|隸ｴ譏旨
+|---|---|---|---|---|
+|fun|string|-|譏ｯ|謖ｻ､蜷咲ｧｰ|
+|dataTag|string|-|蜷ｦ|謨ｰ謐ｮ蛹ｯ,蜿ｯ荳ｺ遨ｺ蟄礼ｬｦ荳ｲ|
+|baseSn|string||譏ｯ|蝓ｺ遶咏噪蜃ｺ蜴らｼ也−
+|data|array|-|譏ｯ|莨騾∝盾謨ｰ逧ｯｹ雎｡謨ｰ扈л
+|++keySn|string||譏ｯ|髞ｮ逶牢N|
+|++keyId|int||譏ｯ|髞ｮ逶倡ｼ門捷,65535莉｣陦ｨ髞ｮ逶俶悴郛門捷|
+|++keyValue|string||譏ｯ|髞ｮ逶俶署莠､逧潔髞ｮ蛟ｼ|
+|++keyTime|double||譏ｯ|遲秘｢俶慮髣ｴ御ｻ主星蜉ｨ蠑蟋玖ｮ｡邂暦ｼ悟黒菴肴ｯｫ遘竹
+|++voltage|double||譏ｯ|髞ｮ逶倡鳩驥楯
+|++retryCount|int||譏ｯ|髞ｮ逶俶署莠､謨ｰ謐ｮ逧蜿第ｬ｡謨ｰ|
+|++timeStamp|long ||譏ｯ|髞ｮ逶俶署莠､謨ｰ謐ｮ閾ｳ蝓ｺ遶咏噪譌ｶ髣ｴ謌ｳ|
+
+- **遉ｺ萓倶ｻ｣遐**
+
+```json
+{
+  "fun":"fEvtKpSignIn",
+  "dataTag":"1",
+  "baseSn":"2024061101",
+  "data": [{
+      "keySn": "1234567890",
+      "keyId": 1,
+      "keyValue":"1004",
+      "keyTime":3300
+    },
+    {
+      "keySn": "1234567891",
+      "keyId": 2,
+      "keyValue":"1003",
+      "keyTime":3320
+    }
+  ]
+}
+```
  
 ### 髫乗慮遲ｾ蛻ｰ
 #### 譁ｹ豕
@@ -4856,44 +4903,9 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 ##### [sEvtStateCode](#sevtstatecode)
 蜿鷹∵欠莉､蜷手ｿ泌屓謗･謾ｶ迥ｶ諤
  
-##### fEvtKpSignIn
-- **荳ｻ鬚**/basestation/{baseSn}/receive
-- **蜉溯謠剰ｿｰ**夊ｿ泌屓髞ｮ逶俶署莠､遲ｾ蛻ｰ菫｡諱ｯ
-- **蜿よ焚隸ｴ譏**
-
-|蜿よ焚蜷鋼邀ｻ蝙弓髯仙宛|髱樒ｩｺ|隸ｴ譏旨
-|---|---|---|---|---|
-|fun|string|-|譏ｯ|謖ｻ､蜷咲ｧｰ|
-|dataTag|string|-|蜷ｦ|謨ｰ謐ｮ蛹ｯ,蜿ｯ荳ｺ遨ｺ蟄礼ｬｦ荳ｲ|
-|baseSn|string||譏ｯ|蝓ｺ遶咏噪蜃ｺ蜴らｼ也−
-|data|array|-|譏ｯ|莨騾∝盾謨ｰ逧ｯｹ雎｡謨ｰ扈л
-|++keySn|string||譏ｯ|髞ｮ逶牢N|
-|++keyValue|string||譏ｯ|髞ｮ逶俶署莠､逧潔髞ｮ蛟ｼ|
-|++keyTime|double||譏ｯ|遲秘｢俶慮髣ｴ御ｻ主星蜉ｨ蠑蟋玖ｮ｡邂暦ｼ悟黒菴肴ｯｫ遘竹
-|++voltage|double||譏ｯ|髞ｮ逶倡鳩驥楯
-|++retryCount|int||譏ｯ|髞ｮ逶俶署莠､謨ｰ謐ｮ逧蜿第ｬ｡謨ｰ|
-|++timeStamp|long ||譏ｯ|髞ｮ逶俶署莠､謨ｰ謐ｮ閾ｳ蝓ｺ遶咏噪譌ｶ髣ｴ謌ｳ|
-
-- **遉ｺ萓倶ｻ｣遐**
+##### [fEvtKpSignIn](#fevtkpsignin)
+霑泌屓髞ｮ逶俶署莠､逧ｭｾ蛻ｰ謨ｰ謐ｮ
  
-```json
-{
-  "fun":"fEvtKpSignIn",
-  "dataTag":"1",
-  "baseSn":"2024061101",
-  "data": [{
-      "keySn": "1234567890",
-      "keyValue":"1004",
-      "keyTime":3300
-    },
-    {
-      "keySn": "1234567891",
-      "keyValue":"1003",
-      "keyTime":3320
-    }
-  ]
-}
-```
 ##### fEvtKpLoginAllowed
 - **荳ｻ鬚**/basestation/{baseSn}/receive
 - **蜉溯謠剰ｿｰ**夊ｿ泌屓髞ｮ逶俶肢譚憾諤
@@ -4921,6 +4933,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
     }
 }
 ```
+
 ## 謖蛾醗蜿埼ｦ
 ### 蛻､譁ｭ鬚
 #### 譁ｹ豕
@@ -4979,6 +4992,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 |baseSn|string||譏ｯ|蝓ｺ遶咏噪蜃ｺ蜴らｼ也−
 |data|array|-|譏ｯ|莨騾∝盾謨ｰ逧ｯｹ雎｡謨ｰ扈л
 |++keySn|string||譏ｯ|髞ｮ逶牢N|
+|++keyId|int||譏ｯ|髞ｮ逶倡ｼ門捷,65535莉｣陦ｨ髞ｮ逶俶悴郛門捷|
 |++keyValue|string||譏ｯ|髞ｮ逶俶署莠､逧潔髞ｮ蛟ｼ<br>1-蟇ｹ<br>2-髞處
 |++keyTime|double||譏ｯ|遲秘｢俶慮髣ｴ御ｻ主星蜉ｨ蠑蟋玖ｮ｡邂暦ｼ悟黒菴肴ｯｫ遘竹
 |++voltage|double||譏ｯ|髞ｮ逶倡鳩驥楯
@@ -4994,6 +5008,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
   "baseSn":"2024061101",
   "data": [{
       "keySn": "1234567890",
+      "keyId": 1,
       "keyValue":"1",
       "keyTime":2300
     }
@@ -5063,6 +5078,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 |baseSn|string||譏ｯ|蝓ｺ遶咏噪蜃ｺ蜴らｼ也−
 |data|array|-|譏ｯ|莨騾∝盾謨ｰ逧ｯｹ雎｡謨ｰ扈л
 |++keySn|string||譏ｯ|髞ｮ逶牢N|
+|++keyId|int||譏ｯ|髞ｮ逶倡ｼ門捷,65535莉｣陦ｨ髞ｮ逶俶悴郛門捷|
 |++keyValue|string||譏ｯ|髞ｮ逶俶署莠､逧潔髞ｮ蛟ｼ|
 |++keyTime|double||譏ｯ|遲秘｢俶慮髣ｴ御ｻ主星蜉ｨ蠑蟋玖ｮ｡邂暦ｼ悟黒菴肴ｯｫ遘竹
 |++voltage|double||譏ｯ|髞ｮ逶倡鳩驥楯
@@ -5078,6 +5094,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
   "baseSn":"2024061101",
   "data": [{
       "keySn": "1234567890",
+      "keyId": 1,
       "keyValue":"A",
       "keyTime":2230
     }]
@@ -5144,6 +5161,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 |baseSn|string||譏ｯ|蝓ｺ遶咏噪蜃ｺ蜴らｼ也−
 |data|array|-|譏ｯ|莨騾∝盾謨ｰ逧ｯｹ雎｡謨ｰ扈л
 |++keySn|string||譏ｯ|髞ｮ逶牢N|
+|++keyId|int||譏ｯ|髞ｮ逶倡ｼ門捷,65535莉｣陦ｨ髞ｮ逶俶悴郛門捷|
 |++keyValue|string||譏ｯ|髞ｮ逶俶署莠､逧潔髞ｮ蛟ｼ|
 |++keyTime|double||譏ｯ|遲秘｢俶慮髣ｴ御ｻ主星蜉ｨ蠑蟋玖ｮ｡邂暦ｼ悟黒菴肴ｯｫ遘竹
 |++voltage|double||譏ｯ|髞ｮ逶倡鳩驥楯
@@ -5159,6 +5177,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
   "baseSn":"2024061101",
   "data":[{
       "keySn": "1234567890",
+      "keyId": 1,
       "keyValue":"10",
       "keyTime":2230
     }]
@@ -5218,6 +5237,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 |baseSn|string||譏ｯ|蝓ｺ遶咏噪蜃ｺ蜴らｼ也−
 |data|array|-|譏ｯ|莨騾∝盾謨ｰ逧ｯｹ雎｡謨ｰ扈л
 |++keySn|string||譏ｯ|髞ｮ逶牢N|
+|++keyId|int||譏ｯ|髞ｮ逶倡ｼ門捷,65535莉｣陦ｨ髞ｮ逶俶悴郛門捷|
 |++keyValue|string||譏ｯ|髞ｮ逶俶署莠､逧潔髞ｮ蛟ｼ|
 |++keyTime|double||譏ｯ|遲秘｢俶慮髣ｴ御ｻ主星蜉ｨ蠑蟋玖ｮ｡邂暦ｼ悟黒菴肴ｯｫ遘竹
 |++voltage|double||譏ｯ|髞ｮ逶倡鳩驥楯
@@ -5233,6 +5253,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
   "baseSn":"2024061101",
   "data": [{
       "keySn": "1234567890",
+      "keyId": 1,
       "keyValue":"1",
       "keyTime":2230
     }]
@@ -5290,6 +5311,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 |baseSn|string||譏ｯ|蝓ｺ遶咏噪蜃ｺ蜴らｼ也−
 |data|array|-|譏ｯ|莨騾∝盾謨ｰ逧ｯｹ雎｡謨ｰ扈л
 |++keySn|string||譏ｯ|髞ｮ逶牢N|
+|++keyId|int||譏ｯ|髞ｮ逶倡ｼ門捷,65535莉｣陦ｨ髞ｮ逶俶悴郛門捷|
 |++keyValue|string||譏ｯ|髞ｮ逶俶署莠､逧潔髞ｮ蛟ｼ|
 |++keyTime|double||譏ｯ|遲秘｢俶慮髣ｴ御ｻ主星蜉ｨ蠑蟋玖ｮ｡邂暦ｼ悟黒菴肴ｯｫ遘竹
 |++timeStamp|long ||譏ｯ|髞ｮ逶俶署莠､謨ｰ謐ｮ閾ｳ蝓ｺ遶咏噪譌ｶ髣ｴ謌ｳ|
@@ -5302,6 +5324,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
   "baseSn":"2024061101",
   "data": [{
       "keySn": "1234567890",
+      "keyId": 1,
       "keyValue":"hello",
       "keyTime":3260
     }]
@@ -5459,6 +5482,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 |baseSn|string||譏ｯ|蝓ｺ遶咏噪蜃ｺ蜴らｼ也−
 |data|array|-|譏ｯ|莨騾∝盾謨ｰ逧ｯｹ雎｡謨ｰ扈л
 |++keySn|string||譏ｯ|髞ｮ逶牢N|
+|++keyId|int||譏ｯ|髞ｮ逶倡ｼ門捷,65535莉｣陦ｨ髞ｮ逶俶悴郛門捷|
 |++keyValue|string||譏ｯ|髞ｮ逶俶署莠､逧潔髞ｮ蛟ｼ<br>1-襍樊<br>2-蜿榊ｯｹ<br>3-蠑揀|
 |++keyTime|double||譏ｯ|遲秘｢俶慮髣ｴ御ｻ主星蜉ｨ蠑蟋玖ｮ｡邂暦ｼ悟黒菴肴ｯｫ遘竹
 |++voltage|double||譏ｯ|髞ｮ逶倡鳩驥楯
@@ -5474,6 +5498,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
   "baseSn":"2024061101",
   "data": [{
       "keySn": "1234567890",
+      "keyId": 1,
       "keyValue":"1",
       "keyTime":2300
     }
@@ -5762,6 +5787,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 |baseSn|string||譏ｯ|蝓ｺ遶咏噪蜃ｺ蜴らｼ也−
 |data|object|-|譏ｯ|莨騾∝盾謨ｰ逧ｯｹ雎｡|
 |+keySns|array||譏ｯ|謖ｮ夂噪髞ｮ逶牢N謨ｰ扈ｼ檎ｩｺ謨ｰ扈｡ｨ遉ｺ蜈ｨ驛ｨ蝨ｨ郤ｿ髞ｮ逶
+|+mode|int||譏ｯ|諡咲讓｡蠑(鬚蕗) <br>0 - 閾ｪ蜉ｨ謠蝉ｺ､ <br>1 - 譎ｮ騾壽牛辣ｧ(鮟倩ｮ､讓｡蠑)|
 |+tip|string||蜷ｦ|謠千､ｺ逧｢假ｼ碁柄蠎ｦ荳崎ｶｿ16蟄礼ｬｦ|
 |+questions|array||譏ｯ|髴隕∵署莠､辣ｧ迚陦ｨ, 譛螟9蠑辣ｧ迚
 |++index|int||譏ｯ|辣ｧ迚噪蠎丞捷1-9|
@@ -5775,6 +5801,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
   "baseSn":"2024061101",
   "data": {
       "keySns": [],
+      "mode": 1,
       "tip": "隸ｷ諡咲謠蝉ｺ､",
       "questions": [{
         "index":1,
@@ -6034,31 +6061,6 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 ##### [stopKpVote](#stopkpvote)
 蛛懈ｭ｢蝨ｨ郤ｿ豬矩ｪ
  
-##### rtKpAllowEdited
-- **荳ｻ鬚**/client/{baseSn}/send
-- **蜉溯謠剰ｿｰ**夐醗逶俶署莠､蜷趣ｼ悟隶ｸ髞ｮ逶倅ｿｮ謾ｹ遲疲｡
-- **蜿よ焚隸ｴ譏**
-
-|蜿よ焚蜷鋼邀ｻ蝙弓髯仙宛|譏ｯ蜷ｦ蠢｡ｫ|隸ｴ譏旨
-|---|---|---|---|---|
-|fun|string|-|譏ｯ|謖ｻ､蜷咲ｧｰ|
-|dataTag|string|-|蜷ｦ|謨ｰ謐ｮ蛹ｯ,蜿ｯ荳ｺ遨ｺ蟄礼ｬｦ荳ｲ|
-|baseSn|string||譏ｯ|蝓ｺ遶咏噪蜃ｺ蜴らｼ也−
-|data|object|-|譏ｯ|莨騾∝盾謨ｰ逧ｯｹ雎｡|
-|+keySns|array||譏ｯ|謖ｮ夂噪髞ｮ逶牢N謨ｰ扈ｼ檎ｩｺ謨ｰ扈｡ｨ遉ｺ蜈ｨ驛ｨ蝨ｨ郤ｿ髞ｮ逶
-
-- **遉ｺ萓倶ｻ｣遐**
-
-```json
-{
-  "fun":"rtKpAllowEdited",
-  "dataTag":"1",
-  "baseSn":"2024061101",
-  "data":{
-    "keySns":["1234567890","1234567891"]
-  }
-}
-```
 #### 莠倶ｻｶ
 ##### [sEvtStateCode](#sevtstatecode)
 蜿鷹∵欠莉､蜷手ｿ泌屓謗･謾ｶ迥ｶ諤
@@ -6075,6 +6077,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 |baseSn|string||譏ｯ|蝓ｺ遶咏噪蜃ｺ蜴らｼ也−
 |data|array|-|譏ｯ|莨騾∝盾謨ｰ逧ｯｹ雎｡謨ｰ扈л
 |++keySn|string||譏ｯ|髞ｮ逶牢N|
+|++keyId|int||譏ｯ|髞ｮ逶倡ｼ門捷,65535莉｣陦ｨ髞ｮ逶俶悴郛門捷|
 |++keyValue|string||譏ｯ|髞ｮ逶俶署莠､逧潔髞ｮ蛟ｼ,1:A;2:B陦ｨ遉ｺ隨ｬ1鬚俶署莠､A檎ｬｬ莠碁｢俶署莠､B<br><font color="red">豕ｨ諢擾ｼ壼ｦょ星蜉ｨ逧弍螟夂ｧ第ｵ矩ｪ鯉ｼ碁醗逶俶署莠､逧｢倡岼蠎丞捷蟇ｹ蠎泌星蜉ｨ譌ｶ荳句書逧｢倡岼諤ｻ蠎丞捷御ｸ肴潔遘醍岼蛹ｺ蛻</font>|
 |++keyTime|double||譏ｯ|遲秘｢俶慮髣ｴ御ｻ主星蜉ｨ蠑蟋玖ｮ｡邂暦ｼ悟黒菴肴ｯｫ遘竹
 |++voltage|double||譏ｯ|髞ｮ逶倡鳩驥楯
@@ -6090,11 +6093,13 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
   "baseSn":"2024061101",
   "data": [{
       "keySn": "1234567890",
+      "keyId": 1,
       "keyValue":"1:A;2:B",
       "keyTime":3200
     },
     {
       "keySn": "1234567891",
+      "keyId": 2,
       "keyValue":"1:B;2:B",
       "keyTime":3500
     }
@@ -6278,6 +6283,7 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 |baseSn|string||譏ｯ|蝓ｺ遶咏噪蜃ｺ蜴らｼ也−
 |data|array|-|譏ｯ|莨騾∝盾謨ｰ逧ｯｹ雎｡謨ｰ扈л
 |++keySn|string||譏ｯ|髞ｮ逶牢N|
+|++keyId|int||譏ｯ|髞ｮ逶倡ｼ門捷,65535莉｣陦ｨ髞ｮ逶俶悴郛門捷|
 |++keyValue|string||譏ｯ|髞ｮ逶俶署莠､逧蛟ｼ,1:10;2:0陦ｨ遉ｺ隨ｬ1鬚俶署莠､10蛻ｼ檎ｬｬ莠碁｢俶署莠､0蛻
 |++keyTime|double||譏ｯ|蠖募譌ｶ髣ｴ御ｻ主星蜉ｨ蠖募蠑蟋玖ｮ｡邂暦ｼ悟黒菴肴ｯｫ遘竹
 |++voltage|double||譏ｯ|髞ｮ逶倡鳩驥楯
@@ -6292,11 +6298,13 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
   "baseSn":"2024061101",
   "data": [{
       "keySn": "1234567890",
+      "keyId": 1,
       "keyValue":"1:8;2:7.5;3:2;4:3",
       "keyTime":3200
     },
     {
       "keySn": "1234567891",
+      "keyId": 2,
       "keyValue":"1:10;2:0",
       "keyTime":3500
     }
@@ -6600,3 +6608,91 @@ WebSocket譁ｹ蠑丞ｺ皮畑荳惨DK蟒ｺ遶矩柄霑樊磁蜷趣ｼ碁夊ｿebSocket謗･蜿｣蜿鷹∵磁謾
 }
 ```
  
+## 騾我ｸｾ
+### 謨ｰ蟄鈴我ｸｾ
+#### 譁ｹ豕
+##### startQADigitalElection
+- **荳ｻ鬚**/client/{baseSn}/send
+- **蜉溯謠剰ｿｰ**壼星蜉ｨ謨ｰ蟄鈴我ｸｾ
+- **蜿よ焚隸ｴ譏**
+
+|蜿よ焚蜷鋼邀ｻ蝙弓髯仙宛|譏ｯ蜷ｦ蠢｡ｫ|隸ｴ譏旨
+|---|---|---|---|---|
+|fun|string|-|譏ｯ|謖ｻ､蜷咲ｧｰ|
+|dataTag|string|-|蜷ｦ|謨ｰ謐ｮ蛹ｯ,蜿ｯ荳ｺ遨ｺ蟄礼ｬｦ荳ｲ|
+|baseSn|string||譏ｯ|蝓ｺ遶咏噪蜃ｺ蜴らｼ也−
+|data|object|-|譏ｯ|莨騾∝盾謨ｰ逧ｯｹ雎｡|
+|+allowModify|int||譏ｯ|0 - 荳榊隶ｸ菫ｮ謾ｹ<br>1 - 蜈∬ｮｸ菫ｮ謾ｹ|
+|+allowRepeat|int||譏ｯ|0 - 荳榊隶ｸ驥榊､崎ｾ灘<br>1 - 蜈∬ｮｸ驥榊､崎ｾ灘|
+|+isSecrecy|int||譏ｯ|0 - 荳堺ｿ晏ｯ
+|+lessMode|int||譏ｯ|0 - 蜈∬ｮｸ郛ｺ騾会ｼ亥庄荳埼画ｻ｡譛蟆台ｺｺ謨ｰ<br>1 - 荳榊隶ｸ郛ｺ騾会ｼ磯怙騾画ｻ｡譛蟆台ｺｺ謨ｰ榎
+|+maxSelect|int||譏ｯ|譛螟壼庄騾我ｺｺ謨ｰ,1-99|
+|+minSelect|int||譏ｯ|譛蟆鷹怙騾我ｺｺ謨ｰ,1-99娯王譛螟壼庄騾我ｺｺ謨ｰ御ｸ榊庄郛ｺ騾画慮髴騾画ｻ｡譛蟆台ｺｺ謨ｰ謇崎謠蝉ｺ､|
+|+abstainNum|int||蜷ｦ|蠑揀謨ｰ蟄暦ｼ梧怙螟ｧ999悟惠蠎丞捷1霎灘隸･謨ｰ蟄嶺ｻ｣陦ｨ蠑揀悟莉門ｺ丞捷荳ｺ豁｣蟶ｸ霎灘御ｸ堺ｼ豁､蜿よ焚莉｣陦ｨ荳榊星逕ｨ,荳崎荳守ｩｺ逋ｽ謨ｰ蟄礼嶌蜷芸
+|+blankNum|int||蜷ｦ|遨ｺ逋ｽ謨ｰ蟄暦ｼ梧怙螟ｧ999悟惠蠎丞捷1霎灘隸･謨ｰ蟄嶺ｻ｣陦ｨ蜈ｨ驛ｨ遨ｺ逋ｽ逾ｨ御ｸ堺ｼ豁､蜿よ焚莉｣陦ｨ荳榊星逕ｨ御ｸ崎荳主ｼ揀謨ｰ蟄礼嶌蜷芸
+|+numberRanges|string||譏ｯ|蜿ｯ莉･霎灘逧焚蟄苓激蝗ｴ梧ｼ蠑丞ｦ"1-100,203,210,300-500"<br>"-"陦ｨ遉ｺ霑樒ｻｭ逧焚蟄暦ｼ悟黒迢ｬ謨ｰ蟄礼噪逕ｨ","蛻囈,蜿ｯ霎灘逧焚蟄玲怙螟ｧ荳崎ｶｿ999|
+|+simParams|object||蜷ｦ|蜀Κ讓｡諡滓ｵ玖ｯ募盾謨ｰ隶ｾ鄂ｮ蟇ｹ雎｡|
+|++answer|string||譏ｯ|鬚ｮｾ謠蝉ｺ､逧潔髞ｮ襍ｷ蟋句ｼ,螯りｮｾ鄂ｮ100梧怙螟壼庄騾我ｺｺ謨ｰ隶ｾ鄂ｮ莠30悟萓晄ｬ｡謠蝉ｺ､莉100-129|
+
+- **遉ｺ萓倶ｻ｣遐**
+```json
+{
+  "fun":"startQADigitalElection",
+  "dataTag":"1",
+  "baseSn":"2024061101",
+  "data": {
+      "allowModify": 1,
+      "allowRepeat": 1,
+      "isSecrecy": 0,
+      "lessMode": 1,
+      "maxSelect":10,
+      "minSelect":1,
+      "abstainNum":777,
+      "blankNum":999,
+      "numberRanges":"1-200,203,210,300-500",
+      "simParams":{
+        "answer":"100"
+      }
+    }
+}
+```
+
+##### [stopKpVote](#stopkpvote)
+蛛懈ｭ｢謚慕･ｨ
+
+#### 莠倶ｻｶ
+##### [sEvtStateCode](#sevtstatecode)
+蜿鷹∵欠莉､蜷手ｿ泌屓謗･謾ｶ迥ｶ諤
+
+##### fEvtDigitalElection
+- **荳ｻ鬚**/basestation/{baseSn}/receive
+- **蜉溯謠剰ｿｰ**夊ｿ泌屓髞ｮ逶俶署莠､逧我ｸｾ謨ｰ蟄
+- **蜿よ焚隸ｴ譏**
+
+|蜿よ焚蜷鋼邀ｻ蝙弓髯仙宛|髱樒ｩｺ|隸ｴ譏旨
+|---|---|---|---|---|
+|fun|string|-|譏ｯ|謖ｻ､蜷咲ｧｰ|
+|dataTag|string|-|蜷ｦ|謨ｰ謐ｮ蛹ｯ,蜿ｯ荳ｺ遨ｺ蟄礼ｬｦ荳ｲ|
+|baseSn|string||譏ｯ|蝓ｺ遶咏噪蜃ｺ蜴らｼ也−
+|data|array|-|譏ｯ|莨騾∝盾謨ｰ逧ｯｹ雎｡謨ｰ扈л
+|++keySn|string||譏ｯ|髞ｮ逶牢N|
+|++keyId|int||譏ｯ|髞ｮ逶倡ｼ門捷,65535莉｣陦ｨ髞ｮ逶俶悴郛門捷|
+|++index|int||譏ｯ|謠蝉ｺ､逧臥･ｨ蠎丞捷|
+|++value|string||譏ｯ|髞ｮ逶俶署莠､逧潔髞ｮ蛟ｼ御ｸｺ遨ｺ蟄礼ｬｦ荳ｲ莉｣陦ｨ蛻髯､莠潔髞ｮ蛟ｼ謌冶ｷｳ霑
+|++submitted|int||譏ｯ|0-譛ｪ謠蝉ｺ､1-謠蝉ｺ､螳梧|
+
+- **遉ｺ萓倶ｻ｣遐**
+```json
+{
+  "fun":"fEvtDigitalElection",
+  "dataTag":"1",
+  "baseSn":"2024061101",
+  "data": [{
+      "keySn": "1479824643",
+      "keyId": 1,
+      "index": 1,
+      "value":"123",
+      "submitted":0
+    }]
+}
+```
 \ No newline at end of file