fix issue oney#51

wangdaliu · Aug 25, 2016 · 4c1faae · 4c1faae
1 parent f4bd872
commit 4c1faae
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -15,9 +15,18 @@ android {
     }
 }
 
+allprojects {
+    repositories {
+        maven {
+            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+            url "../../../node_modules/react-native/android"
+        }
+    }
+}
+
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.facebook.react:react-native:0.17.+'
+    compile 'com.facebook.react:react-native:+'
     compile 'com.google.android.gms:play-services-gcm:8.1.0'
     compile 'com.android.support:appcompat-v7:23.0.0'
     compile project(':react-native-system-notification')

diff --git a/android/src/main/java/com/oney/gcm/BackgroundService.java b/android/src/main/java/com/oney/gcm/BackgroundService.java
@@ -44,8 +44,8 @@ public int onStartCommand(Intent intent, int flags, int startId) {
     public void onDestroy() {
         Log.d(TAG, "onDestroy");
         super.onDestroy();
-        mReactInstanceManager.onPause();
-        mReactInstanceManager.onDestroy();
+        mReactInstanceManager.onHostPause();
+        mReactInstanceManager.destroy();
         mReactInstanceManager = null;
     }
 

diff --git a/android/src/main/java/com/oney/gcm/MainReactPackage.java b/android/src/main/java/com/oney/gcm/MainReactPackage.java
@@ -25,7 +25,7 @@
 import com.facebook.react.views.swiperefresh.SwipeRefreshLayoutManager;
 import com.facebook.react.views.switchview.ReactSwitchManager;
 import com.facebook.react.views.text.ReactRawTextManager;
-import com.facebook.react.views.text.ReactTextInlineImageViewManager;
+//import com.facebook.react.views.text.ReactTextInlineImageViewManager;
 import com.facebook.react.views.text.ReactTextViewManager;
 import com.facebook.react.views.text.ReactVirtualTextViewManager;
 import com.facebook.react.views.textinput.ReactTextInputManager;
@@ -74,7 +74,7 @@ public List<ViewManager> createViewManagers(ReactApplicationContext reactContext
                 new ReactToolbarManager(),
                 new ReactViewManager(),
                 new ReactViewPagerManager(),
-                new ReactTextInlineImageViewManager(),
+//                new ReactTextInlineImageViewManager(),
                 new ReactVirtualTextViewManager(),
                 new SwipeRefreshLayoutManager(),
                 new ReactWebViewManager());

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-gcm-android",
-  "version": "0.1.9",
+  "version": "0.2.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/oney/react-native-gcm-android.git"