From 537198848fe4ced24c8b39406bdd2d72730570bc Mon Sep 17 00:00:00 2001 From: hank <hank.zhang@proficientcity.com> Date: Wed, 03 May 2017 10:36:37 +0800 Subject: [PATCH] 添加3.6.3 --- frameworks/WASdkIntf.framework/WASdkIntf | 0 frameworks/WASdkIntf.framework/Headers/WAPushProxy.h | 48 ++++++++++++ frameworks/WASdkIntf.framework/Headers/WAPayProxy.h | 2 frameworks/WASdkIntf.framework/_CodeSignature/CodeResources | 60 +++++++++++--- frameworks/WASdkIntf.framework/Headers/WAIPush.h | 52 +++++++++++++ frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory | 0 WASdkIntf.podspec | 2 frameworks/WASdkIntf.framework/Headers/WAConstants.h | 2 frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1 | 0 frameworks/WASdkIntf.framework/Headers/WASdkIntf.h | 4 frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature | 0 frameworks/WASdkIntf.framework/Headers/WAClassGenerator.h | 2 frameworks/WASdkIntf.framework/Headers/WACoreProxy.h | 56 ++++++++++++++ 13 files changed, 210 insertions(+), 18 deletions(-) diff --git a/WASdkIntf.podspec b/WASdkIntf.podspec index b049afa..e7cd3b8 100644 --- a/WASdkIntf.podspec +++ b/WASdkIntf.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |s| s.name = 'WASdkIntf' -s.version = '3.6.2' +s.version = '3.6.3' s.summary = 'WASdkIntf framework in production environment.' s.license = 'MIT' s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" } diff --git a/frameworks/WASdkIntf.framework/Headers/WAClassGenerator.h b/frameworks/WASdkIntf.framework/Headers/WAClassGenerator.h index e73065c..24b04e8 100644 --- a/frameworks/WASdkIntf.framework/Headers/WAClassGenerator.h +++ b/frameworks/WASdkIntf.framework/Headers/WAClassGenerator.h @@ -9,6 +9,8 @@ #import <Foundation/Foundation.h> @interface WAClassGenerator : NSObject +// ++(NSMutableArray*)generatorAllModule; +(NSArray*)getCompsWithModule:(NSString *const)module; //根据module生成实例数组 +(NSMutableArray*)generatorWithModule:(NSString *const)module; diff --git a/frameworks/WASdkIntf.framework/Headers/WAConstants.h b/frameworks/WASdkIntf.framework/Headers/WAConstants.h index 90330b1..da0d2c4 100644 --- a/frameworks/WASdkIntf.framework/Headers/WAConstants.h +++ b/frameworks/WASdkIntf.framework/Headers/WAConstants.h @@ -19,6 +19,7 @@ extern NSString *const WA_MODULE_APW;//应用墙模块 extern NSString *const WA_MODULE_CORE;//公共模块 extern NSString *const WA_MODULE_HUP;//热更新模块 +extern NSString *const WA_MODULE_PUSH;//热更新模块 extern NSString *const WA_PLATFORM_FACEBOOK; extern NSString *const WA_PLATFORM_APPLE; @@ -31,6 +32,7 @@ extern NSString *const WA_PLATFORM_WECHAT; extern NSString *const WA_PLATFORM_HUP; extern NSString *const WA_PLATFORM_APW; +extern NSString *const WA_PLATFORM_PUSH; extern NSString *const WA_CONSTANT_GUEST; diff --git a/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h b/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h index 0b67eb6..3172994 100644 --- a/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h +++ b/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h @@ -8,6 +8,7 @@ #import <Foundation/Foundation.h> #import "WACore.h" +#import "WAIPush.h" @class WACoreProxy; #define WALog(fmt,...) {\ @@ -172,6 +173,61 @@ +(void)eventLogWithPlatform:(NSString*)platform eventName:(NSString*)eventName parameters:(NSDictionary*)parameters color:(UIColor*)color; +/*! + @discussion 处理UIApplicationDelegate的方法[-(BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions]传递过来的参数。 + */ ++ (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions; +#pragma mark 消息通知 +// 注册通知 ++ (void)application:(UIApplication *)application initPushWithDelegate:(id<UNUserNotificationCenterDelegate>)delegate; + +// 调用过用户注册通知方法之后执行 ++ (void)application:(UIApplication *)application didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings; + +// 获取deviceToken ++ (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken; + +// 注册失败 ++ (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error; + +#pragma mark IOS8 IOS9 Push Notification Receive +// 接收本地通知 ++ (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification; +// 接收远程通知 ++ (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult result))completionHandler; + +#pragma mark IOS10 Push Notification Receive +//App处于前台接收通知时 ++ (void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler; + +// 通知的点击事件 ++ (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)())completionHandler; + +/*! + 程序进入后台 + @discussion 处理UIApplicationDelegate的方法[- (void)applicationDidEnterBackground:(UIApplication *)application]传递过来的参数。 + */ ++ (void)applicationDidEnterBackground:(UIApplication *)application; + +/*! + 程序将进入前台 + @discussion 处理UIApplicationDelegate的方法[- (void)applicationWillEnterForeground:(UIApplication *)application]传递过来的参数。 + */ ++ (void)applicationWillEnterForeground:(UIApplication *)application; + +/*! + 程序进入前台 + @discussion 处理UIApplicationDelegate的方法[- (void)applicationDidBecomeActive:(UIApplication *)application]传递过来的参数。 + */ ++ (void)applicationDidBecomeActive:(UIApplication *)application; + +/*! + @discussion 处理UIApplicationDelegate的方法[-(BOOL)application:(UIApplication *)application + openURL:(NSURL *)url + sourceApplication:(NSString *)sourceApplication + annotation:(id)annotation]传递过来的参数。 + */ ++ (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation; @end diff --git a/frameworks/WASdkIntf.framework/Headers/WAIPush.h b/frameworks/WASdkIntf.framework/Headers/WAIPush.h new file mode 100644 index 0000000..64cc5fe --- /dev/null +++ b/frameworks/WASdkIntf.framework/Headers/WAIPush.h @@ -0,0 +1,52 @@ +// +// WAIPush.h +// WASdkIntfUI +// +// Created by hank on 2017/4/1. +// Copyright © 2017年 GHW-T-01. All rights reserved. +// + +#import <Foundation/Foundation.h> +#import <UIKit/UIKit.h> +#import <UserNotifications/UserNotifications.h> + +@interface WAIPush : NSObject + +// 注册通知 +- (void)application:(UIApplication *)application initPushWithDelegate:(id<UNUserNotificationCenterDelegate>)delegate; + +// 调用过用户注册通知方法之后执行 +- (void)application:(UIApplication *)application didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings; + +// 获取deviceToken +- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken; + +// 注册失败 +- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error; + +#pragma mark IOS8 IOS9 Push Notification Receive +// 接收本地通知 +-(void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification; +// 接收远程通知 +- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult result))completionHandler; + +#pragma mark IOS10 Push Notification Receive +//App处于前台接收通知时 +- (void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler; + +// 通知的点击事件 +- (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)())completionHandler; + +// 程序进入后台 +- (void)applicationDidEnterBackground:(UIApplication *)application; + +// 程序将进入前台 +- (void)applicationWillEnterForeground:(UIApplication *)application; + +// 程序进入前台 +- (void)applicationDidBecomeActive:(UIApplication *)application; + +// 拉取消息 +- (void)pullNotification; + +@end diff --git a/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h b/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h index cff0ea9..30aac33 100644 --- a/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h +++ b/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h @@ -69,7 +69,7 @@ +(void)payWithProductId:(NSString*)productId extInfo:(NSString*)extInfo delegate:(id<WAPaymentDelegate>)delegate; /*! @abstract 查询是否支持支付 - @return bool 是否支持某个支付平台 + @return bool 是否支持支付 */ +(BOOL)isPayServiceAvailable; diff --git a/frameworks/WASdkIntf.framework/Headers/WAPushProxy.h b/frameworks/WASdkIntf.framework/Headers/WAPushProxy.h new file mode 100644 index 0000000..9a8e6e3 --- /dev/null +++ b/frameworks/WASdkIntf.framework/Headers/WAPushProxy.h @@ -0,0 +1,48 @@ +// +// WAPushProxy.h +// WASdkIntfUI +// +// Created by hank on 2017/4/1. +// Copyright © 2017年 GHW-T-01. All rights reserved. +// + +#import <Foundation/Foundation.h> +#import "WAIPush.h" + +@interface WAPushProxy : NSObject + +// 注册通知 ++ (void)application:(UIApplication *)application initPushWithDelegate:(id<UNUserNotificationCenterDelegate>)delegate; + +// 调用过用户注册通知方法之后执行 ++ (void)application:(UIApplication *)application didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings; + +// 获取deviceToken ++ (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken; + +// 注册失败 ++ (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error; + +#pragma mark IOS8 IOS9 Push Notification Receive +// 接收本地通知 ++ (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification; +// 接收远程通知 ++ (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult result))completionHandler; + +#pragma mark IOS10 Push Notification Receive +//App处于前台接收通知时 ++ (void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler; + +// 通知的点击事件 ++ (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)())completionHandler; + +// 程序进入后台 ++ (void)applicationDidEnterBackground:(UIApplication *)application; + +// 程序将进入前台 ++ (void)applicationWillEnterForeground:(UIApplication *)application; + +// 程序进入前台 ++ (void)applicationDidBecomeActive:(UIApplication *)application; + +@end diff --git a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h index ef7ade9..1e81c8e 100644 --- a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h +++ b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h @@ -6,6 +6,8 @@ // Copyright © 2016年 GHW-T-01. All rights reserved. // +#import <WASdkIntf/WAIPush.h> +#import <WASdkIntf/WAPushProxy.h> #import <WASdkIntf/WAIApw.h> #import <WASdkIntf/WAApwProxy.h> #import <WASdkIntf/WAConstants.h> @@ -59,4 +61,4 @@ // In this header, you should import all the public headers of your framework using statements like #import <WASdkIntf/PublicHeader.h> -//time:2017/3/25 11:35 ver:3.6.2 +//time:2017/4/25 14:31 ver:3.6.3 diff --git a/frameworks/WASdkIntf.framework/WASdkIntf b/frameworks/WASdkIntf.framework/WASdkIntf index 4abcda1..6224daf 100644 --- a/frameworks/WASdkIntf.framework/WASdkIntf +++ b/frameworks/WASdkIntf.framework/WASdkIntf Binary files differ diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory b/frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory index fbca673..c741c3b 100644 --- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory +++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory Binary files differ diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1 b/frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1 index fe47353..f06ba5e 100644 --- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1 +++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1 Binary files differ diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources b/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources index 6cde994..bb513f5 100644 --- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources +++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources @@ -30,7 +30,7 @@ </data> <key>Headers/WAClassGenerator.h</key> <data> - XlfLFA3Q2o5w/+mSnUpy9pnmHbI= + yHzebypVV8DNWfEVxbs2vx6UVHI= </data> <key>Headers/WACode.h</key> <data> @@ -42,7 +42,7 @@ </data> <key>Headers/WAConstants.h</key> <data> - rGxCj6IXjjhS+MimxprY7WF2qCs= + mhHJUprsK/rHcMGxd1x/Re7hmSU= </data> <key>Headers/WACore.h</key> <data> @@ -50,7 +50,7 @@ </data> <key>Headers/WACoreProxy.h</key> <data> - 6l72fcEeFTizQ8nPfpFXP41/rZk= + V3URXD0gqC0xRmDiDoQbYC+kvpE= </data> <key>Headers/WAError.h</key> <data> @@ -104,6 +104,10 @@ <data> hoReRwkwXoZRAl6H4ah1cI6V7hM= </data> + <key>Headers/WAIPush.h</key> + <data> + X1bb0ES6SQt4nPwYRdS5pXYiPOQ= + </data> <key>Headers/WAISocial.h</key> <data> 9CXo9+tTiap++1MNxkwVlG+WJ7I= @@ -138,11 +142,15 @@ </data> <key>Headers/WAPayProxy.h</key> <data> - mZdaV1hFWYIp01QPPoBNN5JAiX8= + T7rdAiOZPcaMdHgUyawbStFC4CI= + </data> + <key>Headers/WAPushProxy.h</key> + <data> + j8oFdCdKvYFpF/669OsiaSSmGzc= </data> <key>Headers/WASdkIntf.h</key> <data> - MDUGYLgz5ISgLlk9lSnpwb02UJc= + PgmrgqGLR8vkIY6XqPZEG0n7FBM= </data> <key>Headers/WAShareLinkContent.h</key> <data> @@ -265,11 +273,11 @@ <dict> <key>hash</key> <data> - XlfLFA3Q2o5w/+mSnUpy9pnmHbI= + yHzebypVV8DNWfEVxbs2vx6UVHI= </data> <key>hash2</key> <data> - JC+LoF0ElyQQcKx4IktNpnHGrtTjBfJIzbxl4GIo/v0= + h91wGpmgZMvuAU2QBihZDLxu893Aex3nKspJpYL2dMM= </data> </dict> <key>Headers/WACode.h</key> @@ -298,11 +306,11 @@ <dict> <key>hash</key> <data> - rGxCj6IXjjhS+MimxprY7WF2qCs= + mhHJUprsK/rHcMGxd1x/Re7hmSU= </data> <key>hash2</key> <data> - a4zov0niNF1BASjtJtQ3faKj/2n7McYNN3MJPm7HV50= + LzD4s8pUm+0pjpu71tiKu06kHKNO/jAqdWd4fiS82is= </data> </dict> <key>Headers/WACore.h</key> @@ -320,11 +328,11 @@ <dict> <key>hash</key> <data> - 6l72fcEeFTizQ8nPfpFXP41/rZk= + V3URXD0gqC0xRmDiDoQbYC+kvpE= </data> <key>hash2</key> <data> - rS3Qif5j+JEjRlSH5+vXm9cLcAkjE8KWr8mh9JCcrWo= + 1bNSTNX68Eg8JUr4OhjWuHtMymOh0St2iCLh4cvCQss= </data> </dict> <key>Headers/WAError.h</key> @@ -470,6 +478,17 @@ g7YbYwvrMk+pKj1SjalZtVPdGBdPoxuZp3Zy5HVtEaw= </data> </dict> + <key>Headers/WAIPush.h</key> + <dict> + <key>hash</key> + <data> + X1bb0ES6SQt4nPwYRdS5pXYiPOQ= + </data> + <key>hash2</key> + <data> + TTkSDpY/ZgRu42bH430igL27+EadlbwJv9eutd34CEo= + </data> + </dict> <key>Headers/WAISocial.h</key> <dict> <key>hash</key> @@ -562,22 +581,33 @@ <dict> <key>hash</key> <data> - mZdaV1hFWYIp01QPPoBNN5JAiX8= + T7rdAiOZPcaMdHgUyawbStFC4CI= </data> <key>hash2</key> <data> - Ka5CH63en6BG9XPGetkorjU34kHt48i8vj4TN+x+BVU= + M1dzR4tA7YN9hAx9zszdnsTolW27PIJegxK35wlevBA= + </data> + </dict> + <key>Headers/WAPushProxy.h</key> + <dict> + <key>hash</key> + <data> + j8oFdCdKvYFpF/669OsiaSSmGzc= + </data> + <key>hash2</key> + <data> + 2RibWKKC9wYGiwRjRHxd/5Tv5S1PDnVUhr/ZjVTxfec= </data> </dict> <key>Headers/WASdkIntf.h</key> <dict> <key>hash</key> <data> - MDUGYLgz5ISgLlk9lSnpwb02UJc= + PgmrgqGLR8vkIY6XqPZEG0n7FBM= </data> <key>hash2</key> <data> - kV29WM4eyP2QxsLJhV+IcTdrXitPSy4+nXCTg8/vnkE= + QcOsKh9gcU4lwKgcqQSQAKqQlzjCqJj1kV1qrKO5ofk= </data> </dict> <key>Headers/WAShareLinkContent.h</key> diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature b/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature index cc9b0f0..c231692 100644 --- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature +++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature Binary files differ -- Gitblit v1.8.0