Merge branch 'master' of ssh://192.168.1.116:29418/bolan-root/frontend/manager-app-sz into wq

android/app/build.gradle

@@ -99,6 +99,8 @@ def enableSeparateBuildPerCPUArchitecture = false
  */
 def enableProguardInReleaseBuilds = false
 
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
 android {
     compileSdkVersion 25
     buildToolsVersion "25.0.3"
@@ -114,6 +116,23 @@ android {
             abiFilters "armeabi-v7a", "x86"
         }
     }
+    productFlavors {
+        dev {
+            minSdkVersion 21
+        }
+        prod {
+            minSdkVersion 16
+        }
+    }
+    dexOptions {
+        javaMaxHeapSize "2G"
+    }
+    releaseStaging {
+        buildConfigField "String", "CODEPUSH_KEY", '"' + properties.getProperty("code_push.key_staging") + '"'
+    }
+    release {
+        buildConfigField "String", "CODEPUSH_KEY", '"' + properties.getProperty("code_push.key_production") + '"'
+    }
     signingConfigs {
         release {
             storeFile file("app.jks")

android/app/src/main/assets/index.android.bundle.meta

+D4OD3'd9

\ No newline at end of file

android/app/src/main/java/com/bolanmanagerapp/MainApplication.java

@@ -37,7 +37,7 @@ public class MainApplication extends Application implements ReactApplication {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
-            new CodePush(null, getApplicationContext(), BuildConfig.DEBUG),
+          new CodePush(BuildConfig.CODEPUSH_KEY, getApplicationContext(), BuildConfig.DEBUG),
           new RNDeviceInfo(),
           new IDCardReactPackage(),
           new VectorIconsPackage(),

android/gradle.properties

@@ -18,4 +18,6 @@
 # org.gradle.parallel=true
 
 android.useDeprecatedNdk=true
-org.gradle.jvmargs=-Xmx4G
+org.gradle.daemon=true
+org.gradle.parallel=true
+org.gradle.jvmargs=-Xmx3G

android/local.properties

@@ -7,6 +7,7 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Fri Oct 27 18:29:04 CST 2017
-#sdk.dir=D\:\\AppData\\Local\\Android\\sdk1
- sdk.dir=D\:\\Android\\sdk
+#Wed Sep 27 15:26:11 CST 2017
+code_push.key_production=1jJDUki8dREADfZnMQWgjrk02K1Q4ksvOXqog
+code_push.key_staging=09Bbn7Y3d8WBtouy9x5JxTjVvZgI4ksvOXqog
+sdk.dir=D\:\\Android\\sdk

src/router.js

@@ -2,6 +2,7 @@ import React, { PureComponent } from 'react';
 import { BackHandler, Animated, Easing } from 'react-native';
 import { StackNavigator, addNavigationHelpers, NavigationActions } from 'react-navigation';
 import { connect } from 'react-redux';
+import codePush from 'react-native-code-push';
 import NavigatorService from './services/navigator';
 import Welcome from './routes/welcome';
 import Error from './routes/error';
@@ -66,6 +67,11 @@ class Router extends PureComponent {
     BackHandler.addEventListener('hardwareBackPress', this.backHandle);
   }
 
+  componentDidMount() {
+    codePush.sync();
+  }
+
+
   componentWillUnmount() {
     BackHandler.removeEventListener('hardwareBackPress', this.backHandle);
   }