Merge pull request #651 from jpush/dev

同步Android-JPush3.3.4&&iOS-JPush3.2.2

Author: wicked-tc130

.gitignore

@@ -204,3 +204,5 @@ package-lock.json
 yarn.lock
 *.qshell
 *.DS_Store
+
+*.gitattributes

README.md

@@ -1,131 +1,62 @@
-[![tag](https://img.shields.io/badge/tag-1.6.7-blue.svg)](https://github.com/jpush/jpush-react-native/releases)
-[![QQ Group](https://img.shields.io/badge/QQ%20Group-553406342-red.svg)]()
+# JPush-React-Native
 
-# JPush React Native Plugin
-
-[English Document](README_en.md)
-
-## 安装
+## 1. 安装
 
 ```
-npm install jpush-react-native jcore-react-native --save
+npm install jpush-react-native --save
 ```
 
-## 配置
-
-#### 1. iOS 手动操作部分 （3 个步骤）
-
-- 在 iOS 工程中设置 TARGETS-> BUILD Phases -> LinkBinary with Libraries 找到 UserNotifications.framework 把 status 设为 optional
-- 在 iOS 工程中如果找不到头文件可能要在 TARGETS-> BUILD SETTINGS -> Search Paths -> Header Search Paths 添加如下路径
+* 注意：如果项目里没有jcore-react-native，需要安装
 
 ```
-$(SRCROOT)/../node_modules/jpush-react-native/ios/RCTJPushModule
+npm install jcore-react-native --save
 ```
 
-- 在 xcode8 之后需要点开推送选项： TARGETS -> Capabilities -> Push Notification 设为 on 状态
+## 2. 配置
 
-#### 2. Android 手动操作部分 （3 个步骤）
+### 2.1 Android
 
-- 修改 app 下的 build.gradle 配置：
+* build.gradle
 
-  > your react native project/android/app/build.gradle
-
-  ```java
-  android {
+```
+android {
       defaultConfig {
-          applicationId "yourApplicationId"
+          applicationId "yourApplicationId"           //在此替换你的应用包名
           ...
           manifestPlaceholders = [
                   JPUSH_APPKEY: "yourAppKey",         //在此替换你的APPKey
-                  JPUSH_CHANNEL: "developer-default"  //在此替换你的channel
+                  JPUSH_CHANNEL: "yourChannel"        //在此替换你的channel
           ]
       }
   }
-  ...
-  dependencies {
-      implementation fileTree(dir: "libs", include: ["*.jar"])
+```
+
+```
+dependencies {
+      ...
       implementation project(':jpush-react-native')  // 添加 jpush 依赖
       implementation project(':jcore-react-native')  // 添加 jcore 依赖
-      implementation "com.facebook.react:react-native:+"  // From node_modules
   }
-  ```
-  同时在AndridManifest.xml中添加如下代码
-  ```
-        <meta-data
-            android:name="JPUSH_CHANNEL"
-            android:value="${JPUSH_CHANNEL}" />
-        <meta-data
-            android:name="JPUSH_APPKEY"
-            android:value="${JPUSH_APPKEY}" />
-  ```
+```
+
+* AndridManifest.xml
+
+```
+<meta-data
+	android:name="JPUSH_CHANNEL"
+  android:value="${JPUSH_CHANNEL}" />
+<meta-data
+  android:name="JPUSH_APPKEY"
+  android:value="${JPUSH_APPKEY}" />
+```
 
-- 修改setting.gradle配置：
+* setting.gradle
 
-  ```java
-  include ':jpush-react-native'
+```
+include ':jpush-react-native'
   project(':jpush-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/jpush-react-native/android')
   include ':jcore-react-native'
   project(':jcore-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/jcore-react-native/android')
-  ```
-
-  **操作完成后点击AndroidStudio的构建**
-
-- 在Application中添加JPush
-
-  ```java
-  public class MainApplication extends Application implements ReactApplication {
-  
-    private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
-      @Override
-      public boolean getUseDeveloperSupport() {
-        return BuildConfig.DEBUG;
-      }
-  
-      @Override
-      protected List<ReactPackage> getPackages() {
-        @SuppressWarnings("UnnecessaryLocalVariable")
-        List<ReactPackage> packages = new PackageList(this).getPackages();
-        //建议在调试期间将参数都设置为true，便于调试
-        packages.add(new JPushPackage(true,true));
-        return packages;
-      }
-  
-      @Override
-      protected String getJSMainModuleName() {
-        return "index";
-      }
-    };
-    
-     @Override
-    	public void onCreate() {
-      	super.onCreate();
-      	SoLoader.init(this, /* native exopackage */ false);
-  			//强烈建议在Application初始化时调用原生接口的init方法
-      	JPushInterface.init(this);
-    	}
-  }  
-  ```
-
-  
-
-### API
-
-**Android v1.6.6 版本后新增 notifyJSDidLoad，请务必在接收事件之前调用此方法。**
-
-- [API](documents/api_en.md)
-
-### 关于点击通知跳转到指定界面
-
-- Android v1.6.7 新增 API `jumpToPushActivity`，使用参考 [demo](example/App.js#L113)
-
-## [常见问题](./documents/common_problems.md)
-
-------
-
-## 贡献者列表
-
-- [bang88](https://github.com/bang88)
-- [pampang](https://github.com/pampang)
-- [huhuanming](https://github.com/huhuanming)
-- [arniu](https://github.com/arniu)
+```
 
+###2.2 iOS

README_en.md

@@ -6,28 +6,16 @@ def safeExtGet(prop, fallback) {
 
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', 27)
-    buildToolsVersion safeExtGet('buildToolsVersion', '26.0.2')
-
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 16)
         targetSdkVersion safeExtGet('targetSdkVersion', 27)
         versionCode 1
         versionName "1.0"
-    }
-    lintOptions {
-        abortOnError false
-        warning 'InvalidPackage'
-    }
-    sourceSets.main {
-        jniLibs.srcDirs = ['libs']
-    }
-}
 
-repositories {
-    mavenCentral()
+    }
 }
 
 dependencies {
-    api fileTree(include: ['*.jar'], dir: 'libs')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.facebook.react:react-native:+'
 }