Skip to content

Commit 7519eca

Browse files
tonychanchenoldcodefarmer
authored andcommitted
迁移蓝牙模块到SDK中
Change-Id: I6ca9069c73b577c83906662635fb9a9b461f7e78
1 parent 4c1f61b commit 7519eca

File tree

5 files changed

+8
-22
lines changed

5 files changed

+8
-22
lines changed

Source/LinkApp/Classes/Universal/蓝牙/BluetoothCentralManager.m renamed to Source/SDK/LinkCore/QCDeviceCenter/BlueTooth/BluetoothCentralManager.m

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
// BluetoothCentralManager.m
33
//
44
#import "BluetoothCentralManager.h"
5+
#import "TIoTCoreWMacros.h"
6+
#import "NSString+Extension.h"
7+
#import "HXYNotice.h"
8+
#import "MBProgressHUD+XDP.h"
9+
#import "NSObject+additions.h"
10+
511
//服务UUID
612
#define kServiceUUID @"FFF0"
713

@@ -83,7 +89,7 @@ - (void)scanNearPerpherals{
8389
if ([self.centralManager isScanning]) {
8490
return;
8591
}
86-
WCLog(@"开始扫描四周的设备");
92+
QCLog(@"开始扫描四周的设备");
8793
self.isLLsync = NO;
8894
self.maxValue = 0;
8995

@@ -150,7 +156,7 @@ - (void)scanNearLLSyncService {
150156
停止扫描设备
151157
*/
152158
- (void)stopScan{
153-
WCLog(@"停止扫描四周的设备");
159+
QCLog(@"停止扫描四周的设备");
154160
[self.centralManager stopScan];
155161

156162
self.isScanDevice = self.centralManager.isScanning;

TIoTLinkKit.xcodeproj/project.pbxproj

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@
218218
D2038BC323322F350036F6B9 /* TIoTChoseDayTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2038BC223322F350036F6B9 /* TIoTChoseDayTableViewCell.m */; };
219219
D2038BC623330BF10036F6B9 /* TIoTAddActionTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2038BC523330BF10036F6B9 /* TIoTAddActionTableViewCell.m */; };
220220
D2038BC92333145B0036F6B9 /* TIoTActionTypeTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2038BC82333145B0036F6B9 /* TIoTActionTypeTableViewCell.m */; };
221-
D2038BCC233319440036F6B9 /* HXYNotice.m in Sources */ = {isa = PBXBuildFile; fileRef = D2038BCB233319440036F6B9 /* HXYNotice.m */; };
222221
D20621AF235597DC00142DAC /* TIoTDistributionNetworkViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D20621AE235597DC00142DAC /* TIoTDistributionNetworkViewController.m */; };
223222
D20621B223559DD100142DAC /* TIoTDistributionNetCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D20621B123559DD100142DAC /* TIoTDistributionNetCollectionViewCell.m */; };
224223
D20621BA23559E5600142DAC /* TYPageControl.m in Sources */ = {isa = PBXBuildFile; fileRef = D20621B623559E5600142DAC /* TYPageControl.m */; };
@@ -272,7 +271,6 @@
272271
D2C7D8142330D75300C97A04 /* TIoTWIFINetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2C7D8132330D75300C97A04 /* TIoTWIFINetViewController.m */; };
273272
D2C7D8172330DA7A00C97A04 /* TIoTConnectViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2C7D8162330DA7A00C97A04 /* TIoTConnectViewController.m */; };
274273
D2D5DA262362E68600BB0FBE /* TIoTTimeView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2D5DA252362E68600BB0FBE /* TIoTTimeView.m */; };
275-
D2DAC4C623386173006DB67C /* BluetoothCentralManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D2DAC4C523386173006DB67C /* BluetoothCentralManager.m */; };
276274
D2E11EAF2331B98400C388A5 /* TIoTSoftapConnectViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2E11EAE2331B98400C388A5 /* TIoTSoftapConnectViewController.m */; };
277275
D2E11EB22331C4FA00C388A5 /* TIoTMineTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2E11EB12331C4FA00C388A5 /* TIoTMineTableViewCell.m */; };
278276
D2E11EB52331CE1000C388A5 /* TIoTUserInfomationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2E11EB42331CE1000C388A5 /* TIoTUserInfomationViewController.m */; };
@@ -899,8 +897,6 @@
899897
D2038BC523330BF10036F6B9 /* TIoTAddActionTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TIoTAddActionTableViewCell.m; sourceTree = "<group>"; };
900898
D2038BC72333145B0036F6B9 /* TIoTActionTypeTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TIoTActionTypeTableViewCell.h; sourceTree = "<group>"; };
901899
D2038BC82333145B0036F6B9 /* TIoTActionTypeTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TIoTActionTypeTableViewCell.m; sourceTree = "<group>"; };
902-
D2038BCA233319440036F6B9 /* HXYNotice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HXYNotice.h; sourceTree = "<group>"; };
903-
D2038BCB233319440036F6B9 /* HXYNotice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HXYNotice.m; sourceTree = "<group>"; };
904900
D20621AD235597DC00142DAC /* TIoTDistributionNetworkViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TIoTDistributionNetworkViewController.h; sourceTree = "<group>"; };
905901
D20621AE235597DC00142DAC /* TIoTDistributionNetworkViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TIoTDistributionNetworkViewController.m; sourceTree = "<group>"; };
906902
D20621B023559DD100142DAC /* TIoTDistributionNetCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TIoTDistributionNetCollectionViewCell.h; sourceTree = "<group>"; };
@@ -1008,8 +1004,6 @@
10081004
D2C7D8162330DA7A00C97A04 /* TIoTConnectViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TIoTConnectViewController.m; sourceTree = "<group>"; };
10091005
D2D5DA242362E68600BB0FBE /* TIoTTimeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TIoTTimeView.h; sourceTree = "<group>"; };
10101006
D2D5DA252362E68600BB0FBE /* TIoTTimeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TIoTTimeView.m; sourceTree = "<group>"; };
1011-
D2DAC4C423386173006DB67C /* BluetoothCentralManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BluetoothCentralManager.h; sourceTree = "<group>"; };
1012-
D2DAC4C523386173006DB67C /* BluetoothCentralManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BluetoothCentralManager.m; sourceTree = "<group>"; };
10131007
D2E11EAD2331B98400C388A5 /* TIoTSoftapConnectViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TIoTSoftapConnectViewController.h; sourceTree = "<group>"; };
10141008
D2E11EAE2331B98400C388A5 /* TIoTSoftapConnectViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TIoTSoftapConnectViewController.m; sourceTree = "<group>"; };
10151009
D2E11EB02331C4FA00C388A5 /* TIoTMineTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TIoTMineTableViewCell.h; sourceTree = "<group>"; };
@@ -2583,7 +2577,6 @@
25832577
D2E976B5233D967E00182443 /* WebSocket */,
25842578
D231050C233075D50003069D /* WxManage */,
25852579
D23104F923306DE60003069D /* IQKeyboardManage */,
2586-
D2DAC4C32338615C006DB67C /* 蓝牙 */,
25872580
D2C7D7FF2330CA6500C97A04 /* SGQRCode */,
25882581
D23104B5233066810003069D /* Util */,
25892582
EDF93D9723B367A000D477C7 /* TIoTRequestObject.h */,
@@ -2595,8 +2588,6 @@
25952588
D23104B5233066810003069D /* Util */ = {
25962589
isa = PBXGroup;
25972590
children = (
2598-
D2038BCA233319440036F6B9 /* HXYNotice.h */,
2599-
D2038BCB233319440036F6B9 /* HXYNotice.m */,
26002591
D23104BA233066810003069D /* KeyChainUntil.h */,
26012592
D23104B7233066810003069D /* KeyChainUntil.m */,
26022593
D23104BB233066810003069D /* UIDevice+Until.h */,
@@ -2853,15 +2844,6 @@
28532844
path = SGQRCode;
28542845
sourceTree = "<group>";
28552846
};
2856-
D2DAC4C32338615C006DB67C /* 蓝牙 */ = {
2857-
isa = PBXGroup;
2858-
children = (
2859-
D2DAC4C423386173006DB67C /* BluetoothCentralManager.h */,
2860-
D2DAC4C523386173006DB67C /* BluetoothCentralManager.m */,
2861-
);
2862-
path = "蓝牙";
2863-
sourceTree = "<group>";
2864-
};
28652847
D2E976B5233D967E00182443 /* WebSocket */ = {
28662848
isa = PBXGroup;
28672849
children = (
@@ -3564,7 +3546,6 @@
35643546
D2A2CD3A234ECC6D0039EB51 /* TIoTRefreshHeader.m in Sources */,
35653547
ED8D1F6F242B500300900B80 /* TIoTTipView.m in Sources */,
35663548
6DE800F9254FE95F0093F925 /* TIoTIntelligentVC.m in Sources */,
3567-
D2DAC4C623386173006DB67C /* BluetoothCentralManager.m in Sources */,
35683549
6DC7F8D92552E394009508EE /* TIoTSettingIntelligentImageVC.m in Sources */,
35693550
D2A2CD39234ECC6D0039EB51 /* TIoTRefreshFooter.m in Sources */,
35703551
A40574A724E2AF1E00836FB7 /* TIoTNewVersionTipView.m in Sources */,
@@ -3728,7 +3709,6 @@
37283709
A4DC768224D126780079F12C /* TIoTConfigInputView.m in Sources */,
37293710
F4833EC524E17E340033FAB2 /* TIoTAPPConfig.swift in Sources */,
37303711
6DA086EB256B901400938CF4 /* TIoTIntelligentLogVC.m in Sources */,
3731-
D2038BCC233319440036F6B9 /* HXYNotice.m in Sources */,
37323712
D2A2CD29234DBDC00039EB51 /* TIoTQCloudCOSXMLManage.m in Sources */,
37333713
F46FE32126A6A78100543EFD /* TIoTLLSyncDeviceCell.m in Sources */,
37343714
ED6BA5BA23C5C10C00BE9EC9 /* TIoTRoomInfoVC.m in Sources */,

0 commit comments

Comments
 (0)