fix conflict

Author: KenChoi

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/documents/APIs.md

@@ -108,15 +108,14 @@ reset  tags.
   - **extra** : Object                // local notification extra (key-value)
   - **fireTime** : Number       // show local notification time（ms）
   - **badge** : Number           // when local notification fire, application icon will set badge with this value  （iOS Only）
-  - **soundName** : String     // if you what to custom notification sound ,you should specify audio file name （iOS Only）
+  - **sound** : String     // if you what to custom notification sound ,you should specify audio file name （iOS Only）
   - **subtitle** : String              // set local notification subtitle  （iOS10+ Only）
 
   ```javascript
   var currentDate = new Date()
   JPushModule.sendLocalNotification(
       {
           id:5,
-          title:'haha',
           content:'content',
           extra:{key1:'value1',key2:'value2'},
           fireTime: currentDate.getTime() + 3000,
@@ -197,19 +196,15 @@ All apis can find in jpush-react-native/index.js.
 set application's badge.
 
 ```js
-  JPushModule.setBadge(5, (success) => {
-    console.log(success)
-  });
+  JPushModule.setBadge(5, (success) => { } );
 ```
 
 #### getBadge
 
 get application's  badge.
 
 ```javascript
-  JPushModule.getBadge((badge) => {
-    console.log(badge)
-  });
+  JPushModule.getBadge( (badge) => { } );
 ```
 
 #### setLocalNotification
@@ -250,13 +245,13 @@ setLocalNotification(  Date,    		// date  local notification fire data
   JPushModule.addOpenNotificationLaunchAppListener(callback)
   ```
 
-- removeOpenNotificationLaunchAppListener(function)
+- removeOpenNotificationLaunchAppEventListener(function)
 
   ```javascript
-  JPushModule.removeOpenNotificationLaunchAppListener(callback)
+  JPushModule.removeOpenNotificationLaunchAppEventListener(callback)
   ```
 
-  remove listener：application not running and tap notification to run application，`removeOpenNotificationLaunchAppListener` and `addOpenNotificationLaunchAppListener` used in pairs.
+  remove listener：application not running and tap notification to run application，`removeOpenNotificationLaunchAppEventListener` and `addOpenNotificationLaunchAppListener` used in pairs.
 
 **Network Did Login Event**
 

example/documents/APIs_zh.md

@@ -12,6 +12,7 @@
   - [接收推送事件](#接收推送事件)
   - [接收自定义消息事件](#接收自定义消息事件)
 - [iOS Only API](#ios-only-api)
+  - [setupPush](#setuppush)
   - [setBadge](#setbadge)
   - [getBadge](#getbadge)
   - [setLocalNotification](#setlocalnotification)
@@ -133,21 +134,26 @@ Android 和 iOS 通用 API。
 - sendLocalNotification(notification)
 
   - **buildId** : Number         // 设置通知样式，1 为基础样式，2 为自定义样式。自定义样式需要先调用 setStyleCustom 接口设置自定义样式。(Android Only)
+<<<<<<< HEAD
    - **id** : Number           	// 通知的 id, 可用于取消通知
     - **title** : String         // 通知标题
    - **content** : String          // 通知内容
+=======
+     - **id** : Number           // 通知的 id, 可用于取消通知
+  - **title** : String         // 通知标题
+  - **content** : String          // 通知内容
+>>>>>>> 57b24382bb295d08dbb0f1275ebfc3880fe2d9b9
   - **extra** : Object                // extra 字段
   - **fireTime** : Number       // 通知触发时间的时间戳（毫秒）
   - **badge** : Number           // 本地推送触发后应用角标的 badge 值  （iOS Only）
-  - **soundName** : String     // 指定推送的音频文件 （iOS Only）
+  - **sound** : String     // 指定推送的音频文件 （iOS Only）
   - **subtitle** : String              // 子标题 （iOS10+ Only）
 
   ```javascript
   var currentDate = new Date()
   JPushModule.sendLocalNotification(
       {
           id:5,
-          title:'haha',
           content:'content',
           extra:{key1:'value1',key2:'value2'},
           fireTime: currentDate.getTime() + 3000,
@@ -214,31 +220,38 @@ Android 和 iOS 通用 API。
 - removeReceiveCustomMsgListener(function)
 
   ```
-  JPushModule.removeReceiveCustomMsgListener(callback);​
+  JPushModule.removeReceiveCustomMsgListener(callback);
   ```
 
 
 
 ### iOS Only API
 
+#### setupPush
+
+调用这个接口会向系统注册推送功能（会弹出推送权限请求），注意使用自动配置会自动在 `AppDeletate.m` 插入注册代码如下，如果不希望在应用启动的时候就向用户申请权限可以删掉这部分代码。
+
+```objective-c
+// AppDelegate.m 自动插入的代码
+JPUSHRegisterEntity * entity = [[JPUSHRegisterEntity alloc] init];
+entity.types = UNAuthorizationOptionAlert|UNAuthorizationOptionBadge|UNAuthorizationOptionSound;
+[JPUSHService registerForRemoteNotificationConfig:entity delegate:self];
+```
+
 #### setBadge
 
 设置应用 badge 值，该方法还会同步 JPush 服务器的的 badge 值，JPush 服务器的 badge 值用于推送 badge 自动 +1 时会用到。
 
 ```js
-  JPushModule.setBadge(5, (success) => {
-    console.log(success)
-  });
+  JPushModule.setBadge(5, (success) => {} );
 ```
 
 #### getBadge
 
 获取应用 badge 值。
 
 ```javascript
-  JPushModule.getBadge((badge) => {
-    console.log(badge)
-  });
+  JPushModule.getBadge((badge) => { } );
 ```
 
 #### setLocalNotification
@@ -279,21 +292,21 @@ setLocalNotification(  Date,    		// date  触发本地推送的时间
   JPushModule.addOpenNotificationLaunchAppListener(callback)
   ```
 
-- removeOpenNotificationLaunchAppListener(function)
+- removeOpenNotificationLaunchAppEventListener(function)
 
   ```javascript
-  JPushModule.removeOpenNotificationLaunchAppListener(callback)
+  JPushModule.removeOpenNotificationLaunchAppEventListener(callback)
   ```
 
-  取消监听：`removeOpenNotificationLaunchAppListener`  取消事件回调，和`addOpenNotificationLaunchAppListener` 方法成对使用。
+  取消监听：`removeOpenNotificationLaunchAppEventListener`  取消事件回调，和`addOpenNotificationLaunchAppListener` 方法成对使用。
 
 **Network Did Login Event**
 
 **NOTE**:  iOS 需要安装到 [email protected]+ 。
 
 - addnetworkDidLoginListener(function)
 
-  添加回调：添加网络已经等了事件回调 ，`setTag` 和 `setAlias` 需要在网络已经登录成功后调用才会有效 。
+  添加回调：添加网络已登录事件回调 ，`setTag` 和 `setAlias` 需要在网络已经登录成功后调用才会有效 。
 
   ```javascript
   var callback = () => {

example/documents/common_problems.md

@@ -3,8 +3,8 @@
 - [事件的解析](#事件的解析)
 - [页面跳转](#页面跳转)
 - [编译报错](#编译报错)
-- [iOS 收不到推送](#iOS 收不到推送)
-- [iOS 应用角标 Badge](#iOS 应用角标 Badge)
+- [iOS 收不到推送](#iOS收不到推送)
+- [iOS 应用角标 Badge](#iOS应用角标Badge)
 - [其他](#其他)
 
 

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);