Merge branch 'ios'

.gitignore

@@ -1,3 +1,2 @@
-.project
-.tmp/
+.*
 node_modules/

README.md

@@ -4,7 +4,9 @@
 
 腾讯信鸽推送服务：http://xg.qq.com/
 
-信鸽 SDK 版本：2.40
+信鸽 Android SDK 版本：2.40
+
+信鸽 iOS SDK 版本：2.4.0
 
 Cordova 版本：3.x / 4.x / 5.x
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "xgpush-cordova",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "腾讯信鸽推送服务：http://xg.qq.com/",
   "main": "index.js",
   "dependencies": {

plugin.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin xmlns:android="http://schemas.android.com/apk/res/android"
-  id="com.eteng.push.xgpush"
-  version="0.1.3">
+  id="cordova-plugin-xgpush"
+  version="0.2.0">
 
   <name>xgpush-cordova</name>
   <description>Tencent XGPush Plugin</description>
@@ -147,6 +147,53 @@
 
   </platform>
 
+  <!-- ios -->
+  <platform name="ios">
+
+    <config-file target="config.xml" parent="/*">
+      <feature name="XGPush">
+        <param name="ios-package" value="CDVXGPushPlugin"/>
+        <param name="onload" value="true"/>
+      </feature>
+    </config-file>
+
+    <config-file target="*-Info.plist" parent="XGPushMeta">
+      <dict>
+        <key>AccessID</key>
+        <integer>$ACCESS_ID</integer>
+        <key>AccessKey</key>
+        <string>$ACCESS_KEY</string>
+      </dict>
+    </config-file>
+
+    <!-- Tencent XGPush SDK -->
+    <header-file src="src/ios/2.4.0/XGPush.h" />
+    <header-file src="src/ios/2.4.0/XGSetting.h" />
+    <source-file src="src/ios/2.4.0/libXG-SDK.a" framework="true" />
+
+    <!-- Cordova Plugin -->
+    <header-file src="src/ios/AppDelegate+CDVXGPush.h" />
+    <source-file src="src/ios/AppDelegate+CDVXGPush.m" />
+
+    <header-file src="src/ios/CDVXGPushPlugin.h" />
+    <source-file src="src/ios/CDVXGPushPlugin.m" />
+
+    <header-file src="src/ios/CDVXGPushUtil.h" />
+    <source-file src="src/ios/CDVXGPushUtil.m" />
+
+    <header-file src="src/ios/CDVRegisterNotification.h" />
+    <source-file src="src/ios/CDVRegisterNotification.m" />
+
+    <!-- Dependencies -->
+    <framework src="libz.dylib" />
+    <framework src="libsqlite3.dylib" />
+    <framework src="CFNetwork.framework" />
+    <framework src="SystemConfiguration.framework" />
+    <framework src="CoreTelephony.framework" />
+    <framework src="Security.framework" />
+
+  </platform>
+
   <dependency id="es6-promise-plugin" url="https://github.com/vstirbu/PromisesPlugin.git"></dependency>
 
 </plugin>

src/android/v2/XGCordova.java

@@ -10,7 +10,7 @@
 import android.util.Log;
 
 public class XGCordova extends XGPushPlugin {
-	
+
   private static final String TAG = "XGCordovaPlugin";
   private ReceiverManager manager = new ReceiverManager();
 
@@ -38,7 +38,7 @@ protected boolean unregisterPush(Context context, CallbackContext callback) {
 
   @Override
   protected boolean addListener(Context context, CallbackContext callback) {
-	return manager.registerReceiver(context, callback);
+    return manager.registerReceiver(context, callback);
   }
 
 }

src/ios/2.4.0/XGPush.h

@@ -0,0 +1,178 @@
+//
+//  XGPush.h
+//  XG-SDK
+//
+//  Created by xiangchen on 13-10-18.
+//  Copyright (c) 2013年 mta. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+#define XG_SDK_VERSION @"2.4.0"
+
+@interface XGPush : NSObject
+
+/**
+ * 初始化信鸽
+ * @param appId - 通过前台申请的应用ID
+ * @param appKey - 通过前台申请的appKey
+ * @return none
+ */
++(void)startApp:(uint32_t)appId appKey:(NSString *)appKey;
+
+/**
+ * 如果注销过信鸽，需要再次注册push服务前的准备
+ * @param successCallback 初始化之后的回调，如果需要即刻恢复push服务，registerPush在此回调中调用
+ * @return none
+ */
++(void)initForReregister:(void (^)(void)) successCallback;
+
+/**
+ * 判断当前是否是已注销状态
+ * @param none
+ * @return none
+ */
++(BOOL)isUnRegisterStatus;
+
+/**
+ * 设置设备的帐号 (在初始化信鸽后，注册设备之前调用。account本质上是registerDevice的一个参数)
+ * @param account - 帐号名（长度为2个字节以上，不要使用"test","123456"这种过于简单的字符串）
+ * @return none
+ */
++(void)setAccount:(NSString *)account;
+
+/**
+ * 注册设备
+ * @param deviceToken - 通过app delegate的didRegisterForRemoteNotificationsWithDeviceToken回调的获取
+ * @return 获取的deviceToken字符串
+ */
++(NSString *)registerDevice:(NSData *)deviceToken;
+
+//注册设备，支持回调函数版本
++(NSString *)registerDevice:(NSData *)deviceToken successCallback:(void (^)(void)) successCallback errorCallback:(void (^)(void)) errorCallback;
+
+//注册设备，支持字符串deviceToken版本
++(NSString *)registerDeviceStr:(NSString *)deviceToken;
+
+/**
+ * 注销设备，设备不再进行推送
+ * @param none
+ * @return none
+ */
++(void)unRegisterDevice;
+
+//注销设备，支持回调版本
++(void)unRegisterDevice:(void (^)(void)) successCallback errorCallback:(void (^)(void)) errorCallback;
+
+/**
+ * 设置tag
+ * @param tag - 需要设置的tag
+ * @return none
+ */
++(void)setTag:(NSString *)tag;
+
+//设置tag，支持回调版本
++(void)setTag:(NSString *)tag successCallback:(void (^)(void)) successCallback errorCallback:(void (^)(void)) errorCallback;
+
+/**
+ * 删除tag
+ * @param tag - 需要删除的tag
+ * @return none
+ */
++(void)delTag:(NSString *)tag;
+
+//删除tag，支持回调版本
++(void)delTag:(NSString *)tag successCallback:(void (^)(void)) successCallback errorCallback:(void (^)(void)) errorCallback;
+
+/**
+ * 在didReceiveRemoteNotification中调用，用于推送反馈。(app在运行时)
+ * @param userInfo 苹果apns的推送信息
+ * @return none
+ */
++(void)handleReceiveNotification:(NSDictionary *)userInfo;
+
+//信鸽Pro专用接口
++(void)handleReceiveNotification:(NSDictionary *)userInfo completion:(void (^)(void)) completion;
+
+//推送反馈(app在运行时),支持回调版本
++(void)handleReceiveNotification:(NSDictionary *)userInfo successCallback:(void (^)(void)) successCallback errorCallback:(void (^)(void)) errorCallback completion:(void (^)(void)) completion;
+
+/**
+ * 在didFinishLaunchingWithOptions中调用，用于推送反馈.(app没有运行时，点击推送启动时)
+ * @param userInfo
+ * @return none
+ */
++(void)handleLaunching:(NSDictionary *)launchOptions;
+
+//推送反馈.(app没有运行时，点击推送启动时),支持回调版本
++(void)handleLaunching:(NSDictionary *)launchOptions successCallback:(void (^)(void)) successCallback errorCallback:(void (^)(void)) errorCallback;
+
+/**
+ * 获取userInfo里的bid信息(bid:信鸽的推送消息id)
+ * @param userInfo 苹果apns的推送信息
+ * @return none
+ */
++(NSString *)getBid:(NSDictionary *)userInfo;
+
+/**
+ * deviceToken类型转换
+ * @param deviceToken NSData格式的deviceToken
+ * @return none
+ */
++(NSString *)getDeviceToken:(NSData *)deviceToken;
+
+/**
+ * 获取本地缓存的deviceToken
+ * @param none
+ * @return 信鸽启动时填入的的accessID
+ */
++(uint32_t)getAccessID;
+
+/**************************
+ 以下是本地推送相关
+**************************/
+
+/**
+ * 本地推送，最多支持64个
+ * @param fireDate 本地推送触发的时间
+ * @param alertBody 推送的内容
+ * @param badge 角标的数字。如果不改变，则传递 -1
+ * @param alertAction 替换弹框的按钮文字内容（默认为"启动"）
+ * @param userInfo 自定义参数，可以用来标识推送和增加附加信息
+ * @return none
+ */
++(void)localNotification:(NSDate *)fireDate alertBody:(NSString *)alertBody badge:(int)badge alertAction:(NSString *)alertAction userInfo:(NSDictionary *)userInfo;
+
+/**
+ * 本地推送在前台推送。默认App在前台运行时不会进行弹窗，通过此接口可实现指定的推送弹窗。
+ * @param notification 本地推送对象
+ * @param userInfoKey 本地推送的标识Key
+ * @param userInfoValue 本地推送的标识Key对应的值
+ * @return none
+ */
++(void)localNotificationAtFrontEnd:(UILocalNotification *)notification userInfoKey:(NSString *)userInfoKey userInfoValue:(NSString *)userInfoValue;
+
+/**
+ * 删除本地推送，方法1
+ * @param userInfoKey 本地推送的标识Key
+ * @param userInfoValue 本地推送的标识Key对应的值
+ * @return none
+ */
++(void)delLocalNotification:(NSString *)userInfoKey userInfoValue:(NSString *)userInfoValue;
+
+/**
+ * 删除本地推送，方法2
+ * @param myUILocalNotification 本地推送对象
+ * @return none
+ */
++(void)delLocalNotification:(UILocalNotification *)myUILocalNotification;
+
+/**
+ * 清除所有本地推送对象
+ * @param none
+ * @return none
+ */
++(void)clearLocalNotifications;
+
+@end

src/ios/2.4.0/XGSetting.h

@@ -0,0 +1,17 @@
+//
+//  XGSetting.h
+//  XG-SDK
+//
+//  Created by xiangchen on 29/08/14.
+//  Copyright (c) 2014 mta. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface XGSetting : NSObject
+
+@property (nonatomic,retain) NSString* Channel;
+@property (nonatomic,retain) NSString* GameServer;
+
++(id)getInstance;
+@end

src/ios/AppDelegate+CDVXGPush.h

@@ -0,0 +1,5 @@
+#import "AppDelegate.h"
+#import <Foundation/Foundation.h>
+
+@interface AppDelegate (CDVXGPush)
+@end

src/ios/AppDelegate+CDVXGPush.m

@@ -0,0 +1,13 @@
+#import "AppDelegate+CDVXGPush.h"
+
+@implementation AppDelegate (CDVXGPush)
+
+/**
+ * 追加推送事件
+ */
+- (void) application:(UIApplication*)application didReceiveRemoteNotification:(NSDictionary*)userInfo {
+  NSLog(@"[AppDelegate] receive remote notification");
+  [[NSNotificationCenter defaultCenter] postNotificationName: @"receivenotification" object:userInfo];
+}
+
+@end

src/ios/CDVRegisterNotification.h

@@ -0,0 +1,9 @@
+#import <Foundation/Foundation.h>
+
+@interface CDVRegisterNotification : NSObject
+
++ (void) registerPush;
++ (void) registerPushForIOS8;
++ (void) registerNotification;
+
+@end