Merge pull request #360 from jpush/dev

Dev

Author: huangminlinux

JPushConfiguration.js

@@ -51,24 +51,13 @@ function insertJpushCode(path) {
 	var rf = fs.readFileSync(path, "utf-8");
 	var searchDidlaunch = rf.match(/\n.*didFinishLaunchingWithOptions.*\n?\{/);
 	if (searchDidlaunch == null) {
-		console.log("没有匹配到 didFinishLaunchingWithOptions");
+		console.log("没有匹配到 didFinishLaunchingWithOptions,将自动插入改方法");
 		console.log(rf);
 	} else {
 		// console.log(searchDidlaunch[0]);
 		var oldValue = rf.match(/\[JPUSHService registerForRemoteNotificationTypes/)
 		if (oldValue == null) {
-			rf = rf.replace(searchDidlaunch[0], searchDidlaunch[0] + "\n    if \(\[\[UIDevice currentDevice\]\.systemVersion floatValue\] >= 10.0\) \{\n \#ifdef NSFoundationVersionNumber_iOS_9_x_Max\n    JPUSHRegisterEntity \* entity \= \[\[JPUSHRegisterEntity alloc\] init\]\;\n     entity\.types \= UNAuthorizationOptionAlert\|UNAuthorizationOptionBadge\|UNAuthorizationOptionSound\;\n     \[JPUSHService registerForRemoteNotificationConfig\:entity delegate\:self\]\;\n \n\#endif\n\} else if \(\[\[UIDevice currentDevice\]\.systemVersion floatValue\] \>\= 8\.0\) \{\n\
-    \[JPUSHService registerForRemoteNotificationTypes\:\(UIUserNotificationTypeBadge \|\n\
-                                                      UIUserNotificationTypeSound \|\n\
-                                                      UIUserNotificationTypeAlert\)\n\
-                                          categories\:nil\]\;\n\
-  \} else \{\n\
-    \[JPUSHService registerForRemoteNotificationTypes\:\(UIRemoteNotificationTypeBadge \|\n\
-                                                      UIRemoteNotificationTypeSound \|\n\
-                                                      UIRemoteNotificationTypeAlert)\n\
-                                          categories\:nil\]\;\n\
-  }\n\
-  \n\
+			rf = rf.replace(searchDidlaunch[0], searchDidlaunch[0] + "\nJPUSHRegisterEntity \* entity \= \[\[JPUSHRegisterEntity alloc\] init\]\;\n     entity\.types \= UNAuthorizationOptionAlert\|UNAuthorizationOptionBadge\|UNAuthorizationOptionSound\;\n     \[JPUSHService registerForRemoteNotificationConfig\:entity delegate\:self\]\;\n\
   \[JPUSHService setupWithOption\:launchOptions appKey\:\@\"" + appKey + "\"\n\
                         channel\:nil apsForProduction\:nil\]\;");
 			fs.writeFileSync(path, rf, "utf-8");
@@ -82,7 +71,7 @@ function insertJpushCode(path) {
 	var search = rf.match(/\n.*didRegisterForRemoteNotificationsWithDeviceToken\:\(NSData \*\)deviceToken[ ]*\{/);
 
 	if (search == null) {
-		console.log("没有匹配到 函数 didRegisterForRemoteNotificationsWithDeviceToken");
+		console.log("没有匹配到 函数 didRegisterForRemoteNotificationsWithDeviceToken,将自动插入改方法");
 		rf = rf.replace(/\@end/, "\- \(void\)application\:\(UIApplication \*\)application\ didRegisterForRemoteNotificationsWithDeviceToken\:\(NSData \*\)deviceToken \{\n\[JPUSHService registerDeviceToken:deviceToken\]\;\n\}\n\@end");
 		// console.log(rf);
 		fs.writeFileSync(path, rf, "utf-8");
@@ -102,7 +91,7 @@ function insertJpushCode(path) {
 	var rf = fs.readFileSync(path, "utf-8");
 	var search = rf.match(/\n.*didReceiveRemoteNotification\:\(NSDictionary \*\)userInfo[ ]*\{/);
 	if (search == null) {
-		console.log("没有匹配到 函数 didReceiveRemoteNotification");
+		console.log("没有匹配到 函数 didReceiveRemoteNotification,将自动插入改方法");
 		rf = rf.replace(/\@end/, "\- \(void\)application\:\(UIApplication \*\)application\ didReceiveRemoteNotification\:\(NSDictionary \*\)userInfo \{\n\[\[NSNotificationCenter\ defaultCenter\]\ postNotificationName\:kJPFDidReceiveRemoteNotification\ object\:userInfo\]\;\n\}\n\@end");
 		// console.log(rf);
 		fs.writeFileSync(path, rf, "utf-8");
@@ -112,7 +101,7 @@ function insertJpushCode(path) {
 	var rf = fs.readFileSync(path, "utf-8");
 	var search = rf.match(/\n.*didReceiveRemoteNotification\:[ ]*\(NSDictionary \*\)[ ]*userInfo[ ]*fetchCompletionHandler\:\(void[ ]*\(\^\)[ ]*\(UIBackgroundFetchResult\)\)completionHandler \{/);
 	if (search == null) {
-		console.log("没有匹配到 函数 didReceiveRemoteNotification fetchCompletionHandler");
+		console.log("没有匹配到 函数 didReceiveRemoteNotification fetchCompletionHandler,将自动插入改方法");
 		rf = rf.replace(/\@end/, "\- \(void\)application\:\(UIApplication \*\)application\ didReceiveRemoteNotification\:\(NSDictionary \*\)userInfo fetchCompletionHandler\:\(void\ \(\^\)   \(UIBackgroundFetchResult\)\)completionHandler\ \{\n\[\[NSNotificationCenter\ defaultCenter\]\ postNotificationName\:kJPFDidReceiveRemoteNotification\ object\:userInfo\]\;\n\}\n\@end");
 		// console.log(rf);
 		fs.writeFileSync(path, rf, "utf-8");
@@ -122,21 +111,28 @@ function insertJpushCode(path) {
 	var rf = fs.readFileSync(path, "utf-8");
 	var search = rf.match(/\n.*willPresentNotification\:\(UNNotification \*\)notification[ ]*withCompletionHandler\:.*\{\n/);
 	if (search == null) {
-		console.log("没有匹配到 函数 willPresentNotification");
-		rf = rf.replace(/\@end/, "\- \(void\)jpushNotificationCenter\:\(UNUserNotificationCenter\ \*\)center willPresentNotification\:\(UNNotification\ \*\)notification\ withCompletionHandler\:\(void\ \(\^\)\(NSInteger\)\)completionHandler\ \{\n NSDictionary\ \* userInfo\ \=\ notification\.request\.content\.userInfo\;\n if\(\[notification\.request\.trigger\ isKindOfClass\:\[UNPushNotificationTrigger\ class\]\]\)\ \{\n \[JPUSHService\ handleRemoteNotification\:userInfo\]\;\n \[\[NSNotificationCenter\ defaultCenter\]\ postNotificationName\:kJPFDidReceiveRemoteNotification\ object\:userInfo\]\;\n \ \ \ \}\n completionHandler\(UNNotificationPresentationOptionAlert\)\;\n\}\n\@end");
-		// console.log(rf);
+		console.log("没有匹配到 函数 willPresentNotification,将自动插入改方法");
+		rf = rf.replace(/\@end/, "\- \(void\)jpushNotificationCenter\:\(UNUserNotificationCenter\ \*\)center willPresentNotification\:\(UNNotification\ \*\)notification\ withCompletionHandler\:\(void\ \(\^\)\(NSInteger\)\)completionHandler\ \{\n NSDictionary\ \* userInfo\ \=\ notification\.request\.content\.userInfo\;\n  \[JPUSHService\ handleRemoteNotification\:userInfo\]\;\n \[\[NSNotificationCenter\ defaultCenter\]\ postNotificationName\:kJPFDidReceiveRemoteNotification\ object\:userInfo\]\;\n \ \ \ \n completionHandler\(UNNotificationPresentationOptionAlert\)\;\n\}\n\@end");
 		fs.writeFileSync(path, rf, "utf-8");
 	}
 
 	// 这里插入 didReceiveNotificationResponse
 	var rf = fs.readFileSync(path, "utf-8");
 	var search = rf.match(/\n.*jpushNotificationCenter\:\(UNUserNotificationCenter \*\)center[ ]*didReceiveNotificationResponse\:\(UNNotificationResponse\ \*\)response.*\{\n/);
 	if (search == null) {
-		console.log("没有匹配到 函数 didReceiveRemoteNotification");
-		rf = rf.replace(/\@end/, "\- \(void\)jpushNotificationCenter\:\(UNUserNotificationCenter\ \*\)center\ didReceiveNotificationResponse\:\(UNNotificationResponse\ \*\)response\ withCompletionHandler\:\(void\ \(\^\)\(\)\)completionHandler\ \{\nNSDictionary\ \*\ userInfo\ \=\ response\.notification\.request\.content\.userInfo\;\nif\(\[response\.notification\.request\.trigger\ isKindOfClass\:\[UNPushNotificationTrigger\ class\]\]\)\ \{\n\[JPUSHService\ handleRemoteNotification\:userInfo\]\;\n\[\[NSNotificationCenter\ defaultCenter\]\ postNotificationName\:kJPFOpenNotification\ object:userInfo\]\;\n\}\ncompletionHandler\(\)\;\n\}\n\@end");
+		console.log("没有匹配到 函数 didReceiveRemoteNotification,将自动插入改方法");
+		rf = rf.replace(/\@end/, "\- \(void\)jpushNotificationCenter\:\(UNUserNotificationCenter\ \*\)center\ didReceiveNotificationResponse\:\(UNNotificationResponse\ \*\)response\ withCompletionHandler\:\(void\ \(\^\)\(\)\)completionHandler\ \{\nNSDictionary\ \*\ userInfo\ \=\ response\.notification\.request\.content\.userInfo\;\n\[JPUSHService\ handleRemoteNotification\:userInfo\]\;\n\[\[NSNotificationCenter\ defaultCenter\]\ postNotificationName\:kJPFOpenNotification\ object:userInfo\]\;\n\ncompletionHandler\(\)\;\n\}\n\@end");
 		// console.log(rf);
 		fs.writeFileSync(path, rf, "utf-8");
 	}
+
+	var rf = fs.readFileSync(path, "utf-8");
+	var search = rf.match(/\n.*didReceiveLocalNotification\:\(UILocalNotification \*\)notification[ ]*\{/);
+		if (search == null) {
+			console.log("没有匹配到 函数 didReceiveLocalNotification,将自动插入改方法");
+			rf = rf.replace(/\@end/, "\- \(void\)application\:\(UIApplication \*\)application\ didReceiveLocalNotification\:\(UILocalNotification \*\)notification \{\n\[\[NSNotificationCenter\ defaultCenter\]\ postNotificationName\:kJPFDidReceiveRemoteNotification\ object\:notification.userInfo\]\;\n\}\n\@end");
+			fs.writeFileSync(path, rf, "utf-8");
+		}
 }
 
 

README.md

@@ -89,9 +89,14 @@ dependencies {
   v1.6.7 新增 API `jumpToPushActivity`，使用参考 [demo](./example/react-native-android/push_activity.js#L113) 
 
 
+
+
+## [常见问题](./example/documents/common_problems)
+
 ### [关于更新 RN](https://github.com/jpush/jpush-react-native/blob/master/example/documents/Update%20React%20Native.md)
 
 ---
 贡献者列表
 - [bang88](https://github.com/bang88)
 - [pampang](https://github.com/pampang)
+- [huhuanming](https://github.com/huhuanming)

android/src/main/java/cn/jpush/reactnativejpush/JPushModule.java

@@ -8,8 +8,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.text.TextUtils;
-import android.widget.Toast;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
@@ -23,8 +21,9 @@
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 
+import org.json.JSONObject;
+
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -36,7 +35,7 @@
 import cn.jpush.android.api.CustomPushNotificationBuilder;
 import cn.jpush.android.api.JPushInterface;
 import cn.jpush.android.api.JPushMessage;
-import cn.jpush.android.api.TagAliasCallback;
+import cn.jpush.android.data.JPushLocalNotification;
 import cn.jpush.android.service.JPushMessageReceiver;
 
 public class JPushModule extends ReactContextBaseJavaModule {
@@ -454,6 +453,31 @@ public void setSilenceTime(ReadableMap map) {
         }
     }
 
+    @ReactMethod
+    public void sendLocalNotification(ReadableMap map) {
+        try {
+            JPushLocalNotification ln = new JPushLocalNotification();
+            ln.setBuilderId(map.getInt("buildId"));
+            ln.setNotificationId(map.getInt("id"));
+            ln.setTitle(map.getString("title"));
+            ln.setContent(map.getString("content"));
+            ReadableMap extra = map.getMap("extra");
+            JSONObject json = new JSONObject();
+            while (extra.keySetIterator().hasNextKey()) {
+                String key = extra.keySetIterator().nextKey();
+                json.put(key, extra.getString(key));
+            }
+            ln.setExtras(json.toString());
+            if (map.hasKey("fireTime")) {
+                long date = (long) map.getDouble("fireTime");
+                ln.setBroadcastTime(date);
+            }
+            JPushInterface.addLocalNotification(getReactApplicationContext(), ln);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     /**
      * 接收自定义消息,通知,通知点击事件等事件的广播
      * 文档链接:http://docs.jiguang.cn/client/android_api/

example/documents/Common.md

@@ -2,19 +2,19 @@
 
 Common API for Android and iOS.
 
-- setTags(array, successCallback, failedCallback)
+- setTags(array, successCallback,)
 
 - getRegistrationID(callback)
 
-- setAlias(alias, successCallback, failedCallback)
+- setAlias(alias, successCallback)
 
 Note: In Android, you must call initPush first, iOS doesn't need.
 
-
-
 **收到打开通知事件**
 
-- addOpenNotificationListener(callback)
+**NOTE: **iOS 在 [email protected] 以上版本才提供该方法
+
+- addReceiveOpenNotificationListener(callback)  
 
 
 ```
@@ -25,13 +25,14 @@ JPushModule.addReceiveOpenNotificationListener((map) => {
     });
 ```
 
-- removeOpenNotificationListener(event)
-
+- removeReceiveOpenNotificationListener(event)  
 
 
 **收到通知事件**
 
-- addReceiveNotificationListener(callback)
+**NOTE: **iOS 在 [email protected] 以上版本才提供该方法
+
+- addReceiveNotificationListener(callback) 
 
 
 ```
@@ -43,14 +44,16 @@ JPushModule.addReceiveNotificationListener((map) => {
 });
 ```
 
-- removeReceiveNotificationListener(event)
+- removeReceiveNotificationListener(event)  
 
 
 
 
 **接收自定义消息**(Add this listener to receive custom message.)
 
-- addReceiveCustomMsgListener(callback)
+**NOTE: **iOS 在 [email protected] 以上版本才提供该方法
+
+- addReceiveCustomMsgListener(callback)  
 
 
 - removeReceiveCustomMsgListener(event)

example/documents/common_problems.md

@@ -0,0 +1,112 @@
+## 常见问题
+
+- [事件的解析](#事件的解析)
+- [页面跳转](#页面跳转)
+- [编译报错](#编译报错)
+- [iOS 收不到推送](#iOS收不到推送)
+- [iOS 应用角标 Badge](#iOS应用角标Badge)
+- [其他](#其他)
+
+
+
+### 事件的解析
+
+插件提供几种事件，这里对常见误区进行解释：
+
+#### iOS：
+
+iOS 插件在 2.0.0+ 版本才提供 add********Listener 的方法，如果使用该接口，建议升级到最新版本。
+
+- 收到推送并且点击推送：
+
+  - 应用没有启动情况：走 `JPushModule.addOpenNotificationLaunchAppListener` 的回调
+
+  - 应用已经启动但是应用在前台：
+
+    - iOS 10 及以上的系统：走 `JPushModule.addReceiveOpenNotificationListener` 的回调
+
+    - iOS 9 以下的系统：走 `JPushModule.addReceiveNotificationListener` 的回调
+- 在前台收到推送：走 `JPushModule.addReceiveNotificationListener` 的回调
+  - iOS 10 允许推送在前台展示，如果应用在前台且点击了推送，那么还会走 `JPushModule.addReceiveOpenNotificationListener` 回调。
+
+#### Android
+- 没有执行 addReceiveOpenNotificationListener 回调。
+
+解决方法： 在监听通知事件前，Android 加入了 `notifiyJSDidLoad` （1.6.6 版本后加入），务必在监听事件前先调用此方法。
+
+
+
+### 页面跳转
+
+#### iOS：
+
+应用可以在点击推送事件中直接在 reactJS 中做跳转。
+
+#### Android:
+
+可以在点击推送事件中直接在 JS 中做跳转。也可以跳转到原生界面。第二种情况可以[参考这篇文章的高级应用部分](http://www.jianshu.com/p/6721a0360af9)
+
+
+
+### 编译报错
+
+#### iOS：
+
+- 编译报 JCore 相关错误：检查 `jcore-react-native ` 安装了没，一般成功安装并且成功 link 后就能解决该问题。
+
+- 编译报 i386 错误：这种错误一般是使用 iphone5s 以下模拟器报的错误，如果使用模拟器建议使用 iphone 5s 以上的模拟器，整机编译不受印象。
+
+- 编译报 arm64 或者 x86_64 错误：一般是使用模拟器编译 release 导致的，通过真机编译就不会有这个问题，如果实在是想在模拟器上编译 release 可以参考该 [issue](https://github.com/jpush/jpush-react-native/issues/104)
+
+- 编译找不到头文件：在 iOS 工程中如果找不到头文件可能要在 TARGETS-> BUILD SETTINGS -> Search Paths -> Header Search Paths 添加如下路径
+
+  ```
+  $(SRCROOT)/../node_modules/jpush-react-native/ios/RCTJPushModule
+  ```
+
+
+#### Android
+
+- 编译时报错：找不到符号。
+
+解决方法：import 相关类。可手动导入，也可使用 Android Studio 打开项目，然后使用 option + enter 导入相关类。
+
+- 编译时报错：Multiple dex files define 
+
+解决方法：可手动删除 jpush , jcore 下的 build 文件夹，然后重新编译。也可以使用 AS 打开项目，然后选择菜单：Build -> Rebuild Project
+
+
+
+### iOS 收不到推送
+
+- 确保是在真机上测试，而不是在模拟器
+- 自己的应用已经在 Apple developer 给应用配置推送功能，创建推送证书 （并且保证 bundle id 与  Apple developer 上的是一致的）如果之前没有接触过推送证书建议看视频来 👉  [官方集成视频](https://community.jiguang.cn/t/jpush-ios-sdk/4247)
+- 能够获取 deviceToken 但是收不到推送， 如果是使用 xcode 8，检查  (Project -> Target -> Capabilities ) Push Notification 选项是否已经点开，如果没有需要点开
+
+
+
+
+### iOS 应用角标 Badge
+
+有两种方式变变应用角标
+
+- 通过服务器下发，服务端 payload 有一个字段 badge 用于设置应用角标，如果客户端收到该条推送应用角标会被设为 badge ，如果想实现应用收到推送 badge 自动 +1 可以让服务端推送时将 badge 设为 "+1"。
+
+- 调用 setBadge 接口也可以改变应用角标，该 api 会设置本地应用的 badge 并且同步极光服务器的 badge 值（收到推送自动加一会依赖于极光服务器的 badge 值）。
+
+推送事件回调参数中，有一个 badge 值，该值就是服务器下发的 badge 值。
+
+
+
+### 其他
+
+#### RegistrationID 相关
+
+建议参考这篇博文 [RegistrationID](https://community.jiguang.cn/t/registrationid/3810)
+
+#### 取消弹出 Toast 信息。
+
+解决方法：在加入 JPushPackage 时，将第一个参数设置为 true 即可。第二个参数设置为 true 将不会打印 debug 日志。
+
+
+

example/documents/iOS_API.md

@@ -50,6 +50,8 @@ All apis can find in jpush-react-native/index.js.
   ```
 
 ## 事件
+**NOTE: **iOS 在 [email protected] 以上版本才提供该方法
+
 **点击推送启动应用事件**
 
 - addOpenNotificationLaunchAppListener(Function) 
@@ -69,6 +71,8 @@ All apis can find in jpush-react-native/index.js.
 
 **登录事件**
 
+**NOTE: **iOS 在 jpush-react-native@2.0.0 以上版本才提供该方法
+
 
 - addnetworkDidLoginListener(Function)
 

example/ios/PushDemo/AppDelegate.m

@@ -52,6 +52,9 @@ - (void)application:(UIApplication *)application didRegisterForRemoteNotificatio
 - (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo {
   [[NSNotificationCenter defaultCenter] postNotificationName:kJPFDidReceiveRemoteNotification object:userInfo];
 }
+- (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification {
+  [[NSNotificationCenter defaultCenter] postNotificationName:kJPFDidReceiveRemoteNotification object: notification.userInfo];
+}
 - (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)   (UIBackgroundFetchResult))completionHandler {
   [[NSNotificationCenter defaultCenter] postNotificationName:kJPFDidReceiveRemoteNotification object:userInfo];
 }

example/react-native-iOS/localPush_activity.js

@@ -44,8 +44,26 @@ var LocalPushActivity = React.createClass({
   },
 
   	addLocationNotification() {
-  		JPushModule.setLocalNotification(this.state.date.getTime(), this.state.textContain, 5, 'dfsa', 'dfaas', null, null);
-
+		// setLocalNotification 和 sendLocalNotification 都可以触发本地推送，推荐使用 sendLocalNotification 方法。
+		var cdate = new Date()
+		JPushModule.sendLocalNotification(
+			{
+				id:5,
+				title:'haha',
+				content:'content',
+				extra:{haha:'haha',lala:'lala'},
+				fireTime: cdate.getTime() + 3000,
+				badge: 8,
+				sound: 'fasdfa',
+				subtitle: "subtitle",
+				title: 'title'
+			}
+		)
+
+		// JPushModule.setLocalNotification(this.state.date.getTime(), this.state.textContain, 5, 'dfsa', 'dfaas', null, null);
+
+		
+		
   	},
 
     render() {