소스 검색

修改多次开关蓝牙和连接断开后state状态无法同步的问题,增加父类“ELBluetoothManager”数据透传方法,请在子类中调用

tags/v1.4.5_20211215
iot_user 5 년 전
부모
커밋
56b989c582

+ 13
- 13
AILinkBleSDKDemo.xcodeproj/project.pbxproj 파일 보기

@@ -49,7 +49,7 @@
E622E2FF243F1D4A003C319D /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E622E2D8243F1D4A003C319D /* ViewController.m */; };
E622E300243F1D4A003C319D /* ThermometerScanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E622E2DA243F1D4A003C319D /* ThermometerScanViewController.m */; };
E622E301243F1D4A003C319D /* ThermometerConnectViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E622E2DD243F1D4A003C319D /* ThermometerConnectViewController.m */; };
E64A7EEA24404B1400D22B84 /* AILinkBleSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E64A7EE924404B1400D22B84 /* AILinkBleSDK.framework */; };
E62381B5244E9B1200B976C4 /* AILinkBleSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E62381B4244E9B1200B976C4 /* AILinkBleSDK.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
@@ -149,7 +149,7 @@
E622E2DB243F1D4A003C319D /* ThermometerConnectViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThermometerConnectViewController.h; sourceTree = "<group>"; };
E622E2DC243F1D4A003C319D /* ThermometerScanViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThermometerScanViewController.h; sourceTree = "<group>"; };
E622E2DD243F1D4A003C319D /* ThermometerConnectViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThermometerConnectViewController.m; sourceTree = "<group>"; };
E64A7EE924404B1400D22B84 /* AILinkBleSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AILinkBleSDK.framework; sourceTree = "<group>"; };
E62381B4244E9B1200B976C4 /* AILinkBleSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AILinkBleSDK.framework; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
@@ -157,7 +157,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
E64A7EEA24404B1400D22B84 /* AILinkBleSDK.framework in Frameworks */,
E62381B5244E9B1200B976C4 /* AILinkBleSDK.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -192,7 +192,7 @@
E622E25D243F1CA5003C319D /* AILinkBleSDKDemo */ = {
isa = PBXGroup;
children = (
E64A7EE924404B1400D22B84 /* AILinkBleSDK.framework */,
E62381B4244E9B1200B976C4 /* AILinkBleSDK.framework */,
E622E2B7243F1D4A003C319D /* AiLinkSuper */,
E622E2CC243F1D4A003C319D /* BabyScale */,
E622E2B1243F1D4A003C319D /* BloodPressure */,
@@ -242,12 +242,12 @@
E622E28D243F1D4A003C319D /* Inherit */ = {
isa = PBXGroup;
children = (
E622E28E243F1D4A003C319D /* SubBleManager.m */,
E622E28F243F1D4A003C319D /* InheritScanViewController.h */,
E622E293243F1D4A003C319D /* InheritConnectViewController.h */,
E622E290243F1D4A003C319D /* InheritConnectViewController.m */,
E622E28F243F1D4A003C319D /* InheritScanViewController.h */,
E622E291243F1D4A003C319D /* InheritScanViewController.m */,
E622E292243F1D4A003C319D /* SubBleManager.h */,
E622E293243F1D4A003C319D /* InheritConnectViewController.h */,
E622E28E243F1D4A003C319D /* SubBleManager.m */,
);
path = Inherit;
sourceTree = "<group>";
@@ -352,10 +352,10 @@
E622E2CC243F1D4A003C319D /* BabyScale */ = {
isa = PBXGroup;
children = (
E622E2CD243F1D4A003C319D /* BabyScaleViewController.m */,
E622E2CE243F1D4A003C319D /* BabyScaleConnectViewController.h */,
E622E2CF243F1D4A003C319D /* BabyScaleViewController.h */,
E622E2D0243F1D4A003C319D /* BabyScaleConnectViewController.m */,
E622E2CF243F1D4A003C319D /* BabyScaleViewController.h */,
E622E2CD243F1D4A003C319D /* BabyScaleViewController.m */,
);
path = BabyScale;
sourceTree = "<group>";
@@ -363,12 +363,12 @@
E622E2D1243F1D4A003C319D /* BodyFatScale */ = {
isa = PBXGroup;
children = (
E622E2D2243F1D4A003C319D /* BodyFatScaleScanViewController.m */,
E622E2D3243F1D4A003C319D /* WiFiSetupViewController.m */,
E622E2D7243F1D4A003C319D /* BodyFatScaleConnectViewController.h */,
E622E2D4243F1D4A003C319D /* BodyFatScaleConnectViewController.m */,
E622E2D5243F1D4A003C319D /* WiFiSetupViewController.h */,
E622E2D6243F1D4A003C319D /* BodyFatScaleScanViewController.h */,
E622E2D7243F1D4A003C319D /* BodyFatScaleConnectViewController.h */,
E622E2D2243F1D4A003C319D /* BodyFatScaleScanViewController.m */,
E622E2D5243F1D4A003C319D /* WiFiSetupViewController.h */,
E622E2D3243F1D4A003C319D /* WiFiSetupViewController.m */,
);
path = BodyFatScale;
sourceTree = "<group>";

BIN
AILinkBleSDKDemo.xcodeproj/project.xcworkspace/xcuserdata/iot_user.xcuserdatad/UserInterfaceState.xcuserstate 파일 보기


+ 6
- 0
AILinkBleSDKDemo.xcodeproj/xcuserdata/iot_user.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist 파일 보기

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "0A8698F6-4F11-4682-93F9-463691AD4B48"
type = "1"
version = "2.0">
</Bucket>

BIN
AILinkBleSDKDemo/AILinkBleSDK.framework/AILinkBleSDK 파일 보기


+ 4
- 0
AILinkBleSDKDemo/AILinkBleSDK.framework/Headers/ELBluetoothManager.h 파일 보기

@@ -362,6 +362,10 @@ Callback decrypted A7 transparent data (payload part), type device type( 回调
*/
-(void)bluetoothReceiveBasicInfoPayloadData:(NSData *)data;

///Callback transparent transmission data(回调透传数据)
/// @param data Transparent data(透传数据)
-(void)bluetoothReceivePassData:(NSData *)data;

#pragma mark ============ Please rewrite the following methods in the subclass(子类重写方法) END==============



+ 3
- 0
AILinkBleSDKDemo/AILinkBleSDK.framework/Headers/ELSDKHeader.h 파일 보기

@@ -107,6 +107,9 @@ typedef NS_ENUM(NSUInteger, ELSupportDeviceType) {
ELSupportDeviceTypeBodyFatScale = 0x000E , //Body fat scale(体脂秤)
ELSupportDeviceTypeSmatLockRemote = 0x0010 , //Smart door lock remote control(智能门锁遥控器)
ELSupportDeviceTypeBLE_WIFIScale = 0x0011 , //Ble and wifi Scale(蓝牙Wifi体脂秤)
ELSupportDeviceTypeAnemometer = 0x0014 , //anemometer(风速计)
ELSupportDeviceTypeClampMeter = 0x0015 , //clamp meter(钳表)
};
//Communication mode(通信模式)
typedef NS_ENUM(NSInteger, ELCommunicationModeType) {

BIN
AILinkBleSDKDemo/AILinkBleSDK.framework/_CodeSignature/CodeDirectory 파일 보기


BIN
AILinkBleSDKDemo/AILinkBleSDK.framework/_CodeSignature/CodeRequirements-1 파일 보기


+ 6
- 6
AILinkBleSDKDemo/AILinkBleSDK.framework/_CodeSignature/CodeResources 파일 보기

@@ -46,7 +46,7 @@
</data>
<key>Headers/ELBluetoothManager.h</key>
<data>
q3LVBfQJJqGw0AR8h6q3nC+Nlgw=
1DzzZZ/wIue+STTYSBnzYR/JDQc=
</data>
<key>Headers/ELBodyFatScaleBleHeader.h</key>
<data>
@@ -110,7 +110,7 @@
</data>
<key>Headers/ELSDKHeader.h</key>
<data>
iRAPDeauG3rYOdp0JoDPzK6Ozhc=
s8ZEGr/PpbFlKrQ5+kqm6spNKn0=
</data>
<key>Headers/ELThermometerBleManager.h</key>
<data>
@@ -261,11 +261,11 @@
<dict>
<key>hash</key>
<data>
q3LVBfQJJqGw0AR8h6q3nC+Nlgw=
1DzzZZ/wIue+STTYSBnzYR/JDQc=
</data>
<key>hash2</key>
<data>
5VoTwBUB4Lq2im9bqd73754D6HCo53vW6XoX6EioHXw=
kNafst/7uHWzJYb4+bnHf1+LulVxqmDY4DZLvvBDSz0=
</data>
</dict>
<key>Headers/ELBodyFatScaleBleHeader.h</key>
@@ -437,11 +437,11 @@
<dict>
<key>hash</key>
<data>
iRAPDeauG3rYOdp0JoDPzK6Ozhc=
s8ZEGr/PpbFlKrQ5+kqm6spNKn0=
</data>
<key>hash2</key>
<data>
uUXMgU5uOmIE0Ng8ZTZiiam+Cy5TOvMxThDSAhOmRoY=
2Eglzg3bcQpTOyihsn8ZijRJly03efDUHObUsNcZPH0=
</data>
</dict>
<key>Headers/ELThermometerBleManager.h</key>

BIN
AILinkBleSDKDemo/AILinkBleSDK.framework/_CodeSignature/CodeSignature 파일 보기


+ 3
- 1
AILinkBleSDKDemo/BabyScale/BabyScaleViewController.m 파일 보기

@@ -85,5 +85,7 @@
}
return _tableView;
}

-(void)dealloc{
[[ELBabyScaleBleManager shareManager] stopScan];
}
@end

+ 4
- 1
AILinkBleSDKDemo/BodyFatScale/BodyFatScaleScanViewController.m 파일 보기

@@ -39,7 +39,7 @@
}
-(void)viewDidDisappear:(BOOL)animated{
[super viewDidDisappear:animated];
[[ELBodyFatScaleBleManager shareManager] stopScan];
}
#pragma mark ============ ELBluetoothManagerDelegate ==============
-(void)bodyFatScaleManagerUpdateState:(ELBluetoothState)state{
@@ -84,4 +84,7 @@
}
return _tableView;
}
-(void)dealloc{
[[ELBodyFatScaleBleManager shareManager] stopScan];
}
@end

+ 5
- 0
AILinkBleSDKDemo/Inherit/SubBleManager.m 파일 보기

@@ -77,6 +77,11 @@ Callback decrypted A7 transparent data (payload part), type device type( 回调
-(void)bluetoothReceiveBasicInfoPayloadData:(NSData *)data{
//特殊数据:门锁和胎压监测会用到,需根据具体协议解析
}
///Callback transparent transmission data(回调透传数据)
/// @param data Transparent data(透传数据)
-(void)bluetoothReceivePassData:(NSData *)data{
//Parsing transparent transmission data(解析透传数据)
}
#pragma mark ============ 发送数据给蓝牙 ==============
-(void)subBleSendA6Data:(NSData *)data{
[self sendCmdToMCUWithA6PayloadData:data];

Loading…
취소
저장