2.Modify the search device to return an object model uniformly. 3.Repair stop search device missing an enumeration return.tags/v1.4.5_20211215
| @@ -0,0 +1,14 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | |||
| <plist version="1.0"> | |||
| <dict> | |||
| <key>SchemeUserState</key> | |||
| <dict> | |||
| <key>AILinkBleSDKDemo.xcscheme_^#shared#^_</key> | |||
| <dict> | |||
| <key>orderHint</key> | |||
| <integer>0</integer> | |||
| </dict> | |||
| </dict> | |||
| </dict> | |||
| </plist> | |||
| @@ -7,17 +7,17 @@ | |||
| // | |||
| #import "ELBluetoothManager.h" | |||
| #import "ELBabyScaleDeviceModel.h" | |||
| #import "ELBabyScaleBleWeightModel.h" | |||
| #import "ELBabyScaleBleHeightModel.h" | |||
| #import "ELBabyScaleBleHeader.h" | |||
| @class ELPeripheralModel; | |||
| @protocol BabyScaleBleDelegate <NSObject> | |||
| @optional | |||
| //Callback Bluetooth status(回调蓝牙状态) | |||
| - (void)babyScaleManagerUpdateState:(ELBluetoothState)state; | |||
| //Callback to all baby scale equipment(回调所有婴儿秤设备) | |||
| - (void)babyScaleManagerScanDevices:(NSArray<ELBabyScaleDeviceModel *> *_Nullable)babyScaleDevices; | |||
| - (void)babyScaleManagerScanDevices:(NSArray<ELPeripheralModel *> *_Nullable)babyScaleDevices; | |||
| //Callback weight data(回调体重数据) | |||
| - (void)babyScaleManagerReceiveWeightModel:(ELBabyScaleBleWeightModel *_Nonnull)model; | |||
| //Callback height data(回调身高数据) | |||
| @@ -1,18 +0,0 @@ | |||
| // | |||
| // ELBleBabyScalePeripheralModel.h | |||
| // Elink | |||
| // | |||
| // Created by iot_user on 2019/4/19. | |||
| // Copyright © 2019 iot_iMac. All rights reserved. | |||
| // | |||
| #import "ELPeripheralModel.h" | |||
| NS_ASSUME_NONNULL_BEGIN | |||
| @interface ELBabyScaleDeviceModel : ELPeripheralModel | |||
| @end | |||
| NS_ASSUME_NONNULL_END | |||
| @@ -11,7 +11,7 @@ | |||
| #import "ELBloodBleDataModel.h" | |||
| @class ELPeripheralModel; | |||
| typedef NS_ENUM(NSUInteger, ELBloodBleDataType) { | |||
| ELBloodBleDataTypeStableData = 0x01, //Stable data(稳定数据) | |||
| ELBloodBleDataTypeRealTimeData = 0x02, //Real-time data(实时数据) | |||
| @@ -9,7 +9,7 @@ | |||
| #import "ELBluetoothManager.h" | |||
| #import "ELBodyFatScaleBleHeader.h" | |||
| @class ELBodyFatScaleBleUserModel,ELBodyFatScaleBleWeightModel,ELBodyFatScaleDeviceModel; | |||
| @class ELBodyFatScaleBleUserModel,ELBodyFatScaleBleWeightModel,ELPeripheralModel; | |||
| NS_ASSUME_NONNULL_BEGIN | |||
| @protocol ELBodyFatScaleBleDelegate <NSObject> | |||
| @@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN | |||
| - (void)bodyFatScaleManagerUpdateState:(ELBluetoothState )state; | |||
| /**Callback all body fat scales detected( 回调扫描到的所有体脂秤 )*/ | |||
| - (void)bodyFatScaleManagerScanDevices:(NSArray<ELBodyFatScaleDeviceModel *> *)scaleDevices; | |||
| - (void)bodyFatScaleManagerScanDevices:(NSArray<ELPeripheralModel *> *)scaleDevices; | |||
| //MARK:回调A7指令数据 | |||
| /** | |||
| @@ -0,0 +1,48 @@ | |||
| // | |||
| // ELBroadcastHeightGaugeBleDataModel.h | |||
| // AILinkBleSDK | |||
| // | |||
| // Created by cliCk on 2021/3/19. | |||
| // Copyright © 2021 IOT. All rights reserved. | |||
| // | |||
| #import <Foundation/Foundation.h> | |||
| #import "ELBroadcastHeightGaugeBleHeader.h" | |||
| #import "ELSDKHeader.h" | |||
| NS_ASSUME_NONNULL_BEGIN | |||
| @interface ELBroadcastHeightGaugeBleDataModel : NSObject | |||
| @property (nonatomic, assign) int cid; | |||
| @property (nonatomic, assign) int vid; | |||
| @property (nonatomic, assign) int pid; | |||
| @property (nonatomic, copy) NSString *mac; | |||
| /** Data serial number 流水号 */ | |||
| @property (nonatomic, assign) NSInteger serialNumber; | |||
| /** Measurement status 测量标识符 */ | |||
| @property (nonatomic, assign) BroadcastHeightGuage_TestState testState; | |||
| /** 身高数据 */ | |||
| @property (nonatomic, assign) float height; | |||
| /** 身高单位 */ | |||
| @property (nonatomic, assign) ELDeviceHeightUnit heightUnit; | |||
| /** 体重数据 */ | |||
| @property (nonatomic, assign) float weight; | |||
| /** 体重单位 */ | |||
| @property (nonatomic, assign) ELDeviceWeightUnit weightUnit; | |||
| /** 电量 0~100 ,如果值为负数,则代表该设备无电量检测 */ | |||
| @property (nonatomic, assign) NSInteger power; | |||
| /** time(时间) */ | |||
| @property (nonatomic, assign) long long createTime; | |||
| @end | |||
| NS_ASSUME_NONNULL_END | |||
| @@ -0,0 +1,27 @@ | |||
| // | |||
| // ELBroadcastHeightGaugeBleHeader.h | |||
| // AILinkBleSDK | |||
| // | |||
| // Created by cliCk on 2021/3/19. | |||
| // Copyright © 2021 IOT. All rights reserved. | |||
| // | |||
| #ifndef ELBroadcastHeightGaugeBleHeader_h | |||
| #define ELBroadcastHeightGaugeBleHeader_h | |||
| /** 广播身高仪 测量标识符枚举定义 */ | |||
| typedef NS_ENUM(NSUInteger, BroadcastHeightGuage_TestState) { | |||
| /** 正在测量 */ | |||
| BroadcastHeightGuage_TestState_Measuring = 0x00 , | |||
| /** 稳定身高体重 */ | |||
| BroadcastHeightGuage_TestState_Stable = 0x01 , | |||
| /** 测量失败 */ | |||
| BroadcastHeightGuage_TestState_Failed = 0xFF , | |||
| }; | |||
| //身高数据标志 ELDeviceHeightUnit | |||
| //体重数据标志 ELDeviceWeightUnit | |||
| #endif /* ELBroadcastHeightGaugeBleHeader_h */ | |||
| @@ -0,0 +1,35 @@ | |||
| // | |||
| // ELBroadcastHeightGaugeBleManager.h | |||
| // AILinkBleSDK | |||
| // | |||
| // Created by cliCk on 2021/3/19. | |||
| // Copyright © 2021 IOT. All rights reserved. | |||
| // | |||
| #import "ELBluetoothManager.h" | |||
| #import "ELBroadcastHeightGaugeBleDataModel.h" | |||
| NS_ASSUME_NONNULL_BEGIN | |||
| @protocol ELBroadcastHeightGaugeBleDelegate <NSObject> | |||
| @optional | |||
| /**Callback Bluetooth status(回调蓝牙状态) */ | |||
| - (void)broadcastHeightGaugeUpdateState:(ELBluetoothState)state; | |||
| /** Call back all height gauge devices(回调所有身高仪设备) */ | |||
| //- (void)broadcastHeightGaugeScanDevices:(NSArray<ELPeripheralModel *> *)heightGaugeDevices; | |||
| /** 回调身高数据 */ | |||
| - (void)broadcastHeightGaugeDeviceDataModel:(ELBroadcastHeightGaugeBleDataModel *)model; | |||
| @end | |||
| @interface ELBroadcastHeightGaugeBleManager : ELBluetoothManager | |||
| @property (nonatomic, weak) id<ELBroadcastHeightGaugeBleDelegate> heightGaugeDelegate; | |||
| @end | |||
| NS_ASSUME_NONNULL_END | |||
| @@ -24,7 +24,7 @@ typedef NS_ENUM(NSUInteger, ForeheadBleDataType) { | |||
| ForeheadBleDataTypeFailCode = 0xFF, //Report an error message(上报错误信息) | |||
| }; | |||
| @class ELPeripheralModel; | |||
| @protocol ELForeheadBleManagerDelegate <NSObject> | |||
| @optional | |||
| @@ -0,0 +1,153 @@ | |||
| // | |||
| // ELHeightBodyFatScaleBleHeader.h | |||
| // AILinkBleSDK | |||
| // | |||
| // Created by cliCk on 2021/3/24. | |||
| // Copyright © 2021 IOT. All rights reserved. | |||
| // | |||
| #ifndef ELHeightBodyFatScaleBleHeader_h | |||
| #define ELHeightBodyFatScaleBleHeader_h | |||
| /** 身高体脂秤 ble head type 枚举定义 */ | |||
| typedef NS_ENUM (NSInteger, HeightBodyFatScale_BleHeadType){ | |||
| /* APP下发用户信息 */ | |||
| HeightBodyFatScale_BleHeadType_App_SendUserData = 0x01 , | |||
| /** MCU 返回收到用户数据结果 */ | |||
| HeightBodyFatScale_BleHeadType_MCU_ReturnUserData = 0x02 , | |||
| /** MCU请求用户信息 */ | |||
| HeightBodyFatScale_BleHeadType_MCU_RequestUserData = 0x03 , | |||
| /** APP/MCU 设置单位 */ | |||
| HeightBodyFatScale_BleHeadType_App_MCU_SetupUnit = 0x04 , | |||
| /** APP/MCU 回复设置结果 */ | |||
| HeightBodyFatScale_BleHeadType_App_MCU_ReturnUnitResult = 0x05 , | |||
| /** APP 下发工作模式 */ | |||
| HeightBodyFatScale_BleHeadType_App_SetWorkMode = 0x06 , | |||
| /** MCU回复工作模式 */ | |||
| HeightBodyFatScale_BleHeadType_MCU_ReturnWorkMode = 0x07 , | |||
| /** APP 读取声音设置 */ | |||
| HeightBodyFatScale_BleHeadType_App_GetVideoSetup = 0x08 , | |||
| /** APP/MCU 声音设置 */ | |||
| HeightBodyFatScale_BleHeadType_App_MCU_VideoSetup = 0x09 , | |||
| /** APP/MCU 回复声音设置 */ | |||
| HeightBodyFatScale_BleHeadType_App_MCU_ReturnVideoSetup = 0x0A , | |||
| /** APP 获取设备状态 */ | |||
| HeightBodyFatScale_BleHeadType_App_GetDeviceState = 0x0B , | |||
| /** MCU 回复设备状态 */ | |||
| HeightBodyFatScale_BleHeadType_MCU_ReturnDeviceState = 0x0C , | |||
| /** MCU 上报称重状态 */ | |||
| HeightBodyFatScale_BleHeadType_MCU_ReportWeighingState = 0x10 , | |||
| /** MCU 上报阻抗数据 */ | |||
| HeightBodyFatScale_BleHeadType_MCU_ReportAdcData = 0x11 , | |||
| /** MCU 上报心率数据 */ | |||
| HeightBodyFatScale_BleHeadType_MCU_ReportHeartRateData = 0x12 , | |||
| /** MCU 上报温度数据 */ | |||
| HeightBodyFatScale_BleHeadType_MCU_ReportTemData = 0x13 , | |||
| /** MCU 上报身高数据 */ | |||
| HeightBodyFatScale_BleHeadType_MCU_ReportHeightData = 0x14 , | |||
| /** MCU 上报体脂数据 */ | |||
| HeightBodyFatScale_BleHeadType_MCU_ReportBodyFatData = 0x15 , | |||
| /** MCU 上报抱婴模式的秤重状态 */ | |||
| HeightBodyFatScale_BleHeadType_MCU_ReportBabyWeighingState = 0x20 , | |||
| /** MCU 上报体重模式的秤重状态 */ | |||
| HeightBodyFatScale_BleHeadType_MCU_ReportBodyWeighingState = 0x30 , | |||
| /** MCU 发送测量完成 */ | |||
| HeightBodyFatScale_BleHeadType_MCU_SendWeighingCompleted = 0x80 , | |||
| /** APP 回复测量完成 */ | |||
| HeightBodyFatScale_BleHeadType_App_ReportWeighingCompleted = 0x81 , | |||
| /** MCU 上发错误码 */ | |||
| HeightBodyFatScale_BleHeadType_MCU_SendWrongCode = 0xFF , | |||
| }; | |||
| /** 身高体脂秤设置结果枚举定义 */ | |||
| typedef NS_ENUM (NSInteger, HeightBodyFatScale_SetupResult) { | |||
| /** 成功 */ | |||
| HeightBodyFatScale_SetupResult_Success = 0x00 , | |||
| /** 失败 */ | |||
| HeightBodyFatScale_SetupResult_Failure = 0x01 , | |||
| /** 不支持 */ | |||
| HeightBodyFatScale_SetupResult_NotSupport = 0x02 , | |||
| }; | |||
| /** 身高体脂秤工作模式枚举定义 */ | |||
| typedef NS_ENUM(NSInteger, HeightBodyFatScale_WorkModeType) { | |||
| /** 身高体脂模式 */ | |||
| HeightBodyFatScale_WorkModeType_HeightBodyFatMode = 0x01 , | |||
| /** 抱婴模式 */ | |||
| HeightBodyFatScale_WorkModeType_BabyMode = 0x02 , | |||
| /** 体重模式 */ | |||
| HeightBodyFatScale_WorkModeType_WeightMode = 0x03 , | |||
| }; | |||
| /** 身高体脂秤充电状态枚举定义 */ | |||
| typedef NS_ENUM(NSInteger, HeightBodyFatScale_ChargingType) { | |||
| /** 不充电 */ | |||
| HeightBodyFatScale_ChargingType_NotCharging = 0x00 , | |||
| /** 充电中 */ | |||
| HeightBodyFatScale_ChargingType_charging = 0x01 , | |||
| }; | |||
| /** 身高体脂秤体重是否稳定 */ | |||
| typedef NS_ENUM(NSInteger, HeightBodyFatScale_WeightStableType) { | |||
| /** 实时体重 */ | |||
| HeightBodyFatScale_WeightStableType_RealTime = 0x01 , | |||
| /** 稳定体重 */ | |||
| HeightBodyFatScale_WeightStableType_Stable = 0x02 , | |||
| }; | |||
| /** 身高体脂秤测量阻抗状态 */ | |||
| typedef NS_ENUM(NSInteger, HeightBodyFatScale_AdcStateType) { | |||
| /** 测量阻抗中 */ | |||
| HeightBodyFatScale_AdcStateType_Measuring = 0x01 , | |||
| /** 测量阻抗失败 */ | |||
| HeightBodyFatScale_AdcStateType_Failed = 0x02 , | |||
| /** 测量阻抗成功,使用App算法 */ | |||
| HeightBodyFatScale_AdcStateType_Success_UseAppAlgorithm = 0x03 , | |||
| /** 测量阻抗成功,使用MCU算法 */ | |||
| HeightBodyFatScale_AdcStateType_Success_UseMCUAlgorithm = 0x04 , | |||
| /** 测量阻抗结束 */ | |||
| HeightBodyFatScale_AdcStateType_Over = 0x05 , | |||
| }; | |||
| /** 阻抗通道枚举定义 */ | |||
| typedef NS_ENUM(NSInteger, HeightBodyFatScale_AdcAisleType) { | |||
| /** 双手阻抗 */ | |||
| HeightBodyFatScale_AdcAisleType_TwoFeets = 0x00 , | |||
| /** 双手阻抗 */ | |||
| HeightBodyFatScale_AdcAisleType_TwoHands = 0x01 , | |||
| /** 左手阻抗 */ | |||
| HeightBodyFatScale_AdcAisleType_LeftHand = 0x02 , | |||
| /** 右手阻抗 */ | |||
| HeightBodyFatScale_AdcAisleType_RightHand = 0x03 , | |||
| /** 左脚阻抗 */ | |||
| HeightBodyFatScale_AdcAisleType_LeftFeet = 0x04 , | |||
| /** 右脚阻抗 */ | |||
| HeightBodyFatScale_AdcAisleType_RIghtFeet = 0x05 , | |||
| /** 左全身阻抗 */ | |||
| HeightBodyFatScale_AdcAisleType_LeftBody = 0x06 , | |||
| /** 右全身阻抗 */ | |||
| HeightBodyFatScale_AdcAisleType_RightBody = 0x07 , | |||
| /** 右手左脚阻抗 */ | |||
| HeightBodyFatScale_AdcAisleType_RightHand_LeftFeet = 0x08 , | |||
| /** 左手右脚阻抗 */ | |||
| HeightBodyFatScale_AdcAisleType_LeftHand_RightFeet = 0x09 , | |||
| /** 躯干阻抗 */ | |||
| HeightBodyFatScale_AdcAisleType_Body = 0x0A , | |||
| }; | |||
| /** 心率测量状态枚举定义 */ | |||
| typedef NS_ENUM(NSInteger, HeightBodyFatScale_HeartRateStateType) { | |||
| /** 测心率中 */ | |||
| HeightBodyFatScale_HeartRateStateType_Measuring = 0x01 , | |||
| /** 测心率成功 */ | |||
| HeightBodyFatScale_HeartRateStateType_Success = 0x02 , | |||
| /** 测心率失败 */ | |||
| HeightBodyFatScale_HeartRateStateType_Failed = 0x03 , | |||
| }; | |||
| #endif /* ELHeightBodyFatScaleBleHeader_h */ | |||
| @@ -0,0 +1,144 @@ | |||
| // | |||
| // ELHeightBodyFatScaleBleManager.h | |||
| // AILinkBleSDK | |||
| // | |||
| // Created by cliCk on 2021/3/24. | |||
| // Copyright © 2021 IOT. All rights reserved. | |||
| // | |||
| #import "ELBluetoothManager.h" | |||
| #import "ELHeightBodyFatScaleBleHeader.h" | |||
| #import "ELSDKHeader.h" | |||
| NS_ASSUME_NONNULL_BEGIN | |||
| @class ELHeightBodyFatScaleBleWeightBodyModel; | |||
| @class ELPeripheralModel; | |||
| @protocol ELHeightBodyFatScaleBleDelegate <NSObject> | |||
| @optional | |||
| /** 返回设备连接状态 */ | |||
| - (void)heightBodyFatScaleManagerUpdateState:(ELBluetoothState)state; | |||
| /** 回调扫描到的身高体脂秤 */ | |||
| - (void)heightBodyFatScaleManagerScanDevices:(NSArray<ELPeripheralModel *> *)scanDevices; | |||
| /** 回调用户信息谁结果 */ | |||
| - (void)heightBodyFatScaleManagerSetUserDataResult:(HeightBodyFatScale_SetupResult)result; | |||
| /** MCU主动请求用户信息 */ | |||
| - (void)heightBodyFatScaleManagerRequestUserData; | |||
| /** MCU设置单位 */ | |||
| - (void)heightBodyFatScaleManagerMCUSetHeightUnit:(ELDeviceHeightUnit)heightUnit weightUnit:(ELDeviceWeightUnit)weightUnit; | |||
| /** MCU回复单位设置结果 */ | |||
| - (void)heightBodyFatScaleManagerReportUnitResult:(HeightBodyFatScale_SetupResult)result; | |||
| /** MCU回复工作模式设置结果 */ | |||
| - (void)heightBodyFatScaleManagerWorkModeResult:(HeightBodyFatScale_SetupResult)result; | |||
| /** MCU回复声音设置结果 */ | |||
| - (void)heightBodyFatScaleManagerVideoSetupResult:(HeightBodyFatScale_SetupResult)result; | |||
| /** MCU回复设备状态 | |||
| * @param mode : 工作模式 | |||
| * @param power : 设备电量 | |||
| * @param charging : 是否在充电 | |||
| * @param weightUnit : 重量单位 | |||
| * @param heightUnit : 身高单位 | |||
| * @param video : 语音开关 | |||
| */ | |||
| - (void)heightBodyFatScaleManagerReportDevStateWithWorkMode:(HeightBodyFatScale_WorkModeType)mode power:(NSInteger)power charging:(BOOL)charging weightUnit:(ELDeviceWeightUnit)weightUnit height:(ELDeviceHeightUnit)heightUnit videoState:(BOOL)video; | |||
| #pragma mark - 身高体脂秤模式 | |||
| /** MCU上报称重状态 */ | |||
| - (void)heightBodyFatScaleManagerReportWeighingState:(HeightBodyFatScale_WeightStableType)stable weightNumber:(NSInteger)weight weightPoint:(NSInteger)point unit:(ELDeviceWeightUnit)unit; | |||
| /** MCU上报阻抗数据 | |||
| * @param state : 阻抗测量状态 | |||
| * @param aisle : 通道 | |||
| * @param adc : 阻抗 | |||
| * @param algorithmId : 体脂算法ID (若使用MCU端算法,则该值为 0 | |||
| */ | |||
| - (void)heightBodyFatScaleManagerReportAdcDataWithImpedanceState:(HeightBodyFatScale_AdcStateType)state aisle:(HeightBodyFatScale_AdcAisleType)aisle adc:(NSInteger)adc algorithmId:(NSInteger)algorithmId; | |||
| /** MCU上报心率数据 */ | |||
| - (void)heightBodyFatScaleManagerReportHeartRateDataWithState:(HeightBodyFatScale_HeartRateStateType)state bpm:(NSInteger)bpm; | |||
| /** MCU上报温度数据 | |||
| * @param negative : 是否为负温度 | |||
| * @param tem : 温度 | |||
| * @param point : 几位小数 | |||
| * @param unit 温度单位 | |||
| */ | |||
| - (void)heightBodyFatScaleManagerReportTemDataWithNegative:(BOOL)negative tem:(NSInteger)tem point:(NSInteger)point unit:(ELDeviceTemperatureUnit)unit; | |||
| /** MCU上报身高数据 */ | |||
| - (void)heightBodyFatScaleManagerReportHeightDataWithHeight:(NSInteger)height unit:(ELDeviceHeightUnit)unit point:(NSInteger)point; | |||
| /** MCU上报体脂数据 */ | |||
| - (void)heightBodyFatScaleManagerReportBodyFatDataWithDataModel:(ELHeightBodyFatScaleBleWeightBodyModel *)model; | |||
| #pragma mark - 抱婴模式 | |||
| /** MCU上报称重状态 | |||
| * @param stable : 测量状态 | |||
| * @param adultWeight : 成人体重 | |||
| * @param allWeight : 成人+婴儿总体重 | |||
| * @param babyWeight : 婴儿重量 | |||
| * @param point : 小数位 | |||
| * @param unit : 单位 | |||
| */ | |||
| - (void)heightBodyFatScaleManagerReportBabyModetWithWeighingState:(HeightBodyFatScale_WeightStableType)stable adultWeight:(NSInteger)adultWeight allWeight:(NSInteger)allWeight babyWeight:(NSInteger)babyWeight point:(NSInteger)point unit:(ELDeviceWeightUnit)unit; | |||
| #pragma mark - 体重模式 | |||
| /** MCU上报称重状态 */ | |||
| - (void)heightBodyFatScaleManagerReportWeightModeWithWeighingState:(HeightBodyFatScale_WeightStableType)stable weightNumber:(NSInteger)weight point:(NSInteger)point unit:(NSInteger)unit; | |||
| #pragma mark - | |||
| /** MCU发送测量完成 */ | |||
| - (void)heightBodyFatScaleManagerSendCompletedWithWorkMode:(HeightBodyFatScale_WorkModeType)type; | |||
| @end | |||
| @interface ELHeightBodyFatScaleBleManager : ELBluetoothManager | |||
| @property (nonatomic, weak) id<ELHeightBodyFatScaleBleDelegate> heightBodyFatScaleDelegate; | |||
| + (ELHeightBodyFatScaleBleManager *)shareManager; | |||
| //MARK:发送指令 | |||
| ///设置用户信息 | |||
| - (void)sendUserDataWithSex:(NSInteger)sex age:(NSInteger)age height:(NSInteger)cm; | |||
| ///App设置单位 | |||
| - (void)sendUnitWithHeightUnit:(ELDeviceHeightUnit)heightUnit weightUnit:(ELDeviceWeightUnit)weightUnit; | |||
| ///App回复单位设置结果 | |||
| - (void)reportUnitSetupResult:(HeightBodyFatScale_SetupResult)result; | |||
| //App下发工作模式 | |||
| - (void)sendDevceWorkMode:(HeightBodyFatScale_WorkModeType)model; | |||
| //App读取声音设置 | |||
| - (void)getVideoSetup; | |||
| //App声音设置 | |||
| - (void)sendVideoSetupState:(BOOL)state; | |||
| //App获取工作状态 | |||
| - (void)getWorkState; | |||
| //App回复测量完成 | |||
| - (void)sendWeighingCompleted; | |||
| @end | |||
| NS_ASSUME_NONNULL_END | |||
| @@ -18,7 +18,7 @@ typedef NS_ENUM(NSUInteger, HeightGaugeBleDataType) { | |||
| HeightGaugeBleDataTypeFailCode = 0xFF, //error code | |||
| }; | |||
| @class ELPeripheralModel; | |||
| @protocol ELHeightGaugeBleManagerDelegate <NSObject> | |||
| @optional | |||
| @@ -8,7 +8,8 @@ | |||
| #import <AILinkBleSDK/ELBluetoothManager.h> | |||
| #import "ELOximeterBleModel.h" | |||
| #import "ELOximeterDeviceModel.h" | |||
| @class ELPeripheralModel; | |||
| NS_ASSUME_NONNULL_BEGIN | |||
| @@ -54,7 +55,7 @@ typedef NS_ENUM(NSInteger, OximeterErrorCodeType) { | |||
| - (void)oximeterManagerBleState:(ELBluetoothState)state; | |||
| /** 回调搜索到的血氧仪设备 */ | |||
| - (void)oximeterManagerScanDevices:(NSArray<ELOximeterDeviceModel *> *)devices; | |||
| - (void)oximeterManagerScanDevices:(NSArray<ELPeripheralModel *> *)devices; | |||
| /** mcu上报设置信息 */ | |||
| - (void)oximeterManagerSetupState:(ELOximeterBleModel *)bleModel markType:(enum OximeterTestMarkType)markType; | |||
| @@ -9,8 +9,8 @@ | |||
| #import <Foundation/Foundation.h> | |||
| #import "ELRemoteControlBleHeader.h" | |||
| #import "ELBluetoothManager.h" | |||
| #import "ELRemoteControlDeviceModel.h" | |||
| @class ELPeripheralModel; | |||
| NS_ASSUME_NONNULL_BEGIN | |||
| @@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN | |||
| - (void)remoteControlManagerUpdateState:(ELBluetoothState )state; | |||
| /** 回调所有遥控器设备 */ | |||
| - (void)remoteControlManagerScanDevices:(NSArray<ELRemoteControlDeviceModel *> *)deviceList; | |||
| - (void)remoteControlManagerScanDevices:(NSArray<ELPeripheralModel *> *)deviceList; | |||
| @end | |||
| @@ -116,16 +116,18 @@ typedef NS_ENUM(NSUInteger, ELSupportDeviceType) { | |||
| ELSupportDeviceTypeBLE_EightScale = 0x0013 , //Eight electrode scale(八电极蓝牙秤) | |||
| ELSupportDeviceTypeAnemometer = 0x0014 , //anemometer(风速计),0x0015 | |||
| ELSupportDeviceTypeClampMeter = 0x0015 , //clamp meter(钳表) | |||
| ELSupportDeviceTypeOximeter = 0x0021 , //Oximeter (血氧仪) | |||
| ELSupportDeviceTypeWatch = 0x001D , //华盛达手表 | |||
| ELSupportDeviceTypeBloodSugar = 0x001C , //blood sugar(血糖仪) | |||
| ELSupportDeviceTypeInfThermt = 0x0020 , //Infrared Thermometer(红外测温仪) | |||
| ELSupportDeviceTypeOximeter = 0x0021 , //Oximeter (血氧仪) | |||
| ELSupportDeviceTypeFaceMask = 0x0022 , //face mask(智能口罩) | |||
| ELSupportDeviceTypeElectricScooter= 0x0025 , //滑板车 | |||
| ELSupportDeviceTypeHeightBodyFatScale = 0x0026 , //身高体脂秤 | |||
| ELSupportDeviceTypeBroadcastScale = (0xffff +0x01) , //655536 Broadcast body fat scale(AILink广播体脂秤) | |||
| ELSupportDeviceTypeBroadcastHeightGauge = (0xffff + 0x03) , //65538 广播身高仪 | |||
| ELSupportDeviceTypeBroadcastScale_Lingyang = (0xffff +0x16) , //65557 凌阳广播体脂秤 | |||
| @@ -7,7 +7,6 @@ | |||
| // | |||
| #import "ELBluetoothManager.h" | |||
| #import "ELThermometerDeviceModel.h" | |||
| #import "ELThermometerBleModel.h" | |||
| NS_ASSUME_NONNULL_BEGIN | |||
| @@ -46,6 +45,7 @@ typedef NS_ENUM(NSInteger , ThermometerBleErrorCode) { | |||
| ThermometerBleErrorCode_Failure , | |||
| }; | |||
| @class ELPeripheralModel; | |||
| @protocol ELThermometerBleDelegate <NSObject> | |||
| @optional | |||
| @@ -53,7 +53,7 @@ typedef NS_ENUM(NSInteger , ThermometerBleErrorCode) { | |||
| - (void)thermometerManagerUpdateState:(ELBluetoothState )state; | |||
| /** Call back all thermometer devices(回调所有体温计设备) */ | |||
| - (void)thermometerManagerScanDevices:(NSArray<ELThermometerDeviceModel *> *)thermometerDevices; | |||
| - (void)thermometerManagerScanDevices:(NSArray<ELPeripheralModel *> *)thermometerDevices; | |||
| /** Callback temperature data(回调温度数据) */ | |||
| - (void)thermometerManagerReceiveModel:(ELThermometerBleModel *)model; | |||
| @@ -140,6 +140,12 @@ NS_ASSUME_NONNULL_BEGIN | |||
| //Report the results of receiving brushing data(上报刷牙数据接收结果) | |||
| -(void)reportReceiveResultOfToothbrushData:(BOOL)result; | |||
| ///清除wifi记录指令 | |||
| - (void)bleWifiCleanWifiRecord; | |||
| ///获取设备连接的wifi名称 | |||
| - (void)getBleLinkWifiName; | |||
| @end | |||
| NS_ASSUME_NONNULL_END | |||
| @@ -14,16 +14,12 @@ | |||
| </data> | |||
| <key>Headers/ELBabyScaleBleManager.h</key> | |||
| <data> | |||
| J6c1MDjvS95sK0HOdRSWo8VYj+o= | |||
| wdUcfiWDxvk8XvnLeDjuEuQxyQU= | |||
| </data> | |||
| <key>Headers/ELBabyScaleBleWeightModel.h</key> | |||
| <data> | |||
| +XHoAFklse3pcB92l6nle0vbk+o= | |||
| </data> | |||
| <key>Headers/ELBabyScaleDeviceModel.h</key> | |||
| <data> | |||
| OvZQw4fYrptuR1uSrpNxOlSyms0= | |||
| </data> | |||
| <key>Headers/ELBlePublicTool.h</key> | |||
| <data> | |||
| JUlukzH3vjpTzoXduB2VQIAyTJI= | |||
| @@ -38,7 +34,7 @@ | |||
| </data> | |||
| <key>Headers/ELBloodBleManager.h</key> | |||
| <data> | |||
| DqRpRvzW1aR+Uhl0Bir4WcjwG9Y= | |||
| SOiHF4jxIg6royeTp3OuG8iUclY= | |||
| </data> | |||
| <key>Headers/ELBloodBleSDKHeader.h</key> | |||
| <data> | |||
| @@ -62,7 +58,7 @@ | |||
| </data> | |||
| <key>Headers/ELBodyFatScaleBleManager.h</key> | |||
| <data> | |||
| J2a+FTe8dPtuKxb324Ut7ciHpgk= | |||
| BeGOGJp5msQyFf2irm+GSbOSLlc= | |||
| </data> | |||
| <key>Headers/ELBodyFatScaleBleUserModel.h</key> | |||
| <data> | |||
| @@ -80,6 +76,18 @@ | |||
| <data> | |||
| cIH1JvCssYA5SSXadJ9PfOEMi74= | |||
| </data> | |||
| <key>Headers/ELBroadcastHeightGaugeBleDataModel.h</key> | |||
| <data> | |||
| pAkS79Ialx0K+bKud7rztyLDxDs= | |||
| </data> | |||
| <key>Headers/ELBroadcastHeightGaugeBleHeader.h</key> | |||
| <data> | |||
| Uy1+V3RzkiQu/1waSGMBuKvtTME= | |||
| </data> | |||
| <key>Headers/ELBroadcastHeightGaugeBleManager.h</key> | |||
| <data> | |||
| 9BbeVBBE2wJxcBSv9YjwrR5nA/g= | |||
| </data> | |||
| <key>Headers/ELBroadcastScaleBleHeader.h</key> | |||
| <data> | |||
| lnZNB95PJv2/dgQSBRKJ2qQnL/I= | |||
| @@ -106,7 +114,7 @@ | |||
| </data> | |||
| <key>Headers/ELForeHeadBleManager.h</key> | |||
| <data> | |||
| PGM6FQ7DALcjdFVRIe5TI/8HAjM= | |||
| SZ/Ya7F/GTRqhVVPkmIqMtzC3bk= | |||
| </data> | |||
| <key>Headers/ELForeheadBleDataModel.h</key> | |||
| <data> | |||
| @@ -120,13 +128,21 @@ | |||
| <data> | |||
| z9j6AGnGDhwUV/DrRaUQRXC5hVI= | |||
| </data> | |||
| <key>Headers/ELHeightBodyFatScaleBleHeader.h</key> | |||
| <data> | |||
| HlGAfQhXEtU+dRo/+lrZPVNjwrk= | |||
| </data> | |||
| <key>Headers/ELHeightBodyFatScaleBleManager.h</key> | |||
| <data> | |||
| g6oaAeou11NxI7e5Q2pkAfnrzng= | |||
| </data> | |||
| <key>Headers/ELHeightGaugeBleDataModel.h</key> | |||
| <data> | |||
| KPPqCtkvCTd6G9/Zw6zajhOH+m4= | |||
| </data> | |||
| <key>Headers/ELHeightGaugeBleManager.h</key> | |||
| <data> | |||
| wdzddZ39Cit+0xT8McKuVmL9Im0= | |||
| Tgd3FIInwve6hgYT15BoC9Ob2Dk= | |||
| </data> | |||
| <key>Headers/ELHeightGaugeHeader.h</key> | |||
| <data> | |||
| @@ -134,7 +150,7 @@ | |||
| </data> | |||
| <key>Headers/ELOximeterBleManager.h</key> | |||
| <data> | |||
| T1p75yjnCsmP4b1CtOMSWKKCRY8= | |||
| ifSB0s0jx3Si18UTdAMjDl+8Byo= | |||
| </data> | |||
| <key>Headers/ELOximeterBleModel.h</key> | |||
| <data> | |||
| @@ -154,7 +170,7 @@ | |||
| </data> | |||
| <key>Headers/ELRemoteControlBleManager.h</key> | |||
| <data> | |||
| zuhb0JmsWk+ScnpB7P4E34IU1r8= | |||
| 9X5zOrtm2++QrNYXgD9daEM9cT8= | |||
| </data> | |||
| <key>Headers/ELRemoteControlDeviceModel.h</key> | |||
| <data> | |||
| @@ -162,7 +178,7 @@ | |||
| </data> | |||
| <key>Headers/ELSDKHeader.h</key> | |||
| <data> | |||
| qG//usgqXXqSonMmz5XWHUiq7oQ= | |||
| JfsXaP1W7EOC7kQfzf8u+nTJt/E= | |||
| </data> | |||
| <key>Headers/ELTempAlgorithmusModel.h</key> | |||
| <data> | |||
| @@ -170,7 +186,7 @@ | |||
| </data> | |||
| <key>Headers/ELThermometerBleManager.h</key> | |||
| <data> | |||
| /o/ZHXV/7Avopz38NRDtUATN7Ak= | |||
| YwpHbSaC/6vqUXv4ItJLRIfr2Gk= | |||
| </data> | |||
| <key>Headers/ELThermometerBleModel.h</key> | |||
| <data> | |||
| @@ -182,7 +198,7 @@ | |||
| </data> | |||
| <key>Headers/ELToothbrushBleManager.h</key> | |||
| <data> | |||
| TgXiM9WWYyDwMboD7z+CRuTnCbI= | |||
| 4wDjnauu3xgAtKMyTzwkdyUwxCI= | |||
| </data> | |||
| <key>Headers/ELToothburshHeader.h</key> | |||
| <data> | |||
| @@ -210,7 +226,7 @@ | |||
| </data> | |||
| <key>Info.plist</key> | |||
| <data> | |||
| RLIicikwX4wLnY8yDfRTzcPecII= | |||
| QLj6GOGmsjcGVE2WnwNz+H41tHI= | |||
| </data> | |||
| </dict> | |||
| <key>files2</key> | |||
| @@ -241,11 +257,11 @@ | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| J6c1MDjvS95sK0HOdRSWo8VYj+o= | |||
| wdUcfiWDxvk8XvnLeDjuEuQxyQU= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| pIQTGSmxrY0vKeLBz0vZVwVYeaNsnSU7i44UhErmGl8= | |||
| CV8MS6ruVao/vupS6YHXMuVN7sqWmdnkJHgQr0XfvZ0= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELBabyScaleBleWeightModel.h</key> | |||
| @@ -259,17 +275,6 @@ | |||
| ucVO/T2eZbfDm4CKfRNz7UmOXc+sZ/iPVapGZr1dzbo= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELBabyScaleDeviceModel.h</key> | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| OvZQw4fYrptuR1uSrpNxOlSyms0= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| w2jBr/fZ98z7Umjq/fr4QA1RAJ0FD5EB/QzCdF/BQjo= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELBlePublicTool.h</key> | |||
| <dict> | |||
| <key>hash</key> | |||
| @@ -307,11 +312,11 @@ | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| DqRpRvzW1aR+Uhl0Bir4WcjwG9Y= | |||
| SOiHF4jxIg6royeTp3OuG8iUclY= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| gEVr8x9+ssQPT/NdA0zVhw1jHhbYbAy2sSxZ9Rus02I= | |||
| fy2yErTeRdPJZb5533o6ypYQh9rMm/4sTza3YLxDM4w= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELBloodBleSDKHeader.h</key> | |||
| @@ -373,11 +378,11 @@ | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| J2a+FTe8dPtuKxb324Ut7ciHpgk= | |||
| BeGOGJp5msQyFf2irm+GSbOSLlc= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| Pvn5qz/TE6j/lEvuZdPfjbXNnbPWHnophYlLEsKkr0I= | |||
| oclJGvuf9bz7A0qlBHG6AeXEMDyGjpxqI0HxY4k0qVk= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELBodyFatScaleBleUserModel.h</key> | |||
| @@ -424,6 +429,39 @@ | |||
| WCssEd8zrV3tqom/9Ry2O3JXAoniGheZ4QTDXB9ex0U= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELBroadcastHeightGaugeBleDataModel.h</key> | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| pAkS79Ialx0K+bKud7rztyLDxDs= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| nTUc/63sD44LBRJw5vIxcToIUrxropVZQshX+Dr9OnI= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELBroadcastHeightGaugeBleHeader.h</key> | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| Uy1+V3RzkiQu/1waSGMBuKvtTME= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| a/F8WtDOfL8E4TMa7XNS5T7DpxK3xjpDIyGTc2Owx9I= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELBroadcastHeightGaugeBleManager.h</key> | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| 9BbeVBBE2wJxcBSv9YjwrR5nA/g= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| sqVd9Jb1QjXC82WJYxGrO3nGDduU4CdEHuTL8baY6HY= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELBroadcastScaleBleHeader.h</key> | |||
| <dict> | |||
| <key>hash</key> | |||
| @@ -494,11 +532,11 @@ | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| PGM6FQ7DALcjdFVRIe5TI/8HAjM= | |||
| SZ/Ya7F/GTRqhVVPkmIqMtzC3bk= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| fPQqdIxqDufGCTCTrgQ+ZUZAPxIvk7sTuvSgH+3A2CQ= | |||
| BpGD2ZTOGoI3kp1Hj893TuYmDJpxxhHhXGwVAi1QMes= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELForeheadBleDataModel.h</key> | |||
| @@ -534,6 +572,28 @@ | |||
| KLZUrBxMf60Su2C5SLNw+4/OvoBTfBJifIrdN3KHn70= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELHeightBodyFatScaleBleHeader.h</key> | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| HlGAfQhXEtU+dRo/+lrZPVNjwrk= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| NsQJeOD7t6f2k6nEpak8lv+7FoiEyN68V44TCeGaqPE= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELHeightBodyFatScaleBleManager.h</key> | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| g6oaAeou11NxI7e5Q2pkAfnrzng= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| CjxxULrU/+jYzOao//5Z+uZvwQU7rD8mUsbwHHum/YU= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELHeightGaugeBleDataModel.h</key> | |||
| <dict> | |||
| <key>hash</key> | |||
| @@ -549,11 +609,11 @@ | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| wdzddZ39Cit+0xT8McKuVmL9Im0= | |||
| Tgd3FIInwve6hgYT15BoC9Ob2Dk= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| gdE2eyETLgvL7aZCeFgu3mtsmZX2kTu66DlpPN0cNMw= | |||
| n026D0V7r7ANZfoMUgiO2HoRl0/a0T7xhIiQTWVfYwM= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELHeightGaugeHeader.h</key> | |||
| @@ -571,11 +631,11 @@ | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| T1p75yjnCsmP4b1CtOMSWKKCRY8= | |||
| ifSB0s0jx3Si18UTdAMjDl+8Byo= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| BSVKr+dlDK1bjTeYuFGTRFhR2WGhSl4bRYBfKw6pnKE= | |||
| iO6TcCikUQKOUHDkXkLa2qufDHY4AI0LUGNpZV/DKdo= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELOximeterBleModel.h</key> | |||
| @@ -626,11 +686,11 @@ | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| zuhb0JmsWk+ScnpB7P4E34IU1r8= | |||
| 9X5zOrtm2++QrNYXgD9daEM9cT8= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| Eh9arZbJEreN/PCu301E65iPDLM3c0/Bi1maaCc41b0= | |||
| QHgtDVCslJ7TZmT0KI+iov6SB5X3ZlBXZCdBIx1QZSo= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELRemoteControlDeviceModel.h</key> | |||
| @@ -648,11 +708,11 @@ | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| qG//usgqXXqSonMmz5XWHUiq7oQ= | |||
| JfsXaP1W7EOC7kQfzf8u+nTJt/E= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| WUXTSBI1wntrAmPRzaqcAYLRQH4QswBL/nYgOHOB05A= | |||
| wmnQ8qhdR2JYfQOpjA3kMuWE0JFM1AdmSPKvWg+PXyo= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELTempAlgorithmusModel.h</key> | |||
| @@ -670,11 +730,11 @@ | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| /o/ZHXV/7Avopz38NRDtUATN7Ak= | |||
| YwpHbSaC/6vqUXv4ItJLRIfr2Gk= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| hwwcRlEBfaVTWb8fTirt6y+tSfC0ZBEe/6sqDTu0Nx4= | |||
| XvSVf9CAJRwERUCK7WALf7TJg5FZd7rL9Sa8zNKeFTs= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELThermometerBleModel.h</key> | |||
| @@ -703,11 +763,11 @@ | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| TgXiM9WWYyDwMboD7z+CRuTnCbI= | |||
| 4wDjnauu3xgAtKMyTzwkdyUwxCI= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| vrkXk3mi2klykCre31uYLq5HA1JeBiyWR5dguDpSOpg= | |||
| AjoEaDCmQ/q5m4mLCqXKeA7fYCF5eGdE1NPWj8SFe+8= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELToothburshHeader.h</key> | |||
| @@ -34,8 +34,8 @@ | |||
| } | |||
| -(void)viewWillAppear:(BOOL)animated{ | |||
| [super viewWillAppear:animated]; | |||
| [[ELBabyScaleBleManager shareManager] startScan]; | |||
| [ELBabyScaleBleManager shareManager].babyScaleDelegate = self; | |||
| [[ELBabyScaleBleManager shareManager] startScan]; | |||
| } | |||
| -(void)viewDidDisappear:(BOOL)animated{ | |||
| [super viewDidDisappear:animated]; | |||
| @@ -46,7 +46,7 @@ | |||
| NSLog(@"bluetoothManagerUpdateBleState = %ld",state); | |||
| } | |||
| -(void)babyScaleManagerScanDevices:(NSArray<ELBabyScaleDeviceModel *> *)babyScaleDevices{ | |||
| -(void)babyScaleManagerScanDevices:(NSArray<ELPeripheralModel *> *)babyScaleDevices{ | |||
| self.devices = babyScaleDevices; | |||
| [self.tableView reloadData]; | |||
| } | |||
| @@ -45,7 +45,7 @@ | |||
| -(void)bodyFatScaleManagerUpdateState:(ELBluetoothState)state{ | |||
| NSLog(@"bluetoothManagerUpdateBleState = %ld",state); | |||
| } | |||
| -(void)bodyFatScaleManagerScanDevices:(NSArray<ELBodyFatScaleDeviceModel *> *)scaleDevices{ | |||
| -(void)bodyFatScaleManagerScanDevices:(NSArray<ELPeripheralModel *> *)scaleDevices{ | |||
| self.devices = scaleDevices; | |||
| [self.tableView reloadData]; | |||
| } | |||
| @@ -46,7 +46,7 @@ | |||
| NSLog(@"bluetoothManagerUpdateBleState = %ld",state); | |||
| } | |||
| - (void)oximeterManagerScanDevices:(NSArray<ELOximeterDeviceModel *> *)devices { | |||
| - (void)oximeterManagerScanDevices:(NSArray<ELPeripheralModel *> *)devices { | |||
| self.devices = devices; | |||
| [self.tableView reloadData]; | |||
| } | |||
| @@ -45,7 +45,7 @@ | |||
| -(void)remoteControlManagerUpdateState:(ELBluetoothState)state{ | |||
| NSLog(@"bluetoothManagerUpdateBleState = %ld",state); | |||
| } | |||
| -(void)remoteControlManagerScanDevices:(NSArray<ELRemoteControlDeviceModel *> *)deviceList{ | |||
| -(void)remoteControlManagerScanDevices:(NSArray<ELPeripheralModel *> *)deviceList{ | |||
| self.devices = deviceList; | |||
| [self.tableView reloadData]; | |||
| } | |||
| @@ -46,7 +46,7 @@ | |||
| NSLog(@"bluetoothManagerUpdateBleState = %ld",state); | |||
| } | |||
| -(void)thermometerManagerScanDevices:(NSArray<ELThermometerDeviceModel *> *)thermometerDevices{ | |||
| -(void)thermometerManagerScanDevices:(NSArray<ELPeripheralModel *> *)thermometerDevices{ | |||
| self.devices = thermometerDevices; | |||
| [self.tableView reloadData]; | |||
| } | |||
| @@ -45,7 +45,7 @@ | |||
| -(void)bodyFatScaleManagerUpdateState:(ELBluetoothState)state{ | |||
| NSLog(@"bluetoothManagerUpdateBleState = %ld",state); | |||
| } | |||
| -(void)bodyFatScaleManagerScanDevices:(NSArray<ELBodyFatScaleDeviceModel *> *)scaleDevices{ | |||
| -(void)bodyFatScaleManagerScanDevices:(NSArray<ELPeripheralModel *> *)scaleDevices{ | |||
| self.devices = [ELPeripheralModel getDevicesWithPeripherals:scaleDevices supportDeviceType:(ELSupportDeviceTypeBLE_WIFIScale)]; | |||
| [self.tableView reloadData]; | |||
| } | |||