Commit fec773be52234682db51d266f0d06881883baa90

Authored by 刘琴
1 parent 11420fa5

增加恢复键盘出厂设置接口,修改扫描返回事件为数组,增加下发的返回事件中状态-参数错误

通讯协议-平台化-应用部分.md
@@ -48,7 +48,7 @@ Ver 1.0.1 @@ -48,7 +48,7 @@ Ver 1.0.1
48 <br> 48 <br>
49 49
50 <div style="text-align: center;font-size: 30px;"> 50 <div style="text-align: center;font-size: 30px;">
51 -莠後コ御コ泌ケエ莠梧 51 +莠後コ御コ泌ケエ荳画
52 </div> 52 </div>
53 53
54 <br> 54 <br>
@@ -66,7 +66,7 @@ Ver 1.0.1 @@ -66,7 +66,7 @@ Ver 1.0.1
66 <br> 66 <br>
67 | 譁。」迚域悽 | 譌・譛 | 菴懆 | 迚域悽隸エ譏 | 67 | 譁。」迚域悽 | 譌・譛 | 菴懆 | 迚域悽隸エ譏 |
68 |---|---|---|---| 68 |---|---|---|---|
69 -|1.0.1| 2025蟷エ2譛19譌・|蛻倡清|1. 蛻晏ァ狗沿| 69 +|1.0.1| 2025蟷エ3譛24譌・|蛻倡清|1. 蛻晏ァ狗沿<br>2. 菫ョ謾ケfEvtKpOnlineMsg霑泌屓荳コ謨ー扈ス「蠑楯
70 70
71 <br> 71 <br>
72 <br> 72 <br>
@@ -260,7 +260,8 @@ WebSocket譁ケ蠑丞コ皮畑荳惨DK謌門渕遶吝サコ遶矩柄霑樊磁蜷趣シ碁夊ソebSocket謗・蜿」蜿 @@ -260,7 +260,8 @@ WebSocket譁ケ蠑丞コ皮畑荳惨DK謌門渕遶吝サコ遶矩柄霑樊磁蜷趣シ碁夊ソebSocket謗・蜿」蜿
260 ||螳樊慮闔キ蜿門惠郤ソ髞ョ逶伜陦ィ|[rtGetKpOnlineList](#rtgetkponlinelist)|[sEvtBsKpOnlineList](#sevtbskponlinelist)| 260 ||螳樊慮闔キ蜿門惠郤ソ髞ョ逶伜陦ィ|[rtGetKpOnlineList](#rtgetkponlinelist)|[sEvtBsKpOnlineList](#sevtbskponlinelist)|
261 |扈エ謚、蜉溯 - 驕・謗ァ蜉溯|驕・謗ァ髞ョ逶倅シ醍悛|[remoteKpSleep](#remotekpsleep)|[sEvtStateCode](#sevtstatecode)|<inner> 261 |扈エ謚、蜉溯 - 驕・謗ァ蜉溯|驕・謗ァ髞ョ逶倅シ醍悛|[remoteKpSleep](#remotekpsleep)|[sEvtStateCode](#sevtstatecode)|<inner>
262 |扈エ謚、蜉溯 - 髞ョ逶伜合郤ァ|<font color="red">蜷ッ蜉ィ髞ョ逶俶裏郤ソ蜊コァ(蜀)|[startKpFWUpdate](#startkpfwupdate)|[sEvtStateCode](#sevtstatecode)<br>[fEvtKpFWUpdateState](#fevtkpfwupdatestate)<br>[fEvtKpUpdateProgress](#fevtkpupdateprogress)<br>[sEvtBsKpOnlineMsg](#sevtbskponlinemsg)| 262 |扈エ謚、蜉溯 - 髞ョ逶伜合郤ァ|<font color="red">蜷ッ蜉ィ髞ョ逶俶裏郤ソ蜊コァ(蜀)|[startKpFWUpdate](#startkpfwupdate)|[sEvtStateCode](#sevtstatecode)<br>[fEvtKpFWUpdateState](#fevtkpfwupdatestate)<br>[fEvtKpUpdateProgress](#fevtkpupdateprogress)<br>[sEvtBsKpOnlineMsg](#sevtbskponlinemsg)|
263 -||<font color="red">蛛懈ュ「髞ョ逶俶裏郤ソ蜊コァ(蜀)|[stopKpFWUpdate](#stopkpfwupdate)|[sEvtStateCode](#sevtstatecode)<br>[fEvtKpFWUpdateState](#fevtkpfwupdatestate)|</inner> 263 +||<font color="red">蛛懈ュ「髞ョ逶俶裏郤ソ蜊コァ(蜀)|[stopKpFWUpdate](#stopkpfwupdate)|[sEvtStateCode](#sevtstatecode)<br>[fEvtKpFWUpdateState](#fevtkpfwupdatestate)|
  264 +|扈エ謚、蜉溯 - 諱「螟榊蜴諱「螟埼醗逶伜蜴りョセ鄂ョ|[resetKpDefault](#resetkpdefault)|[sEvtStateCode](#sevtstatecode)|</inner>
264 ### 扈大ョ 265 ### 扈大ョ
265 |蜉溯蠖堤アサ|蜉溯|API謖サ、|謖サ、莠倶サカ| 266 |蜉溯蠖堤アサ|蜉溯|API謖サ、|謖サ、莠倶サカ|
266 |---|---|---|---| 267 |---|---|---|---|
@@ -3248,7 +3249,7 @@ WebSocket譁ケ蠑丞コ皮畑荳惨DK謌門渕遶吝サコ遶矩柄霑樊磁蜷趣シ碁夊ソebSocket謗・蜿」蜿 @@ -3248,7 +3249,7 @@ WebSocket譁ケ蠑丞コ皮畑荳惨DK謌門渕遶吝サコ遶矩柄霑樊磁蜷趣シ碁夊ソebSocket謗・蜿」蜿
3248 |baseSn|string||譏ッ|蝓コ遶咏噪蜃コ蜴らシ也− 3249 |baseSn|string||譏ッ|蝓コ遶咏噪蜃コ蜴らシ也−
3249 |data|array|-|譏ッ|莨騾∝盾謨ー逧ッケ雎。謨ー扈л 3250 |data|array|-|譏ッ|莨騾∝盾謨ー逧ッケ雎。謨ー扈л
3250 |++keySn|string||譏ッ|隶セ鄂ョ謠千、コ隸ュ菫。諱ッ逧醗逶牢N| 3251 |++keySn|string||譏ッ|隶セ鄂ョ謠千、コ隸ュ菫。諱ッ逧醗逶牢N|
3251 -|++state|string||譏ッ|隶セ鄂ョ逧署遉コ隸ュ譏ッ蜷ヲ謌仙粥<br>0 - 謌仙粥<br>1 - 螟ア雍・| 3252 +|++state|string||譏ッ|隶セ鄂ョ逧署遉コ隸ュ譏ッ蜷ヲ謌仙粥<br>0 - 謌仙粥<br>1 - 雜慮螟ア雍・<br>2 - 蜿よ焚髞呵ッッ|
3252 3253
3253 - **遉コ萓倶サ」遐** 3254 - **遉コ萓倶サ」遐**
3254 3255
@@ -3354,11 +3355,11 @@ WebSocket譁ケ蠑丞コ皮畑荳惨DK謌門渕遶吝サコ遶矩柄霑樊磁蜷趣シ碁夊ソebSocket謗・蜿」蜿 @@ -3354,11 +3355,11 @@ WebSocket譁ケ蠑丞コ皮畑荳惨DK謌門渕遶吝サコ遶矩柄霑樊磁蜷趣シ碁夊ソebSocket謗・蜿」蜿
3354 |fun|string|-|譏ッ|莠倶サカ蜷咲ァー| 3355 |fun|string|-|譏ッ|莠倶サカ蜷咲ァー|
3355 |dataTag|string|-|蜷ヲ|謨ー謐ョ蛹ッ 3356 |dataTag|string|-|蜷ヲ|謨ー謐ョ蛹ッ
3356 |baseSn|string||譏ッ|蝓コ遶咏噪蜃コ蜴らシ也− 3357 |baseSn|string||譏ッ|蝓コ遶咏噪蜃コ蜴らシ也−
3357 -|data|object|-|譏ッ|莨騾∝盾謨ー逧ッケ雎。|  
3358 -|+keySn|string||譏ッ|髞ョ逶牢N|  
3359 -|+version|string||譏ッ|髞ョ逶伜崋莉カ迚域悽|  
3360 -|+model|int||譏ッ|髞ョ逶伜梛蜿キ|  
3361 -|+voltage|double||譏ッ|髞ョ逶倡鳩驥<inner><font color="red">亥セ醗逶倅ソョ謾ケ謌千卆蛻ッ費シ</font></inner>| 3358 +|data|array|-|譏ッ|莨騾∝盾謨ー逧ッケ雎。謨ー扈л
  3359 +|++keySn|string||譏ッ|髞ョ逶牢N|
  3360 +|++version|string||譏ッ|髞ョ逶伜崋莉カ迚域悽|
  3361 +|++model|int||譏ッ|髞ョ逶伜梛蜿キ|
  3362 +|++voltage|double||譏ッ|髞ョ逶倡鳩驥<inner><font color="red">亥セ醗逶倅ソョ謾ケ謌千卆蛻ッ費シ</font></inner>|
3362 3363
3363 - **遉コ萓倶サ」遐** 3364 - **遉コ萓倶サ」遐**
3364 ```json 3365 ```json
@@ -3366,12 +3367,17 @@ WebSocket譁ケ蠑丞コ皮畑荳惨DK謌門渕遶吝サコ遶矩柄霑樊磁蜷趣シ碁夊ソebSocket謗・蜿」蜿 @@ -3366,12 +3367,17 @@ WebSocket譁ケ蠑丞コ皮畑荳惨DK謌門渕遶吝サコ遶矩柄霑樊磁蜷趣シ碁夊ソebSocket謗・蜿」蜿
3366 "fun":"fEvtKpOnlineMsg", 3367 "fun":"fEvtKpOnlineMsg",
3367 "dataTag":"1", 3368 "dataTag":"1",
3368 "baseSn":"2024061101", 3369 "baseSn":"2024061101",
3369 - "data":{ 3370 + "data":[{
3370 "keySn":"1234567890", 3371 "keySn":"1234567890",
3371 "version":"1.0.0", 3372 "version":"1.0.0",
3372 "model":67, 3373 "model":67,
3373 "voltage":2.8 3374 "voltage":2.8
3374 - } 3375 + },{
  3376 + "keySn":"1234567891",
  3377 + "version":"1.0.0",
  3378 + "model":67,
  3379 + "voltage":2.8
  3380 + }]
3375 } 3381 }
3376 ``` 3382 ```
3377 3383
@@ -3457,6 +3463,26 @@ WebSocket譁ケ蠑丞コ皮畑荳惨DK謌門渕遶吝サコ遶矩柄霑樊磁蜷趣シ碁夊ソebSocket謗・蜿」蜿 @@ -3457,6 +3463,26 @@ WebSocket譁ケ蠑丞コ皮畑荳惨DK謌門渕遶吝サコ遶矩柄霑樊磁蜷趣シ碁夊ソebSocket謗・蜿」蜿
3457 "baseSn":"2024061101" 3463 "baseSn":"2024061101"
3458 } 3464 }
3459 ``` 3465 ```
  3466 +##### resetKpDefault
  3467 +- **荳サ鬚**<sapn class="yellowFill">/manage/{baseSN}/send</span>
  3468 +- **蜉溯謠剰ソー**:諱「螟埼醗逶伜蜴りョセ鄂ョ
  3469 +- **蜿よ焚隸エ譏**
  3470 +
  3471 +|蜿よ焚蜷鋼邀サ蝙弓髯仙宛|譏ッ蜷ヲ蠢。ォ|隸エ譏旨
  3472 +|---|---|---|---|---|
  3473 +|fun|string|-|譏ッ|謖サ、蜷咲ァー|
  3474 +|dataTag|string|-|蜷ヲ|謨ー謐ョ蛹ッ,蜿ッ荳コ遨コ蟄礼ャヲ荳イ|
  3475 +|data|object|-|譏ッ|莨騾∝盾謨ー逧ッケ雎。|
  3476 +<!-- |+time|string|謨ー蟄慾譏ッ|譌カ髣エ軽yyyMMddHHmmss|
  3477 +|+verCode|string||譏ッ|蜀Κ荳サ鬚俶。鬪檎シ梧慮髣エ+蝗コ螳嗅ey蜉蟇 -->
  3478 +
  3479 +- **遉コ萓倶サ」遐**
  3480 +```json
  3481 +{
  3482 + "fun":"resetKpDefault",
  3483 + "dataTag":"1"
  3484 +}
  3485 +```
3460 </inner> 3486 </inner>
3461 3487
3462 #### 莠倶サカ 3488 #### 莠倶サカ
@@ -3595,7 +3621,7 @@ WebSocket譁ケ蠑丞コ皮畑荳惨DK謌門渕遶吝サコ遶矩柄霑樊磁蜷趣シ碁夊ソebSocket謗・蜿」蜿 @@ -3595,7 +3621,7 @@ WebSocket譁ケ蠑丞コ皮畑荳惨DK謌門渕遶吝サコ遶矩柄霑樊磁蜷趣シ碁夊ソebSocket謗・蜿」蜿
3595 |baseSn|string||譏ッ|蝓コ遶咏噪蜃コ蜴らシ也− 3621 |baseSn|string||譏ッ|蝓コ遶咏噪蜃コ蜴らシ也−
3596 |data|array|-|蜷ヲ|莨騾∝盾謨ー逧ッケ雎。謨ー扈л 3622 |data|array|-|蜷ヲ|莨騾∝盾謨ー逧ッケ雎。謨ー扈л
3597 |++keySn|string||譏ッ|髴隕∬ョセ鄂ョ扈大ョ壻ソ。諱ッ逧醗逶牢N| 3623 |++keySn|string||譏ッ|髴隕∬ョセ鄂ョ扈大ョ壻ソ。諱ッ逧醗逶牢N|
3598 -|++state|string||譏ッ|隶セ鄂ョ逧サ大ョ壻ソ。諱ッ譏ッ蜷ヲ謌仙粥<br>0 - 謌仙粥<br>1 - 螟ア雍・| 3624 +|++state|string||譏ッ|隶セ鄂ョ逧サ大ョ壻ソ。諱ッ譏ッ蜷ヲ謌仙粥<br>0 - 謌仙粥<br>1 - 雜慮螟ア雍・<br>2 - 蜿よ焚髞呵ッッ|
3599 3625
3600 - **遉コ萓倶サ」遐** 3626 - **遉コ萓倶サ」遐**
3601 3627
@@ -4268,7 +4294,7 @@ WebSocket譁ケ蠑丞コ皮畑荳惨DK謌門渕遶吝サコ遶矩柄霑樊磁蜷趣シ碁夊ソebSocket謗・蜿」蜿 @@ -4268,7 +4294,7 @@ WebSocket譁ケ蠑丞コ皮畑荳惨DK謌門渕遶吝サコ遶矩柄霑樊磁蜷趣シ碁夊ソebSocket謗・蜿」蜿
4268 "baseSn":"2024061101", 4294 "baseSn":"2024061101",
4269 "data":{ 4295 "data":{
4270 "keySns":[], 4296 "keySns":[],
4271 - "mode": 0, 4297 + "mode": 1,
4272 "allowModify":1 4298 "allowModify":1
4273 } 4299 }
4274 } 4300 }
@@ -4400,7 +4426,7 @@ WebSocket譁ケ蠑丞コ皮畑荳惨DK謌門渕遶吝サコ遶矩柄霑樊磁蜷趣シ碁夊ソebSocket謗・蜿」蜿 @@ -4400,7 +4426,7 @@ WebSocket譁ケ蠑丞コ皮畑荳惨DK謌門渕遶吝サコ遶矩柄霑樊磁蜷趣シ碁夊ソebSocket謗・蜿」蜿
4400 |baseSn|string||譏ッ|蝓コ遶咏噪蜃コ蜴らシ也− 4426 |baseSn|string||譏ッ|蝓コ遶咏噪蜃コ蜴らシ也−
4401 |data|array|-|蜷ヲ|莨騾∝盾謨ー逧ッケ雎。謨ー扈л 4427 |data|array|-|蜷ヲ|莨騾∝盾謨ー逧ッケ雎。謨ー扈л
4402 |++keySn|string||譏ッ|髞ョ逶牢N| 4428 |++keySn|string||譏ッ|髞ョ逶牢N|
4403 -|++state|string||譏ッ|遏ュ菫。諱ッ譏ッ蜷ヲ謌仙粥蜿鷹<br>0 - 謌仙粥<br>1 - 螟ア雍・| 4429 +|++state|string||譏ッ|遏ュ菫。諱ッ譏ッ蜷ヲ謌仙粥蜿鷹<br>0 - 謌仙粥<br>1 - 雜慮螟ア雍・<br>2 - 蜿よ焚髞呵ッッ |
4404 4430
4405 - **遉コ萓倶サ」遐** 4431 - **遉コ萓倶サ」遐**
4406 ```json 4432 ```json