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

android/app/build.gradle

@@ -127,12 +127,6 @@ android {
     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")
@@ -150,10 +144,15 @@ android {
         }
     }
     buildTypes {
+        releaseStaging {
+            signingConfig signingConfigs.release
+            buildConfigField "String", "CODEPUSH_KEY", '"' + properties.getProperty("code_push.key_staging") + '"'
+        }
         release {
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
             signingConfig signingConfigs.release
+            buildConfigField "String", "CODEPUSH_KEY", '"' + properties.getProperty("code_push.key_production") + '"'
         }
     }
     // applicationVariants are e.g. debug, release