Commit ee74e4fd36d8d45d482fb6043bd452a161678205
1 parent
006c74c6
feat:receive 0xff
Showing
1 changed file
with
50 additions
and
8 deletions
HDFwear/Tools/BluetoothManager+Function.swift
@@ -412,7 +412,13 @@ extension BluetoothManager { | @@ -412,7 +412,13 @@ extension BluetoothManager { | ||
412 | case 0x8009:// 实时步数、卡路里、距离自动上报 | 412 | case 0x8009:// 实时步数、卡路里、距离自动上报 |
413 | print("实时步数、卡路里、距离自动上报") | 413 | print("实时步数、卡路里、距离自动上报") |
414 | let content = parseContentFromBytes(bytes) | 414 | let content = parseContentFromBytes(bytes) |
415 | - parseStepCalorieDistanceData(content) | 415 | + if (content.count == 1 && content.first == 0xff) { |
416 | + for delegate in syncDelegateList { | ||
417 | + delegate.didReceiveFinishCommand(0x8009) | ||
418 | + } | ||
419 | + }else { | ||
420 | + parseStepCalorieDistanceData(content) | ||
421 | + } | ||
416 | case 0x8010:// 电量变化自动上报 | 422 | case 0x8010:// 电量变化自动上报 |
417 | print("电量变化自动上报") | 423 | print("电量变化自动上报") |
418 | Battery = Int(bytes[10]) | 424 | Battery = Int(bytes[10]) |
@@ -435,19 +441,37 @@ extension BluetoothManager { | @@ -435,19 +441,37 @@ extension BluetoothManager { | ||
435 | case 0x8016:// 历史心率数据上报 | 441 | case 0x8016:// 历史心率数据上报 |
436 | print("历史心率数据上报") | 442 | print("历史心率数据上报") |
437 | let content = parseContentFromBytes(bytes) | 443 | let content = parseContentFromBytes(bytes) |
438 | - parseHeartRateData(content) | 444 | + if (content.count == 1 && content.first == 0xff) { |
445 | + for delegate in syncDelegateList { | ||
446 | + delegate.didReceiveFinishCommand(0x8016) | ||
447 | + } | ||
448 | + }else { | ||
449 | + parseHeartRateData(content) | ||
450 | + } | ||
439 | case 0x8017:// 历史血氧数据上报 | 451 | case 0x8017:// 历史血氧数据上报 |
440 | print("历史血氧数据上报") | 452 | print("历史血氧数据上报") |
441 | let content = parseContentFromBytes(bytes) | 453 | let content = parseContentFromBytes(bytes) |
442 | - parseBlooodOxygenData(content) | 454 | + if (content.count == 1 && content.first == 0xff) { |
455 | + for delegate in syncDelegateList { | ||
456 | + delegate.didReceiveFinishCommand(0x8017) | ||
457 | + } | ||
458 | + }else { | ||
459 | + parseBlooodOxygenData(content) | ||
460 | + } | ||
443 | case 0x8018:// 历史体温数据上报 | 461 | case 0x8018:// 历史体温数据上报 |
444 | print("历史体温数据上报") | 462 | print("历史体温数据上报") |
445 | let content = parseContentFromBytes(bytes) | 463 | let content = parseContentFromBytes(bytes) |
446 | - parseTemperaturData(content) | 464 | + if (content.count == 1 && content.first == 0xff) { |
465 | + for delegate in syncDelegateList { | ||
466 | + delegate.didReceiveFinishCommand(0x8018) | ||
467 | + } | ||
468 | + }else { | ||
469 | + parseTemperaturData(content) | ||
470 | + } | ||
447 | case 0x8019:// 睡眠数据上报 | 471 | case 0x8019:// 睡眠数据上报 |
448 | print("睡眠数据上报") | 472 | print("睡眠数据上报") |
449 | let content = parseContentFromBytes(bytes) | 473 | let content = parseContentFromBytes(bytes) |
450 | - if (content.first == 0xff) { | 474 | + if (content.count == 1 && content.first == 0xff) { |
451 | for delegate in syncDelegateList { | 475 | for delegate in syncDelegateList { |
452 | delegate.didReceiveFinishCommand(0x8019) | 476 | delegate.didReceiveFinishCommand(0x8019) |
453 | } | 477 | } |
@@ -457,11 +481,23 @@ extension BluetoothManager { | @@ -457,11 +481,23 @@ extension BluetoothManager { | ||
457 | case 0x8020:// 历史压力数据上报 | 481 | case 0x8020:// 历史压力数据上报 |
458 | print("历史压力数据上报") | 482 | print("历史压力数据上报") |
459 | let content = parseContentFromBytes(bytes) | 483 | let content = parseContentFromBytes(bytes) |
460 | - parsePressureData(content) | 484 | + if (content.count == 1 && content.first == 0xff) { |
485 | + for delegate in syncDelegateList { | ||
486 | + delegate.didReceiveFinishCommand(0x8020) | ||
487 | + } | ||
488 | + }else { | ||
489 | + parsePressureData(content) | ||
490 | + } | ||
461 | case 0x8021:// 分时段计步数据上报 | 491 | case 0x8021:// 分时段计步数据上报 |
462 | print("分时段计步数据上报") | 492 | print("分时段计步数据上报") |
463 | let content = parseContentFromBytes(bytes) | 493 | let content = parseContentFromBytes(bytes) |
464 | - parseStepData(content) | 494 | + if (content.count == 1 && content.first == 0xff) { |
495 | + for delegate in syncDelegateList { | ||
496 | + delegate.didReceiveFinishCommand(0x8021) | ||
497 | + } | ||
498 | + }else { | ||
499 | + parseStepData(content) | ||
500 | + } | ||
465 | case 0x8022:// 遥控拍照 | 501 | case 0x8022:// 遥控拍照 |
466 | print("遥控拍照") | 502 | print("遥控拍照") |
467 | let stauts = bytes[10] | 503 | let stauts = bytes[10] |
@@ -471,7 +507,13 @@ extension BluetoothManager { | @@ -471,7 +507,13 @@ extension BluetoothManager { | ||
471 | case 0x8025://手表户外运动定位轨迹 | 507 | case 0x8025://手表户外运动定位轨迹 |
472 | print("运动轨迹") | 508 | print("运动轨迹") |
473 | let content = parseContentFromBytes(bytes) | 509 | let content = parseContentFromBytes(bytes) |
474 | -// parseStepData(content) | 510 | + if (content.count == 1 && content.first == 0xff) { |
511 | + for delegate in syncDelegateList { | ||
512 | + delegate.didReceiveFinishCommand(0x8025) | ||
513 | + } | ||
514 | + }else { | ||
515 | + // parseStepData(content) | ||
516 | + } | ||
475 | default: | 517 | default: |
476 | break | 518 | break |
477 | } | 519 | } |