Merge pull request #432 from jpush/dev

Dev

Author: huangminlinux

JPushRN.podspec

@@ -0,0 +1,24 @@
+require 'json'
+pjson = JSON.parse(File.read('package.json'))
+
+Pod::Spec.new do |s|
+
+  s.name            = "JPushRN"
+  s.version         = pjson["version"]
+  s.homepage        = "https://github.com/jpush/jpush-react-native"
+  s.summary         = pjson["description"]
+  s.license         = pjson["license"]
+  s.author          = { "huminios" => "[email protected]" }
+  
+  s.ios.deployment_target = '7.0'
+
+  s.source          = { :git => "https://github.com/jpush/jpush-react-native", :tag => "#{s.version}" }
+  s.source_files    = 'ios/RCTJPushModule/*.{h,m}'
+  s.preserve_paths  = "*.js"
+  s.frameworks      = 'UIKit','CFNetwork','CoreFoundation','CoreTelephony','SystemConfiguration','CoreGraphics','Foundation','Security'
+  s.weak_frameworks = 'UserNotifications'
+  s.libraries       = 'z','resolv'
+  s.vendored_libraries = "ios/RCTJPushModule/*.a"
+
+  s.dependency 'React'
+end

README.md

@@ -14,7 +14,21 @@ npm install jpush-react-native --save
 npm install jcore-react-native --save ## jpush-react-native 1.4.2 版本以后需要同时安装 jcore-react-native
 
 ```
+##### （如果是原生应用集成 react-native）使用 CocoaPods 安装
+
+在 Podfile 中添加如下代码:
+
+```
+pod 'JPushRN', :path => '../node_modules/jpush-react-native'
+```
+终端执行如下指令:
+
+```
+pod install
+```
+
 ## 配置
+
 配置包括两个步骤，自动配置和手动操作。
 ### 1.自动配置部分（以下命令均在你的 React Native Project 目录下运行，自动配置后仍需手动配置一部分）
 
@@ -32,7 +46,7 @@ npm run configureJPush d4ee2375846bc30fa51334f5 app
 //执行自动配置脚本后再执行 link 操作
 react-native link
 ```
-自动配置操作会自动插入 Native 代码，这个部分用户无需关系具体细节，如果实在想了解加入代码的细节可以查看如下链接
+自动配置操作会自动插入 Native 代码（iOS 中使用 Appdelegate.m 文件名，如果修改了该文件名需要手动插入[代码](https://github.com/jpush/jpush-react-native/blob/master/example/documents/iOS_Usage.md)），这个部分用户无需关系具体细节，如果实在想了解加入代码的细节可以查看如下链接
 - [iOS 自动配置后自动添加的代码](https://github.com/jpush/jpush-react-native/blob/master/example/documents/iOS_Usage.md)
 
 ### 2.手动操作部分(自动配置后，部分操作需要手动修改) 

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

@@ -381,8 +381,7 @@ public void setStyleCustom() {
     @ReactMethod
     public void getRegistrationID(Callback callback) {
         try {
-            mContext = getCurrentActivity();
-            String id = JPushInterface.getRegistrationID(mContext);
+            String id = JPushInterface.getRegistrationID(getReactApplicationContext());
             if (id != null) {
                 callback.invoke(id);
             } else {

example/.babelrc

@@ -1,3 +1,3 @@
 {
-"presets": ["react-native"]
-}
+  "presets": ["react-native"]
+}

example/.flowconfig

@@ -12,42 +12,45 @@
 ; For RN Apps installed via npm, "Libraries" folder is inside
 ; "node_modules/react-native" but in the source repo it is in the root
 .*/Libraries/react-native/React.js
-.*/Libraries/react-native/ReactNative.js
+
+; Ignore polyfills
+.*/Libraries/polyfills/.*
+
+; Ignore metro
+.*/node_modules/metro/.*
 
 [include]
 
 [libs]
 node_modules/react-native/Libraries/react-native/react-native-interface.js
-node_modules/react-native/flow
-flow/
+node_modules/react-native/flow/
+node_modules/react-native/flow-github/
 
 [options]
-module.system=haste
+emoji=true
 
-experimental.strict_type_args=true
+module.system=haste
 
 munge_underscores=true
 
 module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
 
+module.file_ext=.js
+module.file_ext=.jsx
+module.file_ext=.json
+module.file_ext=.native.js
+
 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_type=$FlowFixMeProps
+suppress_type=$FlowFixMeState
+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
+suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 unsafe.enable_getters_and_setters=true
 
 [version]
-<<<<<<< ours
-^0.37.0
-=======
-^0.56.0
->>>>>>> theirs
+^0.61.0