Commit 4c8f2389 by wangtao

temp

parent fdaadff2
...@@ -9,14 +9,6 @@ android { ...@@ -9,14 +9,6 @@ android {
targetSdkVersion build_config.target_sdk targetSdkVersion build_config.target_sdk
versionCode build_config.version_code versionCode build_config.version_code
versionName build_config.version_name versionName build_config.version_name
ndk {
abiFilters 'armeabi'
}
javaCompileOptions {
annotationProcessorOptions {
arguments = [AROUTER_MODULE_NAME: project.getName()]
}
}
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
...@@ -83,9 +75,5 @@ android { ...@@ -83,9 +75,5 @@ android {
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation deps.app_compat api project(":lib_app_common")
testImplementation deps.junit
androidTestImplementation deps.runner
androidTestImplementation deps.espresso
implementation project(":lib_app_common")
} }
...@@ -3,15 +3,19 @@ ...@@ -3,15 +3,19 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.module.hikcreate"> package="com.module.hikcreate">
<application> <application
android:name="com.main.module.base.CommonApplication"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name="com.main.moduel.ui.TestDemoActivity" <activity android:name="com.main.module.ui.TestDemoActivity"
android:launchMode="singleTask"> android:launchMode="singleTask">
<intent-filter> <intent-filter>
<category android:name="android.intent.category.DEFAULT"/> <action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
</application> </application>
......
package com.main.module.base;
import android.app.Application;
/**
* author : taowang
* date :2019/9/11
* description:
**/
public class CommonApplication extends Application {
}
package com.main.moduel.ui package com.main.module.ui
import android.os.Bundle import android.os.Bundle
import com.module.hikcreate.R import com.module.hikcreate.R
import com.trello.rxlifecycle2.components.support.RxAppCompatActivity import com.trello.rxlifecycle2.components.support.RxAppCompatActivity
/** /**
* author : taowang * author : taowang
* date :2019/9/10 * date :2019/9/10
...@@ -13,14 +12,10 @@ import com.trello.rxlifecycle2.components.support.RxAppCompatActivity ...@@ -13,14 +12,10 @@ import com.trello.rxlifecycle2.components.support.RxAppCompatActivity
class TestDemoActivity : RxAppCompatActivity(){ class TestDemoActivity : RxAppCompatActivity(){
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.test) setContentView(R.layout.test)
} }
} }
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:padding="20dp"
android:orientation="vertical"
android:layout_height="match_parent"> android:layout_height="match_parent">
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="去登录模块"
android:id="@+id/mBtnLogin"
/>
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="去通行证模块"
android:layout_marginTop="10dp"
android:id="@+id/mBtnPassport"
/>
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="去预约出行模块"
android:layout_marginTop="10dp"
android:id="@+id/mBtnPlanTrip"
/>
</LinearLayout> </LinearLayout>
...@@ -19,3 +19,5 @@ android.useAndroidX=true ...@@ -19,3 +19,5 @@ android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete": # Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official kotlin.code.style=official
tinkerEnable=false
...@@ -11,11 +11,6 @@ android { ...@@ -11,11 +11,6 @@ android {
targetSdkVersion build_config.target_sdk targetSdkVersion build_config.target_sdk
versionCode build_config.version_code versionCode build_config.version_code
versionName build_config.version_name versionName build_config.version_name
javaCompileOptions {
annotationProcessorOptions {
arguments = [AROUTER_MODULE_NAME: project.getName()]
}
}
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
...@@ -36,11 +31,11 @@ dependencies { ...@@ -36,11 +31,11 @@ dependencies {
androidTestImplementation deps.runner androidTestImplementation deps.runner
androidTestImplementation deps.espresso androidTestImplementation deps.espresso
implementation deps.kotlin implementation deps.kotlin
api project(":lib_ui") // api project(":lib_ui")
api project(":lib_core") // api project(":lib_core")
api project(":lib_network") // api project(":lib_network")
api project(":lib_ui") // api project(":lib_ui")
api project(":lib_common_util") // api project(":lib_common_util")
api deps.annotations api deps.annotations
api deps.constraint api deps.constraint
......
...@@ -8,11 +8,6 @@ android { ...@@ -8,11 +8,6 @@ android {
targetSdkVersion build_config.target_sdk targetSdkVersion build_config.target_sdk
versionCode build_config.version_code versionCode build_config.version_code
versionName build_config.version_name versionName build_config.version_name
javaCompileOptions {
annotationProcessorOptions {
arguments = [AROUTER_MODULE_NAME: project.getName()]
}
}
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
......
...@@ -8,11 +8,6 @@ android { ...@@ -8,11 +8,6 @@ android {
targetSdkVersion build_config.target_sdk targetSdkVersion build_config.target_sdk
versionCode build_config.version_code versionCode build_config.version_code
versionName build_config.version_name versionName build_config.version_name
javaCompileOptions {
annotationProcessorOptions {
arguments = [AROUTER_MODULE_NAME: project.getName()]
}
}
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
......
...@@ -8,11 +8,6 @@ android { ...@@ -8,11 +8,6 @@ android {
targetSdkVersion build_config.target_sdk targetSdkVersion build_config.target_sdk
versionCode build_config.version_code versionCode build_config.version_code
versionName build_config.version_name versionName build_config.version_name
javaCompileOptions {
annotationProcessorOptions {
arguments = [AROUTER_MODULE_NAME: project.getName()]
}
}
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
......
...@@ -8,11 +8,6 @@ android { ...@@ -8,11 +8,6 @@ android {
targetSdkVersion build_config.target_sdk targetSdkVersion build_config.target_sdk
versionCode build_config.version_code versionCode build_config.version_code
versionName build_config.version_name versionName build_config.version_name
javaCompileOptions {
annotationProcessorOptions {
arguments = [AROUTER_MODULE_NAME: project.getName()]
}
}
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
......
...@@ -8,11 +8,6 @@ android { ...@@ -8,11 +8,6 @@ android {
targetSdkVersion build_config.target_sdk targetSdkVersion build_config.target_sdk
versionCode build_config.version_code versionCode build_config.version_code
versionName build_config.version_name versionName build_config.version_name
javaCompileOptions {
annotationProcessorOptions {
arguments = [AROUTER_MODULE_NAME: project.getName()]
}
}
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
......
...@@ -8,11 +8,6 @@ android { ...@@ -8,11 +8,6 @@ android {
targetSdkVersion build_config.target_sdk targetSdkVersion build_config.target_sdk
versionCode build_config.version_code versionCode build_config.version_code
versionName build_config.version_name versionName build_config.version_name
javaCompileOptions {
annotationProcessorOptions {
arguments = [AROUTER_MODULE_NAME: project.getName()]
}
}
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
......
...@@ -8,11 +8,6 @@ android { ...@@ -8,11 +8,6 @@ android {
targetSdkVersion build_config.target_sdk targetSdkVersion build_config.target_sdk
versionCode build_config.version_code versionCode build_config.version_code
versionName build_config.version_name versionName build_config.version_name
javaCompileOptions {
annotationProcessorOptions {
arguments = [AROUTER_MODULE_NAME: project.getName()]
}
}
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
......
...@@ -8,11 +8,6 @@ android { ...@@ -8,11 +8,6 @@ android {
targetSdkVersion build_config.target_sdk targetSdkVersion build_config.target_sdk
versionCode build_config.version_code versionCode build_config.version_code
versionName build_config.version_name versionName build_config.version_name
javaCompileOptions {
annotationProcessorOptions {
arguments = [AROUTER_MODULE_NAME: project.getName()]
}
}
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
......
...@@ -8,11 +8,6 @@ android { ...@@ -8,11 +8,6 @@ android {
targetSdkVersion build_config.target_sdk targetSdkVersion build_config.target_sdk
versionCode build_config.version_code versionCode build_config.version_code
versionName build_config.version_name versionName build_config.version_name
javaCompileOptions {
annotationProcessorOptions {
arguments = [AROUTER_MODULE_NAME: project.getName()]
}
}
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
......
...@@ -8,11 +8,6 @@ android { ...@@ -8,11 +8,6 @@ android {
targetSdkVersion build_config.target_sdk targetSdkVersion build_config.target_sdk
versionCode build_config.version_code versionCode build_config.version_code
versionName build_config.version_name versionName build_config.version_name
javaCompileOptions {
annotationProcessorOptions {
arguments = [AROUTER_MODULE_NAME: project.getName()]
}
}
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
......
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