Commit 6e0a8d810508d87bcf028ce5a5e6e4ef17a19a2d
1 parent
6e1c7072
feat:gps now & history data
Showing
2 changed files
with
31 additions
and
3 deletions
HDFwear/20240126ReadMe.md
@@ -75,4 +75,21 @@ BluetoothManager+Function | @@ -75,4 +75,21 @@ BluetoothManager+Function | ||
75 | 接收: [237, 126, 0, 1, 128, 9, 0, 1, 0, 64, 101, 155, 227, 192, 0, 0, 46, 224, 0, 0, 78, 32, 0, 0, 23, 112, 101, 155, 241, 208, 0, 0, 46, 224, 0, 0, 82, 8, 0, 0, 23, 112, 101, 155, 255, 224, 0, 0, 46, 224, 0, 0, 85, 240, 0, 0, 23, 112, 101, 156, 13, 240, 0, 0, 46, 224, 0, 0, 89, 216, 0, 0, 23, 112, 166, 117] | 75 | 接收: [237, 126, 0, 1, 128, 9, 0, 1, 0, 64, 101, 155, 227, 192, 0, 0, 46, 224, 0, 0, 78, 32, 0, 0, 23, 112, 101, 155, 241, 208, 0, 0, 46, 224, 0, 0, 82, 8, 0, 0, 23, 112, 101, 155, 255, 224, 0, 0, 46, 224, 0, 0, 85, 240, 0, 0, 23, 112, 101, 156, 13, 240, 0, 0, 46, 224, 0, 0, 89, 216, 0, 0, 23, 112, 166, 117] |
76 | 接收: [237, 126, 0, 1, 128, 9, 0, 2, 0, 1, 255, 206, 145] | 76 | 接收: [237, 126, 0, 1, 128, 9, 0, 2, 0, 1, 255, 206, 145] |
77 | 77 | ||
78 | +拉取GPS轨迹数据 | ||
79 | + func newGetGpsData(option: SyncOption = .now, closure: GpsClosure? = nil) | ||
80 | + 当前 | ||
81 | + 发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 2, 10, 1, 201, 3] | ||
82 | + 接收: [237, 126, 0, 1, 128, 37, 0, 1, 0, 169, 1, 101, 133, 64, 133, 0, 0, 0, 20, 13, 84, 119, 118, 0, 1, 134, 160, 67, 167, 129, 234, 0, 1, 134, 160, 13, 84, 119, 218, 0, 1, 134, 160, 67, 167, 133, 210, 0, 1, 134, 160, 13, 84, 120, 62, 0, 1, 134, 160, 67, 167, 137, 186, 0, 1, 134, 160, 13, 84, 120, 162, 0, 1, 134, 160, 67, 167, 141, 162, 0, 1, 134, 160, 13, 84, 121, 6, 0, 1, 134, 160, 67, 167, 145, 138, 0, 1, 134, 160, 13, 84, 121, 106, 0, 1, 134, 160, 67, 167, 149, 114, 0, 1, 134, 160, 13, 84, 123, 94, 0, 1, 134, 160, 67, 167, 153, 90, 0, 1, 134, 160, 13, 84, 127, 70, 0, 1, 134, 160, 67, 167, 157, 66, 0, 1, 134, 160, 13, 84, 131, 46, 0, 1, 134, 160, 67, 167, 161, 42, 0, 1, 134, 160, 13, 84, 135, 22, 0, 1, 134, 160, 67, 167, 165, 18, 0, 1, 134, 160, 215, 137] | ||
83 | + 接收: [237, 126, 0, 1, 128, 37, 0, 1, 0, 169, 1, 101, 133, 64, 133, 0, 0, 0, 20, 13, 84, 138, 254, 0, 1, 134, 160, 67, 167, 168, 250, 0, 1, 134, 160, 13, 84, 142, 230, 0, 1, 134, 160, 67, 167, 172, 226, 0, 1, 134, 160, 13, 84, 146, 206, 0, 1, 134, 160, 67, 167, 176, 202, 0, 1, 134, 160, 13, 84, 142, 230, 0, 1, 134, 160, 67, 167, 172, 226, 0, 1, 134, 160, 13, 84, 138, 254, 0, 1, 134, 160, 67, 167, 168, 250, 0, 1, 134, 160, 13, 84, 135, 22, 0, 1, 134, 160, 67, 167, 161, 42, 0, 1, 134, 160, 13, 84, 131, 46, 0, 1, 134, 160, 67, 167, 157, 66, 0, 1, 134, 160, 13, 84, 123, 94, 0, 1, 134, 160, 67, 167, 153, 90, 0, 1, 134, 160, 13, 84, 119, 118, 0, 1, 134, 160, 67, 167, 149, 114, 0, 1, 134, 160, 13, 84, 115, 142, 0, 1, 134, 160, 67, 167, 141, 162, 0, 1, 134, 160, 68, 78] | ||
84 | + 接收: [237, 126, 0, 1, 128, 37, 0, 1, 0, 1, 255, 107, 166] | ||
85 | + 历史 | ||
86 | + 发送: [237, 126, 0, 1, 0, 40, 0, 1, 0, 2, 10, 2, 249, 96] | ||
87 | + 接收: [237, 126, 0, 1, 128, 37, 0, 1, 0, 169, 1, 101, 133, 64, 133, 0, 0, 0, 20, 13, 84, 119, 118, 0, 1, 134, 160, 67, 167, 129, 234, 0, 1, 134, 160, 13, 84, 119, 218, 0, 1, 134, 160, 67, 167, 133, 210, 0, 1, 134, 160, 13, 84, 120, 62, 0, 1, 134, 160, 67, 167, 137, 186, 0, 1, 134, 160, 13, 84, 120, 162, 0, 1, 134, 160, 67, 167, 141, 162, 0, 1, 134, 160, 13, 84, 121, 6, 0, 1, 134, 160, 67, 167, 145, 138, 0, 1, 134, 160, 13, 84, 121, 106, 0, 1, 134, 160, 67, 167, 149, 114, 0, 1, 134, 160, 13, 84, 123, 94, 0, 1, 134, 160, 67, 167, 153, 90, 0, 1, 134, 160, 13, 84, 127, 70, 0, 1, 134, 160, 67, 167, 157, 66, 0, 1, 134, 160, 13, 84, 131, 46, 0, 1, 134, 160, 67, 167, 161, 42, 0, 1, 134, 160, 13, 84, 135, 22, 0, 1, 134, 160, 67, 167, 165, 18, 0, 1, 134, 160, 215, 137] | ||
88 | + 接收: [237, 126, 0, 1, 128, 37, 0, 1, 0, 169, 1, 101, 133, 64, 133, 0, 0, 0, 20, 13, 84, 138, 254, 0, 1, 134, 160, 67, 167, 168, 250, 0, 1, 134, 160, 13, 84, 142, 230, 0, 1, 134, 160, 67, 167, 172, 226, 0, 1, 134, 160, 13, 84, 146, 206, 0, 1, 134, 160, 67, 167, 176, 202, 0, 1, 134, 160, 13, 84, 142, 230, 0, 1, 134, 160, 67, 167, 172, 226, 0, 1, 134, 160, 13, 84, 138, 254, 0, 1, 134, 160, 67, 167, 168, 250, 0, 1, 134, 160, 13, 84, 135, 22, 0, 1, 134, 160, 67, 167, 161, 42, 0, 1, 134, 160, 13, 84, 131, 46, 0, 1, 134, 160, 67, 167, 157, 66, 0, 1, 134, 160, 13, 84, 123, 94, 0, 1, 134, 160, 67, 167, 153, 90, 0, 1, 134, 160, 13, 84, 119, 118, 0, 1, 134, 160, 67, 167, 149, 114, 0, 1, 134, 160, 13, 84, 115, 142, 0, 1, 134, 160, 67, 167, 141, 162, 0, 1, 134, 160, 68, 78] | ||
89 | + 接收: [237, 126, 0, 1, 128, 37, 0, 1, 0, 1, 255, 107, 166] | ||
90 | + | ||
91 | + | ||
92 | + | ||
93 | + | ||
94 | + | ||
78 | 接受数据类 | 95 | 接受数据类 |
HDFwear/Mine/MineViewController.swift
@@ -569,8 +569,18 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate { | @@ -569,8 +569,18 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate { | ||
569 | } | 569 | } |
570 | } | 570 | } |
571 | 571 | ||
572 | - let archiveAction101 = UIAlertAction(title: "newGetGpsData", style: .default) {[weak self] action in | ||
573 | - BluetoothManager.shared.newGetGpsData() {gpsModel, error in | 572 | + let archiveAction101a = UIAlertAction(title: "newGetGpsData now", style: .default) {[weak self] action in |
573 | + BluetoothManager.shared.newGetGpsData(option: .now) {gpsModel, error in | ||
574 | + if error != nil { | ||
575 | + print("newGetGpsData" + (error?.description ?? "")) | ||
576 | + }else { | ||
577 | + self?.showDetailAlert(msg: gpsModel?.description) | ||
578 | + print("newGetGpsData success") | ||
579 | + } | ||
580 | + } | ||
581 | + } | ||
582 | + let archiveAction101b = UIAlertAction(title: "newGetGpsData history", style: .default) {[weak self] action in | ||
583 | + BluetoothManager.shared.newGetGpsData(option: .history) {gpsModel, error in | ||
574 | if error != nil { | 584 | if error != nil { |
575 | print("newGetGpsData" + (error?.description ?? "")) | 585 | print("newGetGpsData" + (error?.description ?? "")) |
576 | }else { | 586 | }else { |
@@ -593,7 +603,8 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate { | @@ -593,7 +603,8 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate { | ||
593 | alert.addAction(archiveAction17a) | 603 | alert.addAction(archiveAction17a) |
594 | alert.addAction(archiveAction17b) | 604 | alert.addAction(archiveAction17b) |
595 | alert.addAction(archiveAction22) | 605 | alert.addAction(archiveAction22) |
596 | - alert.addAction(archiveAction101) | 606 | + alert.addAction(archiveAction101a) |
607 | + alert.addAction(archiveAction101b) | ||
597 | 608 | ||
598 | alert.addAction(UIAlertAction(title: "取消", style: .destructive, handler: nil)) | 609 | alert.addAction(UIAlertAction(title: "取消", style: .destructive, handler: nil)) |
599 | present(alert, animated: true, completion: nil) | 610 | present(alert, animated: true, completion: nil) |