Commit 56ddf6d5 by xiongweimin

去除部分代码

parent 0820eb0b
......@@ -3,6 +3,9 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<compositeConfiguration>
<compositeBuild compositeDefinitionSource="SCRIPT" />
</compositeConfiguration>
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
......
if (build_module == build_module_app) {
apply plugin: 'com.android.application'
} else {
apply plugin: 'com.android.library'
}
apply plugin: 'com.android.application'
android {
compileSdkVersion build_config.compile_sdk
defaultConfig {
......@@ -58,8 +55,8 @@ android {
renderscriptDebuggable false
signingConfig signingConfigs.sign
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
buildConfigField("boolean", "SHOW_LOG", "false")
buildConfigField("boolean", "SERVER_ADDRESS_ENABLE", "false")
buildConfigField("boolean","SHOW_LOG","false")
buildConfigField("boolean","SERVER_ADDRESS_ENABLE","false")
}
debug {
minifyEnabled false
......@@ -71,8 +68,8 @@ android {
renderscriptDebuggable true
signingConfig signingConfigs.sign
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
buildConfigField("boolean", "SHOW_LOG", "true")
buildConfigField("boolean", "SERVER_ADDRESS_ENABLE", "true")
buildConfigField("boolean","SHOW_LOG","true")
buildConfigField("boolean","SERVER_ADDRESS_ENABLE","true")
}
}
......@@ -105,6 +102,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
compile project(path: ':lib_module_common')
if (build_module == build_module_app) {
api project(':app_common')
api project(':app_login')
......
apply plugin: 'com.android.library'
android {
compileSdkVersion 29
buildToolsVersion "29.0.0"
compileSdkVersion build_config.target_sdk
defaultConfig {
minSdkVersion build_config.min_sdk
......
if (build_module == build_module_login) {
if (build_module == true) {
apply plugin: 'com.android.application'
} else {
apply plugin: 'com.android.library'
......@@ -47,7 +47,7 @@ android {
sourceSets {
main {
if (rootProject.build_module == build_module_login) {
if (rootProject.build_module == true) {
manifest.srcFile 'src/main/module/AndroidManifest.xml'
} else {
manifest.srcFile 'src/main/AndroidManifest.xml'
......
if (build_module == build_module_passport) {
if (build_module == true) {
apply plugin: 'com.android.application'
} else {
apply plugin: 'com.android.library'
......@@ -41,7 +41,7 @@ android {
sourceSets {
main {
if (rootProject.build_module == build_module_passport) {
if (rootProject.build_module == true) {
manifest.srcFile 'src/main/module/AndroidManifest.xml'
} else {
manifest.srcFile 'src/main/AndroidManifest.xml'
......
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.app.login">
<application
android:roundIcon="@mipmap/ic_launcher"
android:allowBackup="false"
android:name="com.hikcreate.test.CommonApplication"
android:theme="@style/Theme.AppCompat.Light.NoActionBar"
android:icon="@mipmap/ic_launcher"
android:label="passport"
tools:ignore="GoogleAppIndexingWarning"
tools:replace="android:icon,android:roundIcon,android:theme,android:label,android:allowBackup">
</application>
</manifest>
\ No newline at end of file
......@@ -18,5 +18,5 @@ ext.build_modele_passport_resourcePrefix = "passport_"
//百度相关lib_module
ext.build_modele_baidu_resourcePrefix = "baidu_"
//当前运行的model
ext.build_module = build_module_app
//工程模式,true为组件化模式,false为集成化模式。
ext.build_module = true
......@@ -2,7 +2,7 @@
//build_config 配置
def build_config = [:]
//android
build_config.classpath_gradle = "com.android.tools.build:gradle:3.1.2"
build_config.classpath_gradle = "com.android.tools.build:gradle:3.4.1"
build_config.min_sdk = 19
build_config.compile_sdk = 28
build_config.build_tool = "27.0.3"
......@@ -15,5 +15,4 @@ build_config.classpath_kotlin_extension = "org.jetbrains.kotlin:kotlin-gradle-pl
build_config.version_code = 162
build_config.version_name = "1.6.2"
ext.build_config = build_config
#Wed Sep 18 17:16:33 CST 2019
#Mon Sep 23 09:41:12 CST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.hikcreate.library">
<application android:allowBackup="false"></application>
<application></application>
</manifest>
......@@ -33,6 +33,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation deps.appcompat
implementation deps.multidex
implementation deps.rxandroid2
}
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