Skip to content

fix undefined methods #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kenzan8000 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix undefined methods #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ReactiveCoreBluetooth/BluetoothLEService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ -(void) initializeSignals
for (CacheObject* obj in self.availableDevices)
{
CBPeripheral* p = (CBPeripheral*)obj.object;
if (p.isConnected)
if (p.state == CBPeripheralStateConnected)
{
[devicesToKeep addObject:obj];
}
Expand Down Expand Up @@ -168,7 +168,7 @@ -(CacheObject *) isPeripheral:(CBPeripheral *) peripheral inArray:(NSArray *)arr
for (CacheObject *obj in array)
{
CBPeripheral* p = (CBPeripheral*)obj.object;
if (p.UUID == peripheral.UUID)
if ([p.identifier.UUIDString isEqualToString:peripheral.identifier.UUIDString])
{
return obj;
}
Expand Down
15 changes: 8 additions & 7 deletions Sample/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
PODS:
- ReactiveCocoa (2.1.8):
- ReactiveCocoa/Core
- ReactiveCocoa/no-arc
- ReactiveCocoa/Core (2.1.8):
- ReactiveCocoa (2.5):
- ReactiveCocoa/UI (= 2.5)
- ReactiveCocoa/Core (2.5):
- ReactiveCocoa/no-arc
- ReactiveCocoa/no-arc (2.1.8)
- ReactiveCocoa/no-arc (2.5)
- ReactiveCocoa/UI (2.5):
- ReactiveCocoa/Core

DEPENDENCIES:
- ReactiveCocoa

SPEC CHECKSUMS:
ReactiveCocoa: 0db710a0afa1c627a64470e5c912a3870d4854ae
ReactiveCocoa: e2db045570aa97c695e7aa97c2bcab222ae51f4a

COCOAPODS: 0.28.0
COCOAPODS: 0.39.0
41 changes: 35 additions & 6 deletions Sample/ReactiveCoreBluetooth.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
633DDB1317A0769E00B5C077 /* ReactiveCoreBluetooth.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ReactiveCoreBluetooth.podspec; path = ../ReactiveCoreBluetooth.podspec; sourceTree = "<group>"; };
633DDB1417A0769E00B5C077 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README.md; path = ../README.md; sourceTree = "<group>"; };
633DDB1717A07C3200B5C077 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
6DD7C48643752CA9EB94ACBB /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
8148F970179EF6F9005A414E /* CoreBluetooth.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreBluetooth.framework; path = System/Library/Frameworks/CoreBluetooth.framework; sourceTree = SDKROOT; };
8148F98517A02184005A414E /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ViewController.h; path = ReactiveCoreBluetooth/ViewController.h; sourceTree = SOURCE_ROOT; };
8148F98617A02184005A414E /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = ReactiveCoreBluetooth/AppDelegate.m; sourceTree = SOURCE_ROOT; };
Expand All @@ -57,7 +58,7 @@
81F90514179EF5A600E90276 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
81F90516179EF5A600E90276 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
81F90518179EF5A600E90276 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
FCFEF8C442014C7F82E8EC0D /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = SOURCE_ROOT; };
AFCF20B7270AB57447CCBDBC /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -76,6 +77,15 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
05424B9CA9E2DF36198919A1 /* Pods */ = {
isa = PBXGroup;
children = (
AFCF20B7270AB57447CCBDBC /* Pods.debug.xcconfig */,
6DD7C48643752CA9EB94ACBB /* Pods.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
819002FC187705D800350A0A /* ReactiveCoreBluetooth */ = {
isa = PBXGroup;
children = (
Expand All @@ -101,7 +111,7 @@
633DDB1317A0769E00B5C077 /* ReactiveCoreBluetooth.podspec */,
633DDB1417A0769E00B5C077 /* README.md */,
633DDB1717A07C3200B5C077 /* LICENSE */,
FCFEF8C442014C7F82E8EC0D /* Pods.xcconfig */,
05424B9CA9E2DF36198919A1 /* Pods */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -165,6 +175,7 @@
81F9050E179EF5A600E90276 /* Frameworks */,
81F9050F179EF5A600E90276 /* Resources */,
A5E922AE3AA346AE85348924 /* Copy Pods Resources */,
E793E015B8B6004FF4F74B4A /* Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -181,7 +192,7 @@
81F90509179EF5A600E90276 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0460;
LastUpgradeCheck = 0720;
ORGANIZATIONNAME = "Citrrus, LLC";
};
buildConfigurationList = 81F9050C179EF5A600E90276 /* Build configuration list for PBXProject "ReactiveCoreBluetooth" */;
Expand Down Expand Up @@ -247,7 +258,22 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Pods-resources.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
showEnvVarsInLog = 0;
};
E793E015B8B6004FF4F74B4A /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -302,6 +328,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
Expand Down Expand Up @@ -349,23 +376,25 @@
};
81F90535179EF5A700E90276 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = FCFEF8C442014C7F82E8EC0D /* Pods.xcconfig */;
baseConfigurationReference = AFCF20B7270AB57447CCBDBC /* Pods.debug.xcconfig */;
buildSettings = {
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "ReactiveCoreBluetooth/ReactiveCoreBluetooth-Prefix.pch";
INFOPLIST_FILE = "ReactiveCoreBluetooth/ReactiveCoreBluetooth-Info.plist";
PRODUCT_BUNDLE_IDENTIFIER = "com.citrrus.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = ReactiveCoreBluetooth;
WRAPPER_EXTENSION = app;
};
name = Debug;
};
81F90536179EF5A700E90276 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = FCFEF8C442014C7F82E8EC0D /* Pods.xcconfig */;
baseConfigurationReference = 6DD7C48643752CA9EB94ACBB /* Pods.release.xcconfig */;
buildSettings = {
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "ReactiveCoreBluetooth/ReactiveCoreBluetooth-Prefix.pch";
INFOPLIST_FILE = "ReactiveCoreBluetooth/ReactiveCoreBluetooth-Info.plist";
PRODUCT_BUNDLE_IDENTIFIER = "com.citrrus.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = ReactiveCoreBluetooth;
WRAPPER_EXTENSION = app;
};
Expand Down
2 changes: 1 addition & 1 deletion Sample/ReactiveCoreBluetooth/ReactiveCoreBluetooth-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>com.citrrus.${PRODUCT_NAME:rfc1034identifier}</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand Down
2 changes: 1 addition & 1 deletion Sample/ReactiveCoreBluetooth/ViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NS
CBPeripheral* peripheral = [self.blueToothDevices objectAtIndex:indexPath.row];

cell.textLabel.text = peripheral.name;
cell.detailTextLabel.text = [NSString stringWithFormat:@"%@", peripheral.isConnected ? @"Connected" : @""];
cell.detailTextLabel.text = [NSString stringWithFormat:@"%@", peripheral.state == CBPeripheralStateConnected ? @"Connected" : @""];
}
return cell;
}
Expand Down