| @@ -0,0 +1,6 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <Bucket | |||
| uuid = "F9079083-4AB6-4D3F-AA68-CF1430F0A8DE" | |||
| type = "1" | |||
| version = "2.0"> | |||
| </Bucket> | |||
| @@ -32,9 +32,17 @@ typedef NS_ENUM(NSInteger , ELBodyFatScaleBleDataA6SubType) { | |||
| ELBodyFatScaleBleDataA6SubType_BleBackHistoryWithAppAlgorithm = 0x07, | |||
| /** App设置访问的IP地址 */ | |||
| ELBodyFatScaleBleDataA6SubType_AppSetDevIpAddress = 0x8B , | |||
| ELBodyFatScaleBleDataA6SubType_AppSetDevIpAddress = 0x8B , | |||
| /** App获取访问的IP地址 */ | |||
| ELBodyFatScaleBleDataA6SubType_AppGetDevIpAddress = 0x8C , | |||
| /** App设置访问的端口号 */ | |||
| ELBodyFatScaleBleDataA6SubType_AppSetDevPortNumber = 0x8D , | |||
| /** App获取访问的端口号 */ | |||
| ELBodyFatScaleBleDataA6SubType_AppGetDevPortNumber = 0x8E , | |||
| /** App设置访问的路径 */ | |||
| ELBodyFatScaleBleDataA6SubType_AppSetDevPath = 0x96 , | |||
| ELBodyFatScaleBleDataA6SubType_AppSetDevPath = 0x96 , | |||
| /** App获取访问的路径 */ | |||
| ELBodyFatScaleBleDataA6SubType_AppGetDevPath = 0x97 , | |||
| }; | |||
| @@ -2,7 +2,7 @@ | |||
| // ELScaleBleManager.h | |||
| // Elink | |||
| // | |||
| // Created by 王庭 on 2019/5/28. | |||
| // Created by cliCk on 2019/5/28. | |||
| // Copyright © 2019 iot_iMac. All rights reserved. | |||
| // | |||
| @@ -136,8 +136,8 @@ MCU requests user information( MCU 请求用户信息) | |||
| -(void)sendCmd_RequestHistory; | |||
| /** 设置设备的IP地址和访问路径 */ | |||
| - (void)setDevAccessIpAddress:(NSString *)address path:(NSString *)path; | |||
| /** 设置设备的IP地址,端口号和访问路径 */ | |||
| - (void)setDevAccessIpAddress:(NSString *)address portNumber:(NSUInteger)portNum path:(NSString *)path; | |||
| @end | |||
| @@ -2,7 +2,7 @@ | |||
| // ELScaleDeviceModel.h | |||
| // Elink | |||
| // | |||
| // Created by 王庭 on 2019/5/28. | |||
| // Created by cliCk on 2019/5/28. | |||
| // Copyright © 2019 iot_iMac. All rights reserved. | |||
| // | |||
| @@ -28,12 +28,18 @@ NS_ASSUME_NONNULL_BEGIN | |||
| /** 身高数据 */ | |||
| @property (nonatomic, assign) float height; | |||
| /** 身高小数点位 */ | |||
| @property (nonatomic, assign) NSUInteger heightPoint; | |||
| /** 身高单位 */ | |||
| @property (nonatomic, assign) ELDeviceHeightUnit heightUnit; | |||
| /** 体重数据 */ | |||
| @property (nonatomic, assign) float weight; | |||
| /** 体重小数点位 */ | |||
| @property (nonatomic, assign) NSUInteger weightPoint; | |||
| /** 体重单位 */ | |||
| @property (nonatomic, assign) ELDeviceWeightUnit weightUnit; | |||
| @@ -30,6 +30,8 @@ NS_ASSUME_NONNULL_BEGIN | |||
| @property (nonatomic, weak) id<ELBroadcastHeightGaugeBleDelegate> heightGaugeDelegate; | |||
| +(instancetype)shareManager; | |||
| @end | |||
| NS_ASSUME_NONNULL_END | |||
| @@ -2,7 +2,7 @@ | |||
| // ELRemoteControlBleManager.h | |||
| // Elink | |||
| // | |||
| // Created by 王庭 on 2019/7/2. | |||
| // Created by cliCk on 2019/7/2. | |||
| // Copyright © 2019 iot_iMac. All rights reserved. | |||
| // | |||
| @@ -2,7 +2,7 @@ | |||
| // ELRemoteControlDeviceModel.h | |||
| // Elink | |||
| // | |||
| // Created by 王庭 on 2019/7/2. | |||
| // Created by cliCk on 2019/7/2. | |||
| // Copyright © 2019 iot_iMac. All rights reserved. | |||
| // | |||
| @@ -53,9 +53,12 @@ typedef NS_ENUM(NSUInteger, ELInetGetCmdType) { | |||
| ELInetGetCmdTypeBleWifiGetDTIMInterval = 0x8A, //Get DTIM interval(获取DTIM间隔) | |||
| ELInetGetCmdTypeBleWifiSetIpAddress = 0x8B, //Set the access ip address(设置访问的ip地址 | |||
| ELInetGetCmdTypeBleWifiGetURL = 0x8C, //Get visited sites(获取访问的网站) | |||
| ELInetGetCmdTypeBleWifiSetPort = 0x8D, //set acces port number | |||
| ELInetGetCmdTypeBleWifiGetPort = 0x8E, //Get access port number(获取访问的端口号) | |||
| ELInetGetCmdTypeBleWifiGetSNNumber = 0x93, //Get SN number (session code:deviceId)(获取SN号(会话码:设备ID)) | |||
| ELInetGetCmdTypeBleWifiName = 0x94, //获取wifi名称 | |||
| ELInetGetCmdTypeBleWifiSetPathAddress = 0x96, //Set access path(设置访问的路径 | |||
| ELInetGetCmdTypeBleWifiGetPathAddress = 0x97, //get access path | |||
| #pragma mark ============End 蓝牙Wifi ============== | |||
| ELInetGetCmdTypeRequestAuthorize = 0x7F, //Request device authorization (请求设备授权) | |||
| ELInetGetCmdTypeToothbrushA6Data = 0xC0, //A6 data for toothbrush(牙刷专用A6数据,详情请见协议的2级指令)(See the second order for details) | |||
| @@ -125,12 +128,16 @@ typedef NS_ENUM(NSUInteger, ELSupportDeviceType) { | |||
| ELSupportDeviceTypeOximeter = 0x0021 , //Oximeter (血氧仪) | |||
| ELSupportDeviceTypeFaceMask = 0x0022 , //face mask(智能口罩) | |||
| ELSupportDeviceTypeCoffeeScale = 0x0024 , //咖啡秤 | |||
| ELSupportDeviceTypeElectricScooter= 0x0025 , //滑板车 | |||
| ELSupportDeviceTypeHeightBodyFatScale = 0x0026 , //身高体脂秤 | |||
| ELSupportDeviceTypeBLEToothbrush = 0x002D, //Bluetooth toothbrush(蓝牙牙刷) | |||
| ELSupportDeviceTypeHygrothermograph = 0x002E , //温湿度计 | |||
| ELSupportDeviceTypeSkip = 0x002F , //跳绳 | |||
| ELSupportDeviceTypeBroadcastScale = (0xffff +0x01) , //655536 Broadcast body fat scale(AILink广播体脂秤) | |||
| ELSupportDeviceTypeBroadcastHeightGauge = (0xffff + 0x03) , //65538 广播身高仪 | |||
| ELSupportDeviceTypeBroadcastScale_Lingyang = (0xffff +0x16) , //65557 凌阳广播体脂秤 | |||
| @@ -2,7 +2,7 @@ | |||
| // ELThermometerBleManager.h | |||
| // Elink | |||
| // | |||
| // Created by 王庭 on 2019/5/28. | |||
| // Created by cliCk on 2019/5/28. | |||
| // Copyright © 2019 iot_iMac. All rights reserved. | |||
| // | |||
| @@ -2,7 +2,7 @@ | |||
| // ELThermometerBleModel.h | |||
| // Elink | |||
| // | |||
| // Created by 王庭 on 2019/5/28. | |||
| // Created by cliCk on 2019/5/28. | |||
| // Copyright © 2019 iot_iMac. All rights reserved. | |||
| // | |||
| @@ -2,7 +2,7 @@ | |||
| // ELThermometerDeviceModel.h | |||
| // Elink | |||
| // | |||
| // Created by 王庭 on 2019/5/28. | |||
| // Created by cliCk on 2019/5/28. | |||
| // Copyright © 2019 iot_iMac. All rights reserved. | |||
| // | |||
| @@ -137,6 +137,8 @@ NS_ASSUME_NONNULL_BEGIN | |||
| //Get the second gear default gear(获取二档默认档位) | |||
| -(void)getTwoGearDefualt; | |||
| - (void)getTwoGearDefualtWithCid:(ELSupportDeviceType)cid; | |||
| //Report the results of receiving brushing data(上报刷牙数据接收结果) | |||
| -(void)reportReceiveResultOfToothbrushData:(BOOL)result; | |||
| @@ -12,54 +12,59 @@ | |||
| #import "ELSDKHeader.h" | |||
| typedef NS_ENUM(NSUInteger, ToothSupportGearType) { | |||
| ToothSupportGearTypeUnknown = 0x00, //Unsupported gear(不支持的档位) | |||
| ToothSupportGearTypeOneGear = 0x01, //First gear(一档) | |||
| ToothSupportGearTypeTwoGear = 0x02, //Second gear(二档) | |||
| ToothSupportGearTypeUnknown_00 = 0x00, //Unsupported gear(不支持的档位) | |||
| ToothSupportGearTypeOneGear_01 = 0x01, //First gear(一档) | |||
| ToothSupportGearTypeTwoGear_02 = 0x02, //Second gear(二档) | |||
| }; | |||
| //Working gear(工作档位) | |||
| typedef NS_ENUM(NSUInteger, ToothbrushGearType) { | |||
| ToothbrushGearTypeStop = 0x00, //Stop the motor(停止电机) | |||
| ToothbrushGearTypeClean = 0x01, //clean(清洁) | |||
| ToothbrushGearTypeWhite = 0x02, //Whitening(美白) | |||
| ToothbrushGearTypeMassage = 0x03, //massage(按摩) | |||
| ToothbrushGearTypeSenstitive = 0x04, //sensitive(敏感) | |||
| ToothbrushGearTypePolish = 0x05, //polishing(抛光) | |||
| ToothbrushGearTypeGumCare = 0x06, //Gum care(牙龈护理) | |||
| ToothbrushGearTypeRefresh = 0x07, //gargle(漱口) | |||
| ToothbrushGearTypeMascare = 0x08, //health care(保健) | |||
| ToothbrushGearTypeNewbie = 0x09, //Novice(新手) | |||
| ToothbrushGearTypeSoft = 0x0A, //Shurou(舒柔) | |||
| ToothbrushGearTypeGentle = 0x0B, //gentle(轻柔) | |||
| ToothbrushGearTypePamper = 0x0C, //Care(呵护) | |||
| ToothbrushGearTypeCustom = 0xFF, //manual setting(手动设置) | |||
| ToothbrushGearTypeStop_00 = 0x00, //Stop the motor(停止电机) | |||
| ToothbrushGearTypeClean_01 = 0x01, //clean(清洁) | |||
| ToothbrushGearTypeWhite_02 = 0x02, //Whitening(美白) | |||
| ToothbrushGearTypeMassage_03 = 0x03, //massage(按摩) | |||
| ToothbrushGearTypeSensitive_04 = 0x04, //sensitive(敏感) | |||
| ToothbrushGearTypePolish_05 = 0x05, //polishing(抛光) | |||
| ToothbrushGearTypeGumCare_06 = 0x06, //Gum care(牙龈护理) | |||
| ToothbrushGearTypeRefresh_07 = 0x07, //gargle(漱口) | |||
| ToothbrushGearTypeHealthcare_08 = 0x08, //health care(保健) | |||
| ToothbrushGearTypeNewbie_09 = 0x09, //Novice(新手) | |||
| ToothbrushGearTypeSoft_0A = 0x0A, //Soft(舒柔) | |||
| ToothbrushGearTypeGentle_0B = 0x0B, //gentle(轻柔) | |||
| ToothbrushGearTypeCare_0C = 0x0C, //Care(呵护) | |||
| ToothbrushGearTypeCustom_FF = 0xFF, //manual setting(手动设置) | |||
| }; | |||
| typedef NS_ENUM(NSUInteger, ToothbrushDataType) { | |||
| ToothbrushDataTypeSetGear = 0x02,//Set gear(设置档位) | |||
| ToothbrushDataTypeGetGear = 0x03,//Get the current working gear(获取当前工作的档位) | |||
| ToothbrushDataTypeTry = 0x06,//try out(试用) | |||
| ToothbrushDataTypeWorkPhase = 0x07,//Work Phase(工作阶段) | |||
| ToothbrushDataTypeSetCustomData = 0x09,//Set manual setting mode(设置手动设置模式) | |||
| ToothbrushDataTypeGetCustomGear = 0x0A,//Get manually set data(获取手动设置的数据) | |||
| ToothbrushDataTypeSwitchWork = 0x0B,//Switch toothbrush(开关牙刷) | |||
| ToothbrushDataTypeSetTwoGearDefault = 0x0C,//Set second gear default(设置二档默认) | |||
| ToothbrushDataTypeGetTwoGearDefault = 0x0D,//Get second gear default(获取二档默认) | |||
| ToothbrushDataTypeToothbrushData = 0xFD,//Brushing data(刷牙数据) | |||
| ToothbrushDataTypeReportResult = 0xFE,//Report received data result(上报接收数据结果) | |||
| ToothbrushDataTypeSetGear_A702 = 0x02,//Set gear(设置档位) | |||
| ToothbrushDataTypeGetGear_A703 = 0x03,//Get the current working gear(获取当前工作的档位) | |||
| ToothbrushDataTypeTry_A706 = 0x06,//try out(试用) | |||
| ToothbrushDataTypeWorkPhase_A707 = 0x07,//Work Phase(工作阶段) | |||
| ToothbrushDataTypeSetCustomData_A709 = 0x09,//Set manual setting mode(设置手动设置模式) | |||
| ToothbrushDataTypeGetCustomGear_A70A = 0x0A,//Get manually set data(获取手动设置的数据) | |||
| ToothbrushDataTypeSwitchWork_A70B = 0x0B,//Switch toothbrush(开关牙刷) | |||
| ToothbrushDataTypeSetTwoGearDefault_A70C = 0x0C,//Set second gear default(设置二档默认) | |||
| ToothbrushDataTypeGetTwoGearDefault_A70D = 0x0D,//Get second gear default(获取二档默认) | |||
| ToothbrushDataTypeToothbrushData_A7FD = 0xFD,//Brushing data(刷牙数据) | |||
| ToothbrushDataTypeReportResult_A7FE = 0xFE,//Report received data result(上报接收数据结果) | |||
| }; | |||
| typedef NS_ENUM(NSUInteger, ToothbrushA6DataType) { | |||
| ToothbrushA6DataTypeTriaxialDirection = 0x02, //Get the three-axis direction of the toothbrush(获取牙刷三轴方向) | |||
| ToothbrushA6DataTypeTriaxialData = 0x05, //Get toothbrush three-axis data(获取牙刷三轴数据) | |||
| ToothbrushA6DataTypeTriaxialDirection_02 = 0x02, //Get the three-axis direction of the toothbrush(获取牙刷三轴方向) | |||
| ToothbrushA6DataTypeTriaxialData_05 = 0x05, //Get toothbrush three-axis data(获取牙刷三轴数据) | |||
| ToothbrushA6DataTypeOfflineDataCount_11 = 0x11, //Cmd toothbrush offline data count(APP 获取离线历史记录条数 二级指令 0x11) | |||
| ToothbrushA6DataTypeOfflineDataStart_12 = 0x12, //Cmd toothbrush offline data start(APP 请求接收离线历史记录 二级指令 0x12) | |||
| ToothbrushA6DataTypeOfflineDataCancel_13 = 0x13, //Cmd toothbrush offline data cancel(APP 取消接收离线历史记录 二级指令 0x13) | |||
| ToothbrushA6DataTypeOfflineDataClear_14 = 0x14, //Cmd toothbrush offline data clear(APP 请求清空离线历史记录 二级指令 0x14) | |||
| ToothbrushA6DataTypeOfflineData_15 = 0x15, //Data toothbrush offline data(离线历史记录数据上报给 APP 二级指令 0x15) | |||
| }; | |||
| typedef NS_ENUM(NSUInteger, ToothbrushSetResult) { | |||
| ToothbrushSetResultSuccess,//Set successfully(设置成功) | |||
| ToothbrushSetResultFail,//Setting failed for unknown reason(设置失败,原因未知) | |||
| ToothbrushSetResultUnsupport,//Does not support settings(不支持设置) | |||
| ToothbrushSetResultUnsupported,//Does not support settings(不支持设置) | |||
| ToothbrushSetResultLowPower,//Setting failed, battery voltage is low(设置失败,电池电压不足) | |||
| ToothbrushSetResultCharging,//Setting failed, charging(设置失败,正在充电) | |||
| ToothbrushSetResultWorking,//Setting failed, working(设置失败,正在工作) | |||
| @@ -74,40 +79,55 @@ typedef NS_ENUM(NSUInteger, ToothbrushWorkPhaseType) { | |||
| //Y axis direction(Y轴方向) | |||
| typedef NS_ENUM(NSUInteger, ToothbrushTriaxialDirection) { | |||
| ToothbrushTriaxialDirectionYTop = 1,//Y axis up(Y轴朝上) | |||
| ToothbrushTriaxialDirectionYBottom = 2,//Y axis down(Y轴朝下) | |||
| ToothbrushTriaxialDirectionYLeft = 3,//Y axis left(Y轴朝左) | |||
| ToothbrushTriaxialDirectionYRight = 4,//Y axis right(Y轴朝右) | |||
| ToothbrushTriaxialDirectionYTop_01 = 1,//Y axis up(Y轴朝上) | |||
| ToothbrushTriaxialDirectionYBottom_02 = 2,//Y axis down(Y轴朝下) | |||
| ToothbrushTriaxialDirectionYLeft_03 = 3,//Y axis left(Y轴朝左) | |||
| ToothbrushTriaxialDirectionYRight_04 = 4,//Y axis right(Y轴朝右) | |||
| }; | |||
| typedef struct{ | |||
| typedef struct { | |||
| int interval;//operating hours(工作时间) | |||
| ToothbrushGearType gearType;//Gear(档位) | |||
| ToothSupportGearType supportType;//What Gear(什么档) | |||
| }ToothbrushWorkGear,ToothbrushWorkGear; | |||
| } ToothbrushWorkGear, ToothbrushWorkGear; | |||
| typedef struct{ | |||
| typedef struct { | |||
| ToothbrushGearType gear; | |||
| ToothSupportGearType supportType;//一档、二档 | |||
| ToothbrushWorkPhaseType workPhase; | |||
| }ToothBrushWorkPhase,ToothBrushWorkPhase; | |||
| } ToothBrushWorkPhase, ToothBrushWorkPhase; | |||
| // | |||
| typedef struct{ | |||
| typedef struct { | |||
| int frequency; | |||
| int duty; | |||
| int interval; | |||
| }ToothbrushCustomData,ToothbrushCustomData; | |||
| } ToothbrushCustomData, ToothbrushCustomData; | |||
| //Brushing data(刷牙数据) | |||
| typedef struct{ | |||
| typedef struct { | |||
| ToothbrushGearType gear;//Working gear(工作档位) | |||
| int workTime;//work time(工作时长) | |||
| int leftTime;//Time left(左边时长) | |||
| int rightTime;//Right time(右边时长) | |||
| int battery;//battery(电量) | |||
| }ToothbrushData,ToothbrushData; | |||
| } ToothbrushData, ToothbrushData; | |||
| //Brushing offline data(刷牙数据) | |||
| typedef struct { | |||
| unsigned char year; | |||
| unsigned char month; | |||
| unsigned char day; | |||
| unsigned char hour; | |||
| unsigned char minute; | |||
| unsigned char second; | |||
| ToothbrushGearType gearType; | |||
| unsigned short workTime; | |||
| unsigned short leftTime; | |||
| unsigned short rightTime; | |||
| unsigned char battery; | |||
| } ToothbrushOfflineData; | |||
| #endif /* ELToothburshHeader_h */ | |||
| @@ -54,11 +54,11 @@ | |||
| </data> | |||
| <key>Headers/ELBodyFatScaleBleHeader.h</key> | |||
| <data> | |||
| jlxGP9vO41F6PqO6FAI7ja4dXFg= | |||
| 84xbdZ1nb1vkz3pa8sr6UC266a4= | |||
| </data> | |||
| <key>Headers/ELBodyFatScaleBleManager.h</key> | |||
| <data> | |||
| gr3jUgMdb8tSM/vaeHNwBFZ5c/Y= | |||
| ZT7CLLqirgzK6/zVXmvjwQCZoKQ= | |||
| </data> | |||
| <key>Headers/ELBodyFatScaleBleUserModel.h</key> | |||
| <data> | |||
| @@ -70,7 +70,7 @@ | |||
| </data> | |||
| <key>Headers/ELBodyFatScaleDeviceModel.h</key> | |||
| <data> | |||
| wzOhRUInZ0tuoj3LHMmJV1XejoY= | |||
| al90qzio34fUj7K2q+oqlJYp48s= | |||
| </data> | |||
| <key>Headers/ELBodyIndexAlgorithmModel.h</key> | |||
| <data> | |||
| @@ -78,7 +78,7 @@ | |||
| </data> | |||
| <key>Headers/ELBroadcastHeightGaugeBleDataModel.h</key> | |||
| <data> | |||
| pAkS79Ialx0K+bKud7rztyLDxDs= | |||
| UyXdCc2Y0WFTB2IR4wxXrlO9mow= | |||
| </data> | |||
| <key>Headers/ELBroadcastHeightGaugeBleHeader.h</key> | |||
| <data> | |||
| @@ -86,7 +86,7 @@ | |||
| </data> | |||
| <key>Headers/ELBroadcastHeightGaugeBleManager.h</key> | |||
| <data> | |||
| 9BbeVBBE2wJxcBSv9YjwrR5nA/g= | |||
| rJ0AZmUA5VG185FJLRDB7EDoXr8= | |||
| </data> | |||
| <key>Headers/ELBroadcastScaleBleHeader.h</key> | |||
| <data> | |||
| @@ -170,15 +170,15 @@ | |||
| </data> | |||
| <key>Headers/ELRemoteControlBleManager.h</key> | |||
| <data> | |||
| 9X5zOrtm2++QrNYXgD9daEM9cT8= | |||
| p+mZ1Kc2mhiqv20ND4KIIvxeI94= | |||
| </data> | |||
| <key>Headers/ELRemoteControlDeviceModel.h</key> | |||
| <data> | |||
| ckFgMSGZyOJnzl2Kxs0FPR96pn4= | |||
| QGRDoPXr7ASQ9a3gP3+nbJ3PU9U= | |||
| </data> | |||
| <key>Headers/ELSDKHeader.h</key> | |||
| <data> | |||
| 7a71hKtsRfCN0UJPOE3j3NRVmZs= | |||
| Ql5OuG/iV9Mjjci5KTQQJ2U4ld0= | |||
| </data> | |||
| <key>Headers/ELTempAlgorithmusModel.h</key> | |||
| <data> | |||
| @@ -186,23 +186,23 @@ | |||
| </data> | |||
| <key>Headers/ELThermometerBleManager.h</key> | |||
| <data> | |||
| YwpHbSaC/6vqUXv4ItJLRIfr2Gk= | |||
| /+yNjhPHO2YQTccKaQxt0zgR4ko= | |||
| </data> | |||
| <key>Headers/ELThermometerBleModel.h</key> | |||
| <data> | |||
| WF60Fo1A0P/luh3JNoHFUy9Rsyw= | |||
| irHex3QPP2spKOdA5D+0P0mvPWY= | |||
| </data> | |||
| <key>Headers/ELThermometerDeviceModel.h</key> | |||
| <data> | |||
| Oa8GTYS1hEhJk+BQL1IiR2T3eSw= | |||
| fz6v4fR0TPfSn3Ev6QjBN8OJDfE= | |||
| </data> | |||
| <key>Headers/ELToothbrushBleManager.h</key> | |||
| <data> | |||
| 4wDjnauu3xgAtKMyTzwkdyUwxCI= | |||
| IVPpFaQopW4O601+Bpv71SchT4I= | |||
| </data> | |||
| <key>Headers/ELToothburshHeader.h</key> | |||
| <data> | |||
| QHN/+6s7uaNjGtbsXs91q11T2aM= | |||
| 5NG1gdWoZXYJ3tBNUMu5/tq9plY= | |||
| </data> | |||
| <key>Headers/ELUnitConvertTool.h</key> | |||
| <data> | |||
| @@ -367,22 +367,22 @@ | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| jlxGP9vO41F6PqO6FAI7ja4dXFg= | |||
| 84xbdZ1nb1vkz3pa8sr6UC266a4= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| hm4hR8NWmn8ZAD4ctVOyKl94c0jQq32T7ZnQLMyxuJc= | |||
| CgELyi7dGQaLFHKdulq7TvEtO6R5ITvvke40WUbUwNM= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELBodyFatScaleBleManager.h</key> | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| gr3jUgMdb8tSM/vaeHNwBFZ5c/Y= | |||
| ZT7CLLqirgzK6/zVXmvjwQCZoKQ= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| RXzOMSdbWbti3AaIAjxTUBqr/ivyklk0RsHdpeMeMco= | |||
| R9dwhogNJAO6g+5n13QGbfEzeZSTGsz0EJHGuI5Y/4E= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELBodyFatScaleBleUserModel.h</key> | |||
| @@ -411,11 +411,11 @@ | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| wzOhRUInZ0tuoj3LHMmJV1XejoY= | |||
| al90qzio34fUj7K2q+oqlJYp48s= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| ZP6cxgBFbWaQx/NIDxVVSWHwIu4JcVyIgQFhDh/6WO0= | |||
| p+RYmO/5WP3JY0W4AyifFaZsaHroonuCkZF5sCtqDEw= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELBodyIndexAlgorithmModel.h</key> | |||
| @@ -433,11 +433,11 @@ | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| pAkS79Ialx0K+bKud7rztyLDxDs= | |||
| UyXdCc2Y0WFTB2IR4wxXrlO9mow= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| nTUc/63sD44LBRJw5vIxcToIUrxropVZQshX+Dr9OnI= | |||
| 6GFPPodhJCy1gYznnaEy3bEdsoxyEaKVancFHzjbSlg= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELBroadcastHeightGaugeBleHeader.h</key> | |||
| @@ -455,11 +455,11 @@ | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| 9BbeVBBE2wJxcBSv9YjwrR5nA/g= | |||
| rJ0AZmUA5VG185FJLRDB7EDoXr8= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| sqVd9Jb1QjXC82WJYxGrO3nGDduU4CdEHuTL8baY6HY= | |||
| 7+ZyjyoD0xpqLf08K3tcLuvJXQAOTYHcGlkjn5UIZag= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELBroadcastScaleBleHeader.h</key> | |||
| @@ -686,33 +686,33 @@ | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| 9X5zOrtm2++QrNYXgD9daEM9cT8= | |||
| p+mZ1Kc2mhiqv20ND4KIIvxeI94= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| QHgtDVCslJ7TZmT0KI+iov6SB5X3ZlBXZCdBIx1QZSo= | |||
| UF4/HYgPTpzZsEBBKHxlA7WmkcxVfatWq8rKrW3Jqd0= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELRemoteControlDeviceModel.h</key> | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| ckFgMSGZyOJnzl2Kxs0FPR96pn4= | |||
| QGRDoPXr7ASQ9a3gP3+nbJ3PU9U= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| L/ievm90HlYaSADq8DO3GkT7wk9nFYrQKcHf0Xq+X9g= | |||
| 32XXhjUpv8i1Ui/W8st1RA3GoEnNZC47uGGgS4tr4ds= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELSDKHeader.h</key> | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| 7a71hKtsRfCN0UJPOE3j3NRVmZs= | |||
| Ql5OuG/iV9Mjjci5KTQQJ2U4ld0= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| SqmjyQiZ5DI7DsKqi0cSjBEPKDvyscuScdTmFXOHN9c= | |||
| rfrl8kMk4GD1REIxmML0Ug5bW5chEZSgQIcHjTtFTOc= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELTempAlgorithmusModel.h</key> | |||
| @@ -730,55 +730,55 @@ | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| YwpHbSaC/6vqUXv4ItJLRIfr2Gk= | |||
| /+yNjhPHO2YQTccKaQxt0zgR4ko= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| XvSVf9CAJRwERUCK7WALf7TJg5FZd7rL9Sa8zNKeFTs= | |||
| qnr9Lew5Nf0bMOrZ9F7zr1s0j/LAV3gV3/07ihVmWuM= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELThermometerBleModel.h</key> | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| WF60Fo1A0P/luh3JNoHFUy9Rsyw= | |||
| irHex3QPP2spKOdA5D+0P0mvPWY= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| 3ZijZcITdb4zEUbac9UkE3siVGW3EUbEBTxIEQsHq64= | |||
| VD7gwYjhGr+H95+c7Ur09crkziZNa9Qvwx2knpBfPRo= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELThermometerDeviceModel.h</key> | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| Oa8GTYS1hEhJk+BQL1IiR2T3eSw= | |||
| fz6v4fR0TPfSn3Ev6QjBN8OJDfE= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| gSjca3FLXifg5U5v47xNQpOf4dgQ0ib6CwitQPp1Hbs= | |||
| drvshR01QLpDnBYtDflNUfcpUx0/aSXyt+X8nCWWUKA= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELToothbrushBleManager.h</key> | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| 4wDjnauu3xgAtKMyTzwkdyUwxCI= | |||
| IVPpFaQopW4O601+Bpv71SchT4I= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| AjoEaDCmQ/q5m4mLCqXKeA7fYCF5eGdE1NPWj8SFe+8= | |||
| QZK3CU6vLiPQrPV/CSbKiEBDo9MRNt4HHkzS+u+dWSs= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELToothburshHeader.h</key> | |||
| <dict> | |||
| <key>hash</key> | |||
| <data> | |||
| QHN/+6s7uaNjGtbsXs91q11T2aM= | |||
| 5NG1gdWoZXYJ3tBNUMu5/tq9plY= | |||
| </data> | |||
| <key>hash2</key> | |||
| <data> | |||
| 0ASrA6x/0Oawl6R0Sa+RejPtC7W1JoYM7YxK6cvZdDI= | |||
| KfOc0mMKGsfRnV1W5HgO3ffsMi3vh+9r4+NfxUcyJvw= | |||
| </data> | |||
| </dict> | |||
| <key>Headers/ELUnitConvertTool.h</key> | |||
| @@ -422,19 +422,20 @@ | |||
| #pragma mark - 切换秤环境 | |||
| static NSString *formalAddress = @"http://ailink.iot.aicare.net.cn"; | |||
| static NSString *testAddress = @"http://test.ailink.revice.aicare.net.cn"; | |||
| static NSString *pathURL = @"/devivce/serverRedirect/"; | |||
| static NSString *formalAddress = @"ailink.iot.aicare.net.cn"; | |||
| static NSString *testAddress = @"test.ailink.revice.aicare.net.cn"; | |||
| //static NSString *pathURL = @"/devivce/serverRedirect/"; | |||
| static NSInteger portNumber = 80; | |||
| - (void)changeDevIpAddress:(UIButton *)sender { | |||
| // if ([self.title isEqualToString:@"Connected"]) { | |||
| if (sender.selected) { | |||
| //切换到生产环境 | |||
| [[ELBodyFatScaleBleManager shareManager] setDevAccessIpAddress:formalAddress path:pathURL]; | |||
| [[ELBodyFatScaleBleManager shareManager] setDevAccessIpAddress:formalAddress portNumber:portNumber path:@""]; | |||
| [self addLog:@"Start to configure as a production environment(开始配置为生产环境"]; | |||
| } else { | |||
| //切到测试环境 | |||
| [[ELBodyFatScaleBleManager shareManager] setDevAccessIpAddress:testAddress path:pathURL]; | |||
| [[ELBodyFatScaleBleManager shareManager] setDevAccessIpAddress:testAddress portNumber:portNumber path:@""]; | |||
| // [[ELBodyFatScaleBleManager shareManager] setDevAccessIpAddress:@"ABCD1234567890" path:pathURL]; | |||
| [self addLog:@"Start to configure as a test environment(开始配置为测试环境"]; | |||
| } | |||
| @@ -107,7 +107,7 @@ static NSString * const authorizeIntervalKey = @"authorizeIntervalKey"; | |||
| else if (tag == 11){ | |||
| //MARK:设置刷牙模式 | |||
| [self addLog:@"设置刷牙模式:舒柔"]; | |||
| [[ELToothbrushBleManager shareManager] setWorkGear:(ToothbrushGearTypeSoft) interval:120 supportGearType:(ToothSupportGearTypeOneGear)]; | |||
| [[ELToothbrushBleManager shareManager] setWorkGear:(ToothbrushGearTypeSoft_0A) interval:120 supportGearType:(ToothSupportGearTypeOneGear_01)]; | |||
| }else if (tag == 12){ | |||
| //MARK:开关 | |||
| [self addLog:@"开关"]; | |||
| @@ -115,11 +115,11 @@ static NSString * const authorizeIntervalKey = @"authorizeIntervalKey"; | |||
| }else if (tag == 13){ | |||
| //MARK:设置二档默认 | |||
| [self addLog:@"设置二档默认(清洁)"]; | |||
| [[ELToothbrushBleManager shareManager] setTwoGearDefaultGear:(ToothbrushGearTypeClean)]; | |||
| [[ELToothbrushBleManager shareManager] setTwoGearDefaultGear:(ToothbrushGearTypeClean_01)]; | |||
| }else if (tag == 14){ | |||
| //MARK:试用 | |||
| [self addLog:@"试用,手动设置,二档,frequency:67 duty:50"]; | |||
| [[ELToothbrushBleManager shareManager] tryGear:(ToothbrushGearTypeCustom) supportType:(ToothSupportGearTypeTwoGear) frequency:67 duty:50]; | |||
| [[ELToothbrushBleManager shareManager] tryGear:(ToothbrushGearTypeCustom_FF) supportType:(ToothSupportGearTypeTwoGear_02) frequency:67 duty:50]; | |||
| }else if (tag == 15){ | |||
| //MARK:设置手动档 | |||
| [self addLog:@"设置手动档:frequency:67 duty:50 interval:120"]; | |||
| @@ -507,13 +507,13 @@ static NSString * const authorizeIntervalKey = @"authorizeIntervalKey"; | |||
| } | |||
| //三轴方向 | |||
| -(void)toothbrushReceiveTriaxialDirection:(ToothbrushTriaxialDirection)direction{ | |||
| if (direction == ToothbrushTriaxialDirectionYTop) { | |||
| if (direction == ToothbrushTriaxialDirectionYTop_01) { | |||
| [self addLog:@"Y轴朝上"]; | |||
| }else if (direction == ToothbrushTriaxialDirectionYBottom){ | |||
| }else if (direction == ToothbrushTriaxialDirectionYBottom_02){ | |||
| [self addLog:@"Y轴朝下"]; | |||
| }else if (direction == ToothbrushTriaxialDirectionYLeft){ | |||
| }else if (direction == ToothbrushTriaxialDirectionYLeft_03){ | |||
| [self addLog:@"Y轴朝左"]; | |||
| }else if (direction == ToothbrushTriaxialDirectionYRight){ | |||
| }else if (direction == ToothbrushTriaxialDirectionYRight_04){ | |||
| [self addLog:@"Y轴朝右"]; | |||
| } | |||