Commit d14d088d authored by jianglx's avatar jianglx

添加多渠道打包

parent 3ae56a57
...@@ -10,6 +10,7 @@ android { ...@@ -10,6 +10,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
javaCompileOptions { javaCompileOptions {
annotationProcessorOptions { annotationProcessorOptions {
includeCompileClasspath = true includeCompileClasspath = true
...@@ -21,12 +22,21 @@ android { ...@@ -21,12 +22,21 @@ android {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
}
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
repositories { repositories {
flatDir { flatDir {
dirs 'libs' //this way we can find the .aar file in libs folder dirs 'libs' //this way we can find the .aar file in libs folder
} }
} }
}
} }
dependencies { dependencies {
......
...@@ -10,6 +10,7 @@ android { ...@@ -10,6 +10,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
javaCompileOptions { javaCompileOptions {
annotationProcessorOptions { annotationProcessorOptions {
includeCompileClasspath = true includeCompileClasspath = true
...@@ -23,12 +24,23 @@ android { ...@@ -23,12 +24,23 @@ android {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
}
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
repositories { repositories {
flatDir { flatDir {
dirs 'libs' //this way we can find the .aar file in libs folder dirs 'libs' //this way we can find the .aar file in libs folder
} }
} }
}
} }
dependencies { dependencies {
......
...@@ -8,6 +8,7 @@ android { ...@@ -8,6 +8,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
//testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" //testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
//新版Gradle 是 implementation 为了兼容compile,写上这句话 //新版Gradle 是 implementation 为了兼容compile,写上这句话
javaCompileOptions { javaCompileOptions {
...@@ -21,6 +22,18 @@ android { ...@@ -21,6 +22,18 @@ android {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
}
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
repositories { repositories {
flatDir { flatDir {
dirs 'libs' //this way we can find the .aar file in libs folder dirs 'libs' //this way we can find the .aar file in libs folder
...@@ -29,7 +42,6 @@ android { ...@@ -29,7 +42,6 @@ android {
//compile(name:'camerascan-1.0', ext:'aar') //compile(name:'camerascan-1.0', ext:'aar')
} }
} }
}
} }
dependencies { dependencies {
......
...@@ -10,6 +10,7 @@ android { ...@@ -10,6 +10,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
javaCompileOptions { javaCompileOptions {
annotationProcessorOptions { annotationProcessorOptions {
includeCompileClasspath = true includeCompileClasspath = true
...@@ -27,6 +28,18 @@ android { ...@@ -27,6 +28,18 @@ android {
} }
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -10,6 +10,7 @@ android { ...@@ -10,6 +10,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
javaCompileOptions { javaCompileOptions {
annotationProcessorOptions { annotationProcessorOptions {
includeCompileClasspath = true includeCompileClasspath = true
...@@ -21,12 +22,25 @@ android { ...@@ -21,12 +22,25 @@ android {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
}
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
repositories { repositories {
flatDir { flatDir {
dirs 'libs' //this way we can find the .aar file in libs folder dirs 'libs' //this way we can find the .aar file in libs folder
} }
} }
}
} }
dependencies { dependencies {
......
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
String appId = "com.xxfc.rv"
compileSdkVersion rootProject.ext.compileSdkVersion compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig { defaultConfig {
applicationId "com.xxfc.rv"
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
flavorDimensions "default"
versionCode 135 versionCode 135
versionName "1.3.5" versionName "1.3.5"
multiDexEnabled true multiDexEnabled true
...@@ -28,32 +28,34 @@ android { ...@@ -28,32 +28,34 @@ android {
} }
} }
signingConfigs { signingConfigs {
release {
keyAlias rootProject.ext.sign_xinxin.keyAlias
keyPassword rootProject.ext.sign_xinxin.keyPassword
storeFile file(rootProject.ext.sign_xinxin.storeReleaseFile)
storePassword rootProject.ext.sign_xinxin.storePassword
}
debug { debug {
keyAlias 'xinxin' keyAlias 'xinxin'
keyPassword '123456' keyPassword '123456'
storeFile file('../keystore/xinxin.jks') storeFile file('../keystore/xinxin.jks')
storePassword '123456' storePassword '123456'
} }
release {
keyAlias 'xinxin'
keyPassword '123456'
storeFile file('../keystore/xinxin.jks')
storePassword '123456'
}
} }
buildTypes { buildTypes {
release { release {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.debug
} }
debug { debug {
debuggable true debuggable true
signingConfig signingConfigs.debug signingConfig signingConfigs.release
} }
android.applicationVariants.all { variant -> android.applicationVariants.all { variant ->
variant.outputs.all { variant.outputs.all {
//MedicalClient_{time}_v1.0.1_{build号}.apk
if (variant.buildType.name == 'release') { if (variant.buildType.name == 'release') {
def productVersion = "RV" + releaseTime() + "V" + defaultConfig.versionName + "Release" + ".apk"; def productVersion = "RV" + releaseTime() + "V" + defaultConfig.versionName + "Release" + ".apk";
outputFileName = productVersion outputFileName = productVersion
...@@ -62,7 +64,26 @@ android { ...@@ -62,7 +64,26 @@ android {
} }
} }
productFlavors {
//开发环境
dev {
// applicationId = appId + ".dev"
applicationId = appId
}
sit {
// applicationId = appId + ".sit"
applicationId = appId
}
pro {
applicationId = appId
}
}
} }
//打包的时间 //打包的时间
static def releaseTime() { static def releaseTime() {
return new Date().format("yyyyMMddHHss", TimeZone.getTimeZone("GMT+8")) return new Date().format("yyyyMMddHHss", TimeZone.getTimeZone("GMT+8"))
......
<resources>
<string name="app_name">滴房车(开发)</string>
</resources>
<resources>
<string name="app_name">滴房车(测试)</string>
</resources>
...@@ -10,7 +10,7 @@ android { ...@@ -10,7 +10,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
javaCompileOptions { javaCompileOptions {
annotationProcessorOptions { annotationProcessorOptions {
...@@ -19,17 +19,30 @@ android { ...@@ -19,17 +19,30 @@ android {
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
buildTypes { buildTypes {
release { release {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
}
repositories { repositories {
flatDir { flatDir {
dirs 'libs' //this way we can find the .aar file in libs folder dirs 'libs' //this way we can find the .aar file in libs folder
} }
} }
}
sourceSets { sourceSets {
main { main {
jniLibs.srcDir 'libs' jniLibs.srcDir 'libs'
......
package com.frame.rv.config;
/**
* Created :Auser
* Date: 2019/5/9.
* Desc:
*/
public interface RvFrameConfig extends RvFrameConstant {
// String HOST = "https://xxtest.upyuns.com";
// String HOST = "http://10.1.37.192:8765";
// String HOST = "http://10.1.37.245:10000";
String HOST = "https://dev.dfangche.com";
String HOST_H5_DETAIL = HOST;
String ADMIN_POST = HOST + "/api/admin/";
String AUTH_POST = HOST + "/api/auth/";
String VEHICLE_POST = HOST + "/vehicle/";//租车
String VEHICLE_CAR_POST = HOST + "/vehicle/";//租车
String VEHICLE_UPLOAD = HOST + "/api/universal/";
String VEHICLE_ORDER = HOST + "/api/order/";
String VEHICLE_TOURUSER = HOST + "/api/tour/";
String VEHICLE_CAMPLIST = HOST + "/api/campsite/";
String APP_ID = "wx9ed5e51251cf7c61";//微信注册ID
class RvFrameInfo {
public static int TYPE_LOGIN = 0;//登录类型0、token过期、1、租车
}
}
...@@ -15,7 +15,6 @@ public interface RvFrameConfig extends RvFrameConstant { ...@@ -15,7 +15,6 @@ public interface RvFrameConfig extends RvFrameConstant {
// String HOST = "https://api.dfangche.com"; // String HOST = "https://api.dfangche.com";
String HOST = "https://mgmt.dfangche.com"; String HOST = "https://mgmt.dfangche.com";
String HOST_H5_DETAIL = "https://mgmt.dfangche.com"; String HOST_H5_DETAIL = "https://mgmt.dfangche.com";
// String HOST_H5_DETAIL = "https://dev.dfangche.com";
String ADMIN_POST = HOST + "/api/admin/"; String ADMIN_POST = HOST + "/api/admin/";
String AUTH_POST = HOST + "/api/auth/"; String AUTH_POST = HOST + "/api/auth/";
String VEHICLE_POST = HOST + "/vehicle/";//租车 String VEHICLE_POST = HOST + "/vehicle/";//租车
......
package com.frame.rv.config;
/**
* Created :Auser
* Date: 2019/5/9.
* Desc:
*/
public interface RvFrameConfig extends RvFrameConstant {
String HOST = "https://xxtest.upyuns.com";
// String HOST = "http://10.1.37.192:8765";
// String HOST = "http://10.1.37.245:10000";
// String HOST = "https://dev.dfangche.com";
// String HOST = "https://api.dfangche.com";
// String HOST = "https://mgmt.dfangche.com";
// String HOST_H5_DETAIL = "https://mgmt.dfangche.com";
String HOST_H5_DETAIL = HOST;
String ADMIN_POST = HOST + "/api/admin/";
String AUTH_POST = HOST + "/api/auth/";
String VEHICLE_POST = HOST + "/vehicle/";//租车
String VEHICLE_CAR_POST = HOST + "/vehicle/";//租车
String VEHICLE_UPLOAD = HOST + "/api/universal/";
String VEHICLE_ORDER = HOST + "/api/order/";
String VEHICLE_TOURUSER = HOST + "/api/tour/";
String VEHICLE_CAMPLIST = HOST + "/api/campsite/";
String APP_ID = "wx9ed5e51251cf7c61";//微信注册ID
class RvFrameInfo {
public static int TYPE_LOGIN = 0;//登录类型0、token过期、1、租车
}
}
...@@ -12,7 +12,7 @@ android { ...@@ -12,7 +12,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
javaCompileOptions { javaCompileOptions {
annotationProcessorOptions { annotationProcessorOptions {
includeCompileClasspath = true includeCompileClasspath = true
...@@ -33,6 +33,8 @@ android { ...@@ -33,6 +33,8 @@ android {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
}
repositories { repositories {
flatDir { flatDir {
dirs 'libs' //this way we can find the .aar file in libs folder dirs 'libs' //this way we can find the .aar file in libs folder
...@@ -41,6 +43,17 @@ android { ...@@ -41,6 +43,17 @@ android {
//compile(name:'camerascan-1.0', ext:'aar') //compile(name:'camerascan-1.0', ext:'aar')
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
} }
......
...@@ -8,7 +8,7 @@ android { ...@@ -8,7 +8,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
} }
buildTypes { buildTypes {
...@@ -28,6 +28,17 @@ android { ...@@ -28,6 +28,17 @@ android {
jniLibs.srcDir 'libs' jniLibs.srcDir 'libs'
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -9,6 +9,7 @@ android { ...@@ -9,6 +9,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
javaCompileOptions { javaCompileOptions {
annotationProcessorOptions { annotationProcessorOptions {
includeCompileClasspath = true includeCompileClasspath = true
...@@ -20,14 +21,25 @@ android { ...@@ -20,14 +21,25 @@ android {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
}
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
repositories { repositories {
flatDir { flatDir {
dirs 'libs' //this way we can find the .aar file in libs folder dirs 'libs' //this way we can find the .aar file in libs folder
} }
} }
}
} }
dependencies { dependencies {
......
...@@ -10,6 +10,7 @@ android { ...@@ -10,6 +10,7 @@ android {
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
multiDexEnabled true multiDexEnabled true
flavorDimensions "default"
javaCompileOptions { javaCompileOptions {
annotationProcessorOptions { annotationProcessorOptions {
includeCompileClasspath = true includeCompileClasspath = true
...@@ -29,12 +30,24 @@ android { ...@@ -29,12 +30,24 @@ android {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
}
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
repositories { repositories {
flatDir { flatDir {
dirs 'libs' //this way we can find the .aar file in libs folder dirs 'libs' //this way we can find the .aar file in libs folder
} }
} }
}
} }
dependencies { dependencies {
......
...@@ -9,7 +9,7 @@ android { ...@@ -9,7 +9,7 @@ android {
targetSdkVersion 28 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
...@@ -21,6 +21,18 @@ android { ...@@ -21,6 +21,18 @@ android {
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -9,7 +9,7 @@ android { ...@@ -9,7 +9,7 @@ android {
targetSdkVersion 28 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
...@@ -21,6 +21,16 @@ android { ...@@ -21,6 +21,16 @@ android {
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -9,7 +9,7 @@ android { ...@@ -9,7 +9,7 @@ android {
targetSdkVersion 28 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
...@@ -20,7 +20,17 @@ android { ...@@ -20,7 +20,17 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -9,7 +9,7 @@ android { ...@@ -9,7 +9,7 @@ android {
targetSdkVersion 28 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
...@@ -21,6 +21,18 @@ android { ...@@ -21,6 +21,18 @@ android {
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -20,7 +20,7 @@ android { ...@@ -20,7 +20,7 @@ android {
} }
} }
flavorDimensions "default"
} }
buildTypes { buildTypes {
...@@ -29,6 +29,16 @@ android { ...@@ -29,6 +29,16 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
...@@ -36,7 +46,7 @@ dependencies { ...@@ -36,7 +46,7 @@ dependencies {
api 'com.jakewharton:butterknife:9.0.0-rc1' api 'com.jakewharton:butterknife:9.0.0-rc1'
implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.android.support.constraint:constraint-layout:1.1.3'
annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc1' annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc1'
annotationProcessor'com.alibaba:arouter-compiler:1.1.4' annotationProcessor 'com.alibaba:arouter-compiler:1.1.4'
api project(':RvWrapper') api project(':RvWrapper')
api project(':component_control') api project(':component_control')
api project(':component_resource') api project(':component_resource')
......
...@@ -9,7 +9,7 @@ android { ...@@ -9,7 +9,7 @@ android {
targetSdkVersion 28 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
javaCompileOptions { javaCompileOptions {
...@@ -34,6 +34,16 @@ android { ...@@ -34,6 +34,16 @@ android {
sourceCompatibility = '1.8' sourceCompatibility = '1.8'
targetCompatibility = '1.8' targetCompatibility = '1.8'
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -10,7 +10,7 @@ android { ...@@ -10,7 +10,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
javaCompileOptions { javaCompileOptions {
annotationProcessorOptions { annotationProcessorOptions {
...@@ -28,6 +28,15 @@ android { ...@@ -28,6 +28,15 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -10,7 +10,7 @@ android { ...@@ -10,7 +10,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
javaCompileOptions { javaCompileOptions {
...@@ -28,6 +28,15 @@ android { ...@@ -28,6 +28,15 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -10,7 +10,7 @@ android { ...@@ -10,7 +10,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
javaCompileOptions { javaCompileOptions {
...@@ -29,6 +29,15 @@ android { ...@@ -29,6 +29,15 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -9,7 +9,7 @@ android { ...@@ -9,7 +9,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
javaCompileOptions { javaCompileOptions {
...@@ -29,6 +29,17 @@ android { ...@@ -29,6 +29,17 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -9,7 +9,7 @@ android { ...@@ -9,7 +9,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
javaCompileOptions { javaCompileOptions {
...@@ -29,6 +29,18 @@ android { ...@@ -29,6 +29,18 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -9,7 +9,7 @@ android { ...@@ -9,7 +9,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
javaCompileOptions { javaCompileOptions {
...@@ -29,6 +29,18 @@ android { ...@@ -29,6 +29,18 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -9,7 +9,7 @@ android { ...@@ -9,7 +9,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
javaCompileOptions { javaCompileOptions {
...@@ -29,6 +29,18 @@ android { ...@@ -29,6 +29,18 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -9,7 +9,7 @@ android { ...@@ -9,7 +9,7 @@ android {
targetSdkVersion 28 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
...@@ -20,6 +20,18 @@ android { ...@@ -20,6 +20,18 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -9,7 +9,7 @@ android { ...@@ -9,7 +9,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 28 targetSdkVersion 28
flavorDimensions "default"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
...@@ -21,6 +21,18 @@ android { ...@@ -21,6 +21,18 @@ android {
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -10,7 +10,7 @@ android { ...@@ -10,7 +10,7 @@ android {
targetSdkVersion 29 targetSdkVersion 29
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
...@@ -22,6 +22,17 @@ android { ...@@ -22,6 +22,17 @@ android {
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -9,7 +9,7 @@ android { ...@@ -9,7 +9,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
javaCompileOptions { javaCompileOptions {
...@@ -29,6 +29,17 @@ android { ...@@ -29,6 +29,17 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -8,7 +8,7 @@ android { ...@@ -8,7 +8,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 28 targetSdkVersion 28
flavorDimensions "default"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
...@@ -19,6 +19,17 @@ android { ...@@ -19,6 +19,17 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
repositories { repositories {
......
...@@ -82,7 +82,7 @@ public class RvWebView extends WebView { ...@@ -82,7 +82,7 @@ public class RvWebView extends WebView {
setWebChromeClient(webChromeClient); setWebChromeClient(webChromeClient);
} }
public WebViewClient webViewClient = new WebViewClient() { private WebViewClient webViewClient = new WebViewClient() {
@Override @Override
public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) { public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
return super.shouldOverrideUrlLoading(view, request); return super.shouldOverrideUrlLoading(view, request);
......
...@@ -9,7 +9,7 @@ android { ...@@ -9,7 +9,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
javaCompileOptions { javaCompileOptions {
...@@ -29,6 +29,19 @@ android { ...@@ -29,6 +29,19 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -7,8 +7,8 @@ android { ...@@ -7,8 +7,8 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 24 targetSdkVersion 28
flavorDimensions "default"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
...@@ -20,6 +20,19 @@ android { ...@@ -20,6 +20,19 @@ android {
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
...@@ -9,7 +9,7 @@ android { ...@@ -9,7 +9,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
flavorDimensions "default"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
javaCompileOptions { javaCompileOptions {
...@@ -29,6 +29,18 @@ android { ...@@ -29,6 +29,18 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
} }
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
} }
dependencies { dependencies {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment