diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index b5317f0..77d1752 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -9,7 +9,7 @@ android:icon="@mipmap/ic_launcher" android:theme="@style/AppTheme"> diff --git a/android/app/src/main/java/com/race604/zhihu/daily/MainActivity.java b/android/app/src/main/java/com/race604/zhihu/daily/MainActivity.java deleted file mode 100644 index ea8b93f..0000000 --- a/android/app/src/main/java/com/race604/zhihu/daily/MainActivity.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.race604.zhihu.daily; - -import android.app.Activity; -import android.os.Bundle; -import android.view.KeyEvent; - -import com.facebook.react.LifecycleState; -import com.facebook.react.ReactInstanceManager; -import com.facebook.react.ReactRootView; -import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler; -import com.facebook.react.shell.MainReactPackage; -import com.race604.react.view.CustomReactPackage; -import com.rctzhihudaily.BuildConfig; - -public class MainActivity extends Activity implements DefaultHardwareBackBtnHandler { - - private ReactInstanceManager mReactInstanceManager; - private ReactRootView mReactRootView; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - mReactRootView = new ReactRootView(this); - - mReactInstanceManager = ReactInstanceManager.builder() - .setApplication(getApplication()) - .setBundleAssetName("index.android.bundle") - .setJSMainModuleName("index.android") - .addPackage(new MainReactPackage()) - .addPackage(new CustomReactPackage()) - .setUseDeveloperSupport(BuildConfig.DEBUG) - .setInitialLifecycleState(LifecycleState.RESUMED) - .build(); - - mReactRootView.startReactApplication(mReactInstanceManager, "RCTZhiHuDaily", null); - - setContentView(mReactRootView); - } - - @Override - public boolean onKeyUp(int keyCode, KeyEvent event) { - if (keyCode == KeyEvent.KEYCODE_MENU && mReactInstanceManager != null) { - mReactInstanceManager.showDevOptionsDialog(); - return true; - } - return super.onKeyUp(keyCode, event); - } - - @Override - public void onBackPressed() { - if (mReactInstanceManager != null) { - mReactInstanceManager.onBackPressed(); - } else { - super.onBackPressed(); - } - } - - @Override - public void invokeDefaultOnBackPressed() { - super.onBackPressed(); - } - - @Override - protected void onPause() { - super.onPause(); - - if (mReactInstanceManager != null) { - mReactInstanceManager.onPause(); - } - } - - @Override - protected void onResume() { - super.onResume(); - - if (mReactInstanceManager != null) { - mReactInstanceManager.onResume(this, this); - } - } - - -} diff --git a/android/app/src/main/java/com/rctzhihudaily/MainActivity.java b/android/app/src/main/java/com/rctzhihudaily/MainActivity.java index a3a09f6..241d303 100644 --- a/android/app/src/main/java/com/rctzhihudaily/MainActivity.java +++ b/android/app/src/main/java/com/rctzhihudaily/MainActivity.java @@ -9,7 +9,8 @@ import com.facebook.react.ReactRootView; import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler; import com.facebook.react.shell.MainReactPackage; -import com.facebook.soloader.SoLoader; +import com.race604.react.view.CustomReactPackage; +import com.rctzhihudaily.BuildConfig; public class MainActivity extends Activity implements DefaultHardwareBackBtnHandler { @@ -19,6 +20,7 @@ public class MainActivity extends Activity implements DefaultHardwareBackBtnHand @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + mReactRootView = new ReactRootView(this); mReactInstanceManager = ReactInstanceManager.builder() @@ -26,6 +28,7 @@ protected void onCreate(Bundle savedInstanceState) { .setBundleAssetName("index.android.bundle") .setJSMainModuleName("index.android") .addPackage(new MainReactPackage()) + .addPackage(new CustomReactPackage()) .setUseDeveloperSupport(BuildConfig.DEBUG) .setInitialLifecycleState(LifecycleState.RESUMED) .build(); @@ -75,4 +78,6 @@ protected void onResume() { mReactInstanceManager.onResume(this, this); } } + + }