Merge pull request #301 from jpush/dev

Dev

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

@@ -78,7 +78,6 @@ public void onCatalystInstanceDestroy() {
         mCachedBundle = null;
         if (null != sCacheMap) {
             sCacheMap.clear();
-            sCacheMap = null;
         }
     }
 

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

@@ -1,7 +1,6 @@
 package cn.jpush.reactnativejpush;
 
 import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
@@ -24,11 +23,6 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
         });
     }
 
-    @Override
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-        return Collections.emptyList();
-    }
-
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
         return Collections.emptyList();

example/.flowconfig

@@ -22,8 +22,6 @@ node_modules/react-native/flow
 flow/
 
 [options]
-emoji=true
-
 module.system=haste
 
 experimental.strict_type_args=true
@@ -36,11 +34,11 @@ suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-8]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-8]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-7]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-7]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 
 unsafe.enable_getters_and_setters=true
 
 [version]
-^0.38.0
+^0.37.0

example/.gitignore

@@ -22,13 +22,33 @@ DerivedData
 *.xcuserstate
 project.xcworkspace
 
-# Android/IJ
+# Android/IntelliJ
 #
+build/
 .idea
 .gradle
 local.properties
+*.iml
 
 # node.js
 #
 node_modules/
 npm-debug.log
+yarn-error.log
+
+# BUCK
+buck-out/
+\.buckd/
+android/app/libs
+*.keystore
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots

example/android/app/build.gradle

@@ -145,7 +145,7 @@ dependencies {
     compile project(':jpush-react-native')
     compile project(':jcore-react-native')
     compile "com.android.support:appcompat-v7:25.3.1"
-    compile "com.facebook.react:react-native:+"  // From node_modules
+    compile "com.facebook.react:react-native:0.47.1"  // From node_modules
 }
 
 // Run this once to be able to run the application with BUCK

example/app.json

@@ -0,0 +1,4 @@
+{
+  "name": "PushDemo",
+  "displayName": "PushDemo"
+}

example/package.json

@@ -9,8 +9,8 @@
   "dependencies": {
     "jcore-react-native": "^1.1.5",
     "jpush-react-native": "^1.7.1",
-    "react": "^15.4.0",
-    "react-native": "^0.41.2",
+    "react": "^16.0.0-alpha.12",
+    "react-native": "^0.47.1",
     "react-native-onesignal": "^3.0.4",
     "react-navigation": "^1.0.0-beta.11"
   },

example/react-native-iOS/push_activity.js

@@ -47,21 +47,12 @@ var PushActivity = React.createClass({
       this.props.navigator.push({ name:'LocalPushActivity' });
     },
     componentWillMount() {
-
-        // NativeAppEventEmitter.addListener('networkDidSetup', (token) => {
-        // this.setState({ connectStatus: '已连接' });
-        // });
-        // NativeAppEventEmitter.addListener('networkDidClose', (token) => {
-        // this.setState({ connectStatus: '连接已断开' });
-        // });
-        // NativeAppEventEmitter.addListener('networkDidRegister', (token) => {
-        // this.setState({ connectStatus: '已注册' });
-        // });
-        // NativeAppEventEmitter.addListener('networkDidLogin', (token) => {
-        // this.setState({ connectStatus: '已登陆' });
-        // });
         JPushModule.addnetworkDidLoginListener(() => {
           Alert.alert('连接已登录')
+
+          JPushModule.addTags(['dasffas'], (result)=> {
+            Alert.alert('addTags success:' + JSON.stringify(result))
+          })
         })
 
         JPushModule.addConnectionChangeListener((result) => {
@@ -71,11 +62,10 @@ var PushActivity = React.createClass({
             Alert.alert('网络已断开')
           }
         })
-        var subscription = NativeAppEventEmitter.addListener(
-                              'ReceiveNotification',
-                              (notification) => console.log(notification)
-                          );
 
+        JPushModule.addReceiveNotificationListener((notification) => {
+          Alert.alert(JSON.stringify(notification))
+        })
     },
     componentDidMount() {
 

ios/RCTJPushModule/RCTJPushModule.m

@@ -50,10 +50,20 @@ + (id)allocWithZone:(NSZone *)zone {
 
 - (id)init {
   self = [super init];
-
   NSNotificationCenter *defaultCenter = [NSNotificationCenter defaultCenter];
 
   [defaultCenter removeObserver:self];
+
+
+  [defaultCenter addObserver:self
+                    selector:@selector(networkConnecting:)
+                        name:kJPFNetworkIsConnectingNotification
+                      object:nil];
+
+  [defaultCenter addObserver:self
+                    selector:@selector(networkRegister:)
+                        name:kJPFNetworkDidRegisterNotification
+                      object:nil];
 
   [defaultCenter addObserver:self
                     selector:@selector(networkDidSetup:)
@@ -110,6 +120,12 @@ - (void)reactJSDidload {
     [[NSNotificationCenter defaultCenter] postNotificationName:kJPFOpenNotificationToLaunchApp object:[RCTJPushActionQueue sharedInstance].openedLocalNotification];
   }
 
+  if (_isJPushDidLogin) {
+    [[NSNotificationCenter defaultCenter] postNotificationName:kJPFNetworkDidLoginNotification object:nil];
+  } else {
+    [[NSNotificationCenter defaultCenter] postNotificationName:kJPFNetworkDidCloseNotification object:nil];
+  }
+
 }
 
 - (void)setBridge:(RCTBridge *)bridge {
@@ -144,22 +160,40 @@ - (void)openNotification:(NSNotification *)notification {
   [self.bridge.eventDispatcher sendAppEventWithName:@"openNotification" body:obj];
 }
 
+
+- (void)networkConnecting:(NSNotification *)notification {
+  _isJPushDidLogin = false;
+  [self.bridge.eventDispatcher sendAppEventWithName:@"connectionChange"
+                                               body:@(false)];
+}
+
+- (void)networkRegister:(NSNotification *)notification {
+  _isJPushDidLogin = false;
+  [self.bridge.eventDispatcher sendAppEventWithName:@"connectionChange"
+                                               body:@(false)];
+}
+
 - (void)networkDidSetup:(NSNotification *)notification {
+  _isJPushDidLogin = false;
   [self.bridge.eventDispatcher sendAppEventWithName:@"connectionChange"
                                                body:@(true)];
 }
 
 - (void)networkDidClose:(NSNotification *)notification {
+  _isJPushDidLogin = false;
   [self.bridge.eventDispatcher sendAppEventWithName:@"connectionChange"
-                                               body:@(true)];
+                                               body:@(false)];
 }
 
 
 - (void)networkDidLogin:(NSNotification *)notification {
   _isJPushDidLogin = YES;
   [[RCTJPushActionQueue sharedInstance] scheduleGetRidCallbacks];
+//  [self.bridge.eventDispatcher sendAppEventWithName:@"connectionChange"
+//                                               body:@(true)];
   [self.bridge.eventDispatcher sendAppEventWithName:@"networkDidLogin"
                                                body:nil];
+
 }
 
 - (void)networkDidReceiveMessage:(NSNotification *)notification {

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "jpush-react-native",
-	"version": "2.0.0",
+	"version": "2.0.1",
 	"description": "a jpush plugin for react native application",
 	"main": "index.js",
 	"scripts": {