Skip to content

Commit

Permalink
Modify didDecodeQRcode
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuuki Nishiyama committed Jan 15, 2019
1 parent 58037d6 commit 7b3a10d
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Example/SenbayKit/SenbayPlayerSwiftViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class SenbayPlayerSwiftViewController: UIViewController, UINavigationControllerD
rawDataLabel.text = qrcode
}

func didDecodeQRcode(_ senbayData: [AnyHashable : Any]!) {
func didDecodeQRcode(_ senbayData: [String : NSObject]!) {

}

Expand Down
2 changes: 1 addition & 1 deletion Example/SenbayKit/SenbayReaderSwiftViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class SenbayReaderSwiftViewController: UIViewController, SenbayReaderDelegate {
rawDataLabel.text = qrcode
}

func didDecodeQRcode(_ senbayData: [AnyHashable : Any]!) {
func didDecodeQRcode(_ senbayData: [String : NSObject]!) {

}

Expand Down
10 changes: 3 additions & 7 deletions SenbayKit.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'SenbayKit'
s.version = '0.2.0'
s.version = '0.2.1'
s.summary = 'Senbay: A Platform for Instantly Capturing, Integrating, and Restreaming of Synchronized Multiple Sensor-data Streams'

# This description is used to generate tags and improve search results.
Expand All @@ -23,19 +23,15 @@ The spread of smartphones allows us to freely capture video and diverse hardware

s.homepage = 'http://www.senbay.info'
# s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2'
s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' }
s.license = { :type => 'Apache2', :file => 'LICENSE' }
s.author = { 'Yuuki Nishiyama' => '[email protected]' }
s.source = { :git => 'https://github.com/tetujin/SenbayKit.git', :tag => s.version.to_s }
# s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'

s.ios.deployment_target = '10.0'

s.swift_version = '4.2'
s.source_files = 'SenbayKit/Classes/**/*'

# s.resource_bundles = {
# 'SenbayKit-ObjC' => ['SenbayKit-ObjC/Assets/*.png']
# }

# s.public_header_files = 'Pod/Classes/**/*.h'
s.frameworks = 'OpenGLES','AVFoundation','CoreMotion','CoreLocation', 'UIKit', 'CoreBluetooth' #,'MapKit'
s.dependency 'CocoaAsyncSocket'
Expand Down
2 changes: 1 addition & 1 deletion SenbayKit/Classes/Models/SenbayData.m
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ - (instancetype)init
self = [super init];
if (self != nil) {
format = [[SenbayFormat alloc] init];
_baseNumber = 122;
_baseNumber = 121;
}
return self;
}
Expand Down
2 changes: 1 addition & 1 deletion SenbayKit/Classes/SenbayPlayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
@protocol SenbayPlayerDelegate <NSObject>
@optional
- (void) didDetectQRcode:(NSString *) qrcode;
- (void) didDecodeQRcode:(NSDictionary *) senbayData;
- (void) didDecodeQRcode:(NSDictionary <NSString *, NSObject *> *) senbayData;
@end


Expand Down
2 changes: 1 addition & 1 deletion SenbayKit/Classes/SenbayReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
@protocol SenbayReaderDelegate <NSObject>
@optional
- (void) didDetectQRcode:(NSString *) qrcode;
- (void) didDecodeQRcode:(NSDictionary *) senbayData;
- (void) didDecodeQRcode:(NSDictionary <NSString *, NSObject *> *) senbayData;
@end

@interface SenbayReader : NSObject <AVCaptureMetadataOutputObjectsDelegate, AVCaptureVideoDataOutputSampleBufferDelegate>
Expand Down
2 changes: 1 addition & 1 deletion SenbayKit/Classes/Sensors/SenbaySensorManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ - (instancetype)init
self = [super init];
if (self!=nil) {
format = [[SenbayFormat alloc] init];
_baseNumber = 122;
_baseNumber = 121;
_sensors = [[NSMutableArray alloc] init];
_imu = [[SenbayIMU alloc] init];
_location = [[SenbayLocation alloc] init];
Expand Down

0 comments on commit 7b3a10d

Please sign in to comment.