diff --git a/app/build.gradle b/app/build.gradle index 5ea5657..2235277 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,8 +25,6 @@ android { packagingOptions { exclude 'META-INF/rxjava.properties' } - - } lintOptions { @@ -37,10 +35,6 @@ android { jumboMode true } - //dataBinding { - //enabled = true - //} - compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -48,6 +42,44 @@ android { //多版本 productFlavors { + //新平台正式 + newly { + flavorDimensions "default" + versionCode 174 + //versionCode 1037 + versionName "1.3.4" + /*********************************极光推送************************************/ + manifestPlaceholders = [ + JPUSH_PKGNAME: "com.jiaoguanyi.appstore", + JPUSH_APPKEY : "52d81643665bb2cadacf0e9e", //JPush上注册的包名对应的appkey. + JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可. + channel_value: "newly" + ] + signingConfig signingConfigs.debug + /*********************************极光推送end************************************/ + buildConfigField "String", "ROOT_URL", '"http://name.jiaoguanyi.cn/api/"' + buildConfigField "String", "WebsocketURL", '"ws://47.119.147.245:2345"' + } + + //新平台测试 + beta { + flavorDimensions "default" + versionCode 1 + versionName "1" + /*********************************极光推送************************************/ + manifestPlaceholders = [ + JPUSH_PKGNAME: "com.jiaoguanyi.appstore", + JPUSH_APPKEY : "52d81643665bb2cadacf0e9e", //JPush上注册的包名对应的appkey. + JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可. + channel_value: "newly" + ] + signingConfig signingConfigs.debug + /*********************************极光推送end************************************/ + buildConfigField "String", "ROOT_URL", '"http://name.uiuios.com/api/"' + buildConfigField "String", "WebsocketURL", '"ws://39.108.116.195:2345"' + } + + //老平台正式 official { flavorDimensions "default" versionCode 1038 @@ -63,26 +95,6 @@ android { /*********************************极光推送end************************************/ buildConfigField "String", "ROOT_URL", '"http://partner.jiaoguanyi.com/api/"' buildConfigField "String", "WebsocketURL", '"ws://47.107.133.19:1234"' - - } - - beta { - flavorDimensions "default" - versionCode 109 - //versionCode 160//出厂版本太高 - versionName "3.1.4"//测试jiaoguanyi.cn - /*********************************极光推送************************************/ - manifestPlaceholders = [ - JPUSH_PKGNAME: "com.jiaoguanyi.appstore", - JPUSH_APPKEY : "52d81643665bb2cadacf0e9e", //JPush上注册的包名对应的appkey. - JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可. - channel_value: "beta" - ] - signingConfig signingConfigs.debug - /*********************************极光推送end************************************/ - buildConfigField "String", "ROOT_URL", '"http://www.jiaoguanyi.cn/api/"' - buildConfigField "String", "WebsocketURL", '"ws://47.107.133.19:2345"' - } //中优 @@ -102,25 +114,8 @@ android { buildConfigField "String", "ROOT_URL", '"https://jgy.jundunxueyuan.com/api/"' buildConfigField "String", "WebsocketURL", '"ws://39.98.59.202:2345"' } - - newly { - flavorDimensions "default" - versionCode 174 - //versionCode 1037 - versionName "1.3.4" - /*********************************极光推送************************************/ - manifestPlaceholders = [ - JPUSH_PKGNAME: "com.jiaoguanyi.appstore", - JPUSH_APPKEY : "52d81643665bb2cadacf0e9e", //JPush上注册的包名对应的appkey. - JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可. - channel_value: "newly" - ] - signingConfig signingConfigs.debug - /*********************************极光推送end************************************/ - buildConfigField "String", "ROOT_URL", '"http://name.uiuios.com/api/"' - buildConfigField "String", "WebsocketURL", '"ws://39.108.116.195:2345"' - } } + sourceSets { beta.res.srcDirs = ['src/beta/res'] newly.res.srcDirs = ['src/beta/res'] @@ -150,7 +145,7 @@ android { // 不显示Log //buildConfigField "boolean", "LOG_DEBUG", "false" // - //versionNameSuffix "-debug" + versionNameSuffix "-debug" minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' //Zipalign优化