udpate demo adapt to rn-50.3

Author: huangminlinux

example/.flowconfig

@@ -34,11 +34,20 @@ suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FixMe
 
+<<<<<<< ours
 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\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(5[0-6]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(5[0-6]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+>>>>>>> theirs
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 
 unsafe.enable_getters_and_setters=true
 
 [version]
+<<<<<<< ours
 ^0.37.0
+=======
+^0.56.0
+>>>>>>> theirs

example/index.ios.js

@@ -2,91 +2,28 @@
 
 
 import React from 'react';
-import ReactNative from 'react-native';
+import {
+	AppRegistry,
+} from 'react-native';
+
+import {
+	StackNavigator
+} from 'react-navigation';
 
 var PushActivity = require('./react-native-iOS/push_activity.js');
 var SetActivity = require('./react-native-iOS/set_activity');
 var LocalPushActivity = require('./react-native-iOS/localPush_activity');
 
-var {
-  Text,
-  TextInput,
-  View,
-  Navigator,
-  BackAndroid,
-  NativeModules,
-  StyleSheet,
-  AppRegistry
-} = ReactNative;
-
-var PushDemo = React.createClass({
-
-  configureScene(route) {
-      return Navigator.SceneConfigs.FloatFromRight;
+const PushDemo = StackNavigator({
+  Home: {
+    screen: PushActivity
   },
-
-  renderScene(router, navigator) {
-      var Component = null;
-      this._navigator = navigator;
-      switch(router.name) {
-        case "pushActivity":
-          Component = PushActivity;
-          break;
-        case "setActivity":
-          Component = SetActivity;
-          break;
-        case "LocalPushActivity":
-          Component = LocalPushActivity;
-          break;
-      }
-      return <Component navigator = { navigator } />
-  },
-
-  render() {
-    return (
-        <Navigator
-            initialRoute = { {name: 'pushActivity' }}
-            configureScene = { this.configureScene }
-            renderScene = { this.renderScene } />
-      );
-  }
-});
-
-
-var styles = StyleSheet.create({
-
-    // For the container View
-    parent: {
-        padding: 16
-    },
-
-    backBtnStyle: {
-      borderWidth: 1,
-      borderColor: '#3f80dc',
-      borderRadius: 5
-    },
-
-    backBtnText: {
-      textAlign: 'center',
-      fontSize: 25,
-      color: '#ffffff'
-    },
-    buttonStyle: {
-    marginTop: 15,
-    padding: 5,
-    borderWidth: 1,
-    borderColor: '#48bbec',
-    borderRadius: 8,
-    justifyContent:'center',
-    alignSelf:'stretch',
-    flexDirection: 'row',
-    backgroundColor:'#48bbec'
-
+  Setting: {
+    screen: SetActivity
   },
-  buttonText: {    
-    fontSize: 25,
-    color: '#ffffff',
+  LocalPush: {
+    screen: LocalPushActivity
   }
-});
+})
 
 AppRegistry.registerComponent('PushDemo', () => PushDemo);

example/ios/PushDemo.xcodeproj/project.pbxproj

@@ -31,7 +31,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 //  jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index.ios" fallbackResource:nil];
 
 //  jsCodeLocation = [NSURL URLWithString:@"http://192.168.8.185:8081/index.ios.bundle?platform=ios&dev=true"];
-  jsCodeLocation = [NSURL URLWithString:@"http://192.168.10.222:8081/index.ios.bundle?platform=ios&dev=true"];
+  jsCodeLocation = [NSURL URLWithString:@"http://192.168.9.251:8081/index.ios.bundle?platform=ios&dev=true"];
   RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation
                                                       moduleName:@"PushDemo"
                                                initialProperties:nil

example/ios/PushDemo/AppDelegate.m

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

example/ios/PushDemo/Images.xcassets/Contents.json

@@ -7,12 +7,12 @@
     "start": "node node_modules/react-native/local-cli/cli.js start"
   },
   "dependencies": {
-    "jcore-react-native": "^1.2.0",
-    "jpush-react-native": "^2.1.2",
-    "react": "^16.0.0-alpha.12",
-    "react-native": "^0.47.1",
+    "jcore-react-native": "^1.2.2",
+    "jpush-react-native": "^2.1.3",
+    "react": "^16.0.0",
+    "react-native": "^0.50.3",
     "react-native-onesignal": "^3.0.4",
-    "react-navigation": "^1.0.0-beta.11"
+    "react-navigation": "^1.0.0-beta.21"
   },
   "devDependencies": {
     "babel-core": "^6.23.1",

example/package.json

@@ -1,6 +1,6 @@
 'use strict'
 
-import React from 'react';
+import React, { Component } from 'react';
 import ReactNative from 'react-native';
 
 var PushActivity = require('./push_activity');
@@ -20,28 +20,22 @@ const {
 } = ReactNative;
 import JPushModule from 'jpush-react-native';
 
-var LocalPushActivity = React.createClass({
-	getDefaultProps: function () {
-    return {
-      date: new Date(),
-      timeZoneOffsetInHours: (-1) * (new Date()).getTimezoneOffset() / 60,
-
-    };
-  },
-
-    getInitialState: function() {
-      return {
-		      	     date: this.props.date,
-	timeZoneOffsetInHours: this.props.timeZoneOffsetInHours,
-			  textContain: '',
-			   butonTitle: '',
-     };
-    },
-     onDateChange: function(date) {
+export default class LocalPushActivity extends Component {
+	constructor(props) {
+		super(props);
+		this.state = {
+			date: new Date(),
+			timeZoneOffsetInHours: (-1) * (new Date()).getTimezoneOffset() / 60,
+			textContain: '',
+				butonTitle: '',
+		};	
+	  }
+	
+     onDateChange(dateTime) {
      	console.log('the date is change ');
      	console.log(date.toString);
-    this.setState({date: date});
-  },
+		this.setState({date: dateTime});
+	}
 
   	addLocationNotification() {
 		// setLocalNotification 和 sendLocalNotification 都可以触发本地推送，推荐使用 sendLocalNotification 方法。
@@ -64,7 +58,7 @@ var LocalPushActivity = React.createClass({
 
 
 
-  	},
+  	}
 
     render() {
     	return (
@@ -115,7 +109,7 @@ var LocalPushActivity = React.createClass({
     	)
     }
 
-})
+}
 
 var styles = StyleSheet.create({
 	parent: {

example/react-native-iOS/localPush_activity.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import React from 'react';
+import React, { Component } from 'react';
 import ReactNative from 'react-native';
 
 const {
@@ -18,36 +18,44 @@ const {
   Alert,
 } = ReactNative;
 
+
 import JPushModule from 'jpush-react-native';
+export default class PushActivity extends Component {
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      bg: '#ffffff',
+      regid: '',
+      connectStatus: '',
+      package: 'PackageName',
+      deviceId: 'DeviceId',
+   };
+
+   this.onInitPress = this.onInitPress.bind(this)
+  }
 
-var PushActivity = React.createClass({
-    
-    getInitialState: function() {
-      return {
-        bg: '#ffffff',
-        regid: '',
-        connectStatus: '',
-        package: 'PackageName',
-        deviceId: 'DeviceId',
-     };
-    },
     jumpSetActivity() {
-      this.props.navigator.push({ name:'setActivity' });
-    },
+      this.props.navigation.navigate('Setting')
+    }
+
     onInitPress() {
 
       console.log('on click init push ');
       JPushModule.getRegistrationID((registrationid) => {
         console.log(registrationid);
         this.setState({regid: registrationid});
       });
-    },
+    }
     onSetuplocalNotificationPress() {
       this.props.navigator.push({ name:'LocalPushActivity' });
-    },
+    }
+
     componentWillMount() {
 
         JPushModule.setupPush()  // if you add register notification in Appdelegate.m 有 don't need call this function
+        JPushModule.getBadge((badge) => {Alert.alert("badge", badge)})
         JPushModule.addnetworkDidLoginListener(() => {
           console.log('连接已登录')
           JPushModule.addTags(['dasffas'], (result)=> {
@@ -78,14 +86,14 @@ var PushActivity = React.createClass({
         // JPushModule.addReceiveNotificationListener((notification) => {
         //   Alert.alert(JSON.stringify(notification))
         // })
-    },
+    }
     componentDidMount() {
 
-    },
+    }
     componentWillUnmount() {
       DeviceEventEmitter.removeAllListeners();
       NativeAppEventEmitter.removeAllListeners();
-    },
+    }
     render() {
 
         return (
@@ -107,7 +115,7 @@ var PushActivity = React.createClass({
               underlayColor = '#0866d9'
               activeOpacity = { 0.5 }
               style = { styles.btnStyle }
-              onPress = { this.jumpSetActivity }>
+              onPress = { () => { this.props.navigation.navigate("Setting")} }>
               <Text style = { styles.btnTextStyle }>
                 设置
               </Text>
@@ -125,7 +133,7 @@ var PushActivity = React.createClass({
               underlayColor = '#e4083f'
               activeOpacity = { 0.5 }
               style = { styles.btnStyle }
-              onPress = { this.onSetuplocalNotificationPress }>
+              onPress = { () => {this.props.navigation.navigate("LocalPush")} }>
                 <Text style = { styles.btnTextStyle }>
                   local notification
                 </Text>
@@ -134,7 +142,7 @@ var PushActivity = React.createClass({
 
           )
     }
-});
+};
 
 var styles = StyleSheet.create({
   parent: {
@@ -165,7 +173,7 @@ var styles = StyleSheet.create({
     borderColor: '#48bbec',
     borderWidth: 1,
 
-  },
+  }
 });