Skip to content

Commit

Permalink
Merge branch 'updateSDKs'
Browse files Browse the repository at this point in the history
  • Loading branch information
im-ttmskk committed May 29, 2018
2 parents 28b8dd4 + b8aa23f commit 5f88f94
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 4 deletions.
Binary file modified MaioPluginSample/Assets/Plugins/Android/maio.aar
Binary file not shown.
18 changes: 16 additions & 2 deletions MaioPluginSample/Assets/Plugins/iOS/Maio.framework/Headers/Maio.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
#import <SystemConfiguration/SystemConfiguration.h>
#import <MobileCoreServices/MobileCoreServices.h>
#import <StoreKit/StoreKit.h>
#import <WebKit/WebKit.h>
#import <sys/sysctl.h>
#import <zlib.h>
#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_5_0
#import <AdSupport/AdSupport.h> // idfaの取得 用
#endif
Expand All @@ -37,9 +39,16 @@ __attribute__((deprecated("Deprecated on Release build")))
;

/// maio SDK からの通知を受け取るデリゲート
+ (id<MaioDelegate>)delegate;
+ (id<MaioDelegate>)delegate __deprecated;
/// maio SDK からの通知を受け取るデリゲートをセットします。
+ (void)setDelegate:(id<MaioDelegate>)delegate;
+ (void)setDelegate:(id<MaioDelegate>)delegate __deprecated;
/// maio SDK からの通知を受け取るデリゲートを追加します
+ (void)addDelegateObject:(id<MaioDelegate>)delegate;
/// maio SDK から、追加済みのデリゲートを取り除きます
+ (void)removeDelegateObject:(id<MaioDelegate>)delegate;
/// maio SDKにデリゲートが追加済みか
+ (BOOL)containsMaioDelegate:(id<MaioDelegate>)delegate;


/**
* SDK のセットアップを開始します。
Expand Down Expand Up @@ -88,6 +97,11 @@ __attribute__((deprecated("Deprecated on Release build")))
@property (nonatomic) BOOL adTestMode;
@property (nonatomic) id<MaioDelegate> delegate;

- (void)addDelegateObject:(id<MaioDelegate>)delegate;
- (void)removeDelegateObject:(id<MaioDelegate>)delegate;
- (BOOL)containsDelegate:(id<MaioDelegate>)delegate;


- (BOOL)canShow;
- (BOOL)canShowAtZoneId:(NSString *)zoneId;
- (void)show;
Expand Down
Binary file modified MaioPluginSample/Assets/Plugins/iOS/Maio.framework/Info.plist
Binary file not shown.
Binary file modified MaioPluginSample/Assets/Plugins/iOS/Maio.framework/Maio
Binary file not shown.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

## サンプルとして同梱しているSDK

* iOS SDK Version: 1.2.18
* Android SDK Version: 1.0.6
* iOS SDK Version: 1.3.0
* Android SDK Version: 1.1.0

## 注意
- MaioPluginSample サンプルプロジェクトは Unity 5 以降で実行できます。
Expand Down
Binary file modified maio.unitypackage
Binary file not shown.

0 comments on commit 5f88f94

Please sign in to comment.