From c8e3bebbb1d772fbfa709c66238d1ebddccd9353 Mon Sep 17 00:00:00 2001 From: jason Date: Wed, 3 Jan 2024 18:36:51 +0800 Subject: [PATCH] feat:set user info --- HDFwear/20240110ReadMe.md | 5 +++++ HDFwear/Mine/Model/UserInfo.swift | 2 +- HDFwear/ReadMe.txt | 4 ---- HDFwear/Tools/BleMessage+Function.swift | 2 +- HDFwear/Tools/BluetoothManager+Function.swift | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/HDFwear/20240110ReadMe.md b/HDFwear/20240110ReadMe.md index 535bfa9..8203ade 100644 --- a/HDFwear/20240110ReadMe.md +++ b/HDFwear/20240110ReadMe.md @@ -55,3 +55,8 @@ BluetoothManager+Function func newSetBloodOxygenAutoDetect(bool: Bool, completion: ((_ error: Int?) -> ())? = nil) 发送: [237, 126, 0, 1, 0, 37, 0, 1, 0, 1, 1, 206, 142] 接收: [237, 126, 0, 1, 128, 1, 0, 1, 0, 5, 0, 1, 0, 37, 0, 15, 96] + +设置用户信息 + func newSetUserInfo(_ user: UserInfoModel, completion: ((_ error: Int?) -> ())? = nil) + 发送: [237, 126, 0, 1, 0, 38, 0, 1, 0, 6, 0, 65, 0, 175, 1, 24, 45, 240] + 接收: [237, 126, 0, 1, 128, 1, 0, 1, 0, 5, 0, 1, 0, 38, 0, 90, 51] diff --git a/HDFwear/Mine/Model/UserInfo.swift b/HDFwear/Mine/Model/UserInfo.swift index 5f9ea6c..a0baa21 100644 --- a/HDFwear/Mine/Model/UserInfo.swift +++ b/HDFwear/Mine/Model/UserInfo.swift @@ -402,7 +402,7 @@ class ContactModel: NSObject, HandyJSON { class UserInfoModel: NSObject, HandyJSON { var name: String = "" - var gender: Int = 1 // 1男 0女 + var gender: Int = 1 // 0男 1女 var mac: String = "" var height: Int = 175 //cm var weight: Int = 65 //kg diff --git a/HDFwear/ReadMe.txt b/HDFwear/ReadMe.txt index 6183778..baf961e 100644 --- a/HDFwear/ReadMe.txt +++ b/HDFwear/ReadMe.txt @@ -43,10 +43,6 @@ BluetoothManager+Function func newSetFindWatch(bool: Bool, completion: ((_ error: Int?) -> ())? = nil) 发送: [237, 126, 0, 1, 0, 32, 0, 1, 0, 1, 1, 141, 143] 接收: [237, 126, 0, 1, 128, 1, 0, 38, 0, 5, 0, 1, 0, 32, 0, 76, 229] - -17. 设置用户信息 - func newSetUserInfo(_ user: UserInfoModel, completion: ((_ error: Int?) -> ())? = nil) - 发送: [237, 126, 0, 1, 0, 38, 0, 1, 0, 5, 0, 65, 0, 175, 1, 41, 211] 18. 设置勿扰模式 func newSetNotDisturb(remind: RemindModel, weekflag:[WeekFlag], isRepeat:Bool, completion: @escaping(_ error: Int?) -> ()) diff --git a/HDFwear/Tools/BleMessage+Function.swift b/HDFwear/Tools/BleMessage+Function.swift index c6c3826..72f315f 100644 --- a/HDFwear/Tools/BleMessage+Function.swift +++ b/HDFwear/Tools/BleMessage+Function.swift @@ -107,7 +107,7 @@ extension BleMessage { } func getUserInfoCmd(_ user: UserInfoModel) -> Data { - let bytes = [0x00, UInt8(user.weight), 0x00, UInt8(user.height), UInt8(user.gender)] + let bytes = [0x00, UInt8(user.weight), 0x00, UInt8(user.height), UInt8(user.gender), UInt8(user.age)] return createDataPacket(key: .setUserInfo, bytes: bytes) } diff --git a/HDFwear/Tools/BluetoothManager+Function.swift b/HDFwear/Tools/BluetoothManager+Function.swift index b1ed80d..6d485b1 100644 --- a/HDFwear/Tools/BluetoothManager+Function.swift +++ b/HDFwear/Tools/BluetoothManager+Function.swift @@ -156,7 +156,7 @@ extension BluetoothManager { } // 设置用户信息 - // user 使用UserInfoModel数据类型,该接口只支持身高、体重、性别的设置,对应是weight、height、gender + // user 使用UserInfoModel数据类型,该接口只支持身高、体重、性别、年龄的设置,对应是weight、height、gender、age func newSetUserInfo(_ user: UserInfoModel, completion: ((_ error: Int?) -> ())? = nil) { let data = BleMessage.shared.getUserInfoCmd(user) self.setCmdClosure = completion -- libgit2 0.21.4