diff --git a/android/app/build.gradle b/android/app/build.gradle index 890edbe..12293d1 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -98,13 +98,28 @@ android { compileSdkVersion rootProject.ext.compileSdkVersion buildToolsVersion rootProject.ext.buildToolsVersion + def getVersionCode = { -> + return project.hasProperty('versionCode') ? Integer.parseInt(project.versionCode) : 1 + } + + def getVersionName = { -> + return project.hasProperty('versionName') ? project.versionName : "1.0" + } + defaultConfig { applicationId "com.screenad" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "1.0" + versionCode = getVersionCode() + versionName getVersionName() } + + android.applicationVariants.all { variant -> + variant.outputs.all { + outputFileName = "screenad_" + variant.buildType.name + "_v" + defaultConfig.versionName + ".apk" + } + } + splits { abi { reset() @@ -114,7 +129,15 @@ android { } } buildTypes { + debug { + buildConfigField "String", "API_HOST", "\"https://mall.youlane.cn/\"" + buildConfigField "String", "CODEPUSH_HOST", "\"http://202.165.179.86:3333/\"" + buildConfigField "String", "CODEPUSH_KEY", "\"8snO1yoHlvhEtBjr02zTr3g1comw4ksvOXqog\"" + } release { + buildConfigField "String", "API_HOST", "\"https://admin.malls.iformall.com/\"" + buildConfigField "String", "CODEPUSH_HOST", "\"http://202.165.179.86:3333/\"" + buildConfigField "String", "CODEPUSH_KEY", "\"9rYZYySFD0ryN5wCD9YmjJkT55Kf4ksvOXqog\"" minifyEnabled enableProguardInReleaseBuilds proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" } diff --git a/android/app/src/main/java/com/screenad/MainApplication.java b/android/app/src/main/java/com/screenad/MainApplication.java index 9ba602f..2253e13 100644 --- a/android/app/src/main/java/com/screenad/MainApplication.java +++ b/android/app/src/main/java/com/screenad/MainApplication.java @@ -31,10 +31,10 @@ public class MainApplication extends Application implements ReactApplication { return Arrays.asList( new MainReactPackage(), new CodePush( - getResources().getString(R.string.reactNativeCodePush_androidDeploymentKey), + BuildConfig.CODEPUSH_KEY, getApplicationContext(), BuildConfig.DEBUG, - "http://202.165.179.86:3333/" + BuildConfig.CODEPUSH_HOST ) ); } diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 9265a32..4ad3158 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,4 +1,3 @@ - 9rYZYySFD0ryN5wCD9YmjJkT55Kf4ksvOXqog screenAd diff --git a/android/gradle/wrapper/gradle-4.7-all.zip b/android/gradle/wrapper/gradle-4.7-all.zip new file mode 100644 index 0000000..292b4fb Binary files /dev/null and b/android/gradle/wrapper/gradle-4.7-all.zip differ diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 73bb13d..47c3249 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip +distributionUrl=gradle-4.7-all.zip