diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml new file mode 100644 index 0000000000000000000000000000000000000000..4166bb46090aa6911ef9049e53bfb1caf48a3274 --- /dev/null +++ b/.idea/assetWizardSettings.xml @@ -0,0 +1,127 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index cc04cd32093fbc391c900c5ccd21d413e916e539..51fa3e5b2e11ee63fa5f64ce01f6a7327d8a18a2 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -35,7 +35,7 @@ - + diff --git a/config.gradle b/config.gradle index 12f488e850f22a2376b665c69fb8ee587bf782ca..46e2b85cd1c934ce12e6fb2122ef6704fc5512d9 100644 --- a/config.gradle +++ b/config.gradle @@ -51,9 +51,6 @@ ext { //json解析 "gson" : "com.google.code.gson:gson:2.8.5", - //recyclerview的databinding套装 - "bindingcollectionadapter" : "me.tatarka.bindingcollectionadapter2:bindingcollectionadapter:2.2.0", - "bindingcollectionadapter-recyclerview": "me.tatarka.bindingcollectionadapter2:bindingcollectionadapter-recyclerview:2.2.0", //Google AAC "lifecycle-extensions" : "android.arch.lifecycle:extensions:1.1.1", "lifecycle-compiler" : "android.arch.lifecycle:compiler:1.1.1", diff --git a/lib_common/build.gradle b/lib_common/build.gradle index 8fb3560c6737e19ef1881e74742d4c800b7c43f8..6584ba601804cdd6e3e819dd8302cdabe9825562 100644 --- a/lib_common/build.gradle +++ b/lib_common/build.gradle @@ -55,12 +55,6 @@ dependencies { } annotationProcessor rootProject.ext.dependencies["glide-compiler"] - api(rootProject.ext.dependencies.bindingcollectionadapter) { - exclude group: 'com.android.support' - } - api(rootProject.ext.dependencies["bindingcollectionadapter-recyclerview"]) { - exclude group: 'com.android.support' - } api rootProject.ext.dependencies["lifecycle-extensions"] annotationProcessor rootProject.ext.dependencies["lifecycle-compiler"] diff --git a/module.build.gradle b/module.build.gradle index d4a98002ec38c20b17177ca73cfb0fc82f5ef8a9..08e53acac4d626e8d43f050f33926e71a41eceab 100644 --- a/module.build.gradle +++ b/module.build.gradle @@ -12,7 +12,7 @@ android { versionCode rootProject.ext.android.versionCode versionName rootProject.ext.android.versionName testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - //阿里路由框架配置 + javaCompileOptions { annotationProcessorOptions { arguments = [AROUTER_MODULE_NAME: project.getName()] diff --git a/module_app/src/main/ic_launcher-web.png b/module_app/src/main/ic_launcher-web.png new file mode 100644 index 0000000000000000000000000000000000000000..dd8473da0fe168c6529ff0a9c012d60a4db02c67 Binary files /dev/null and b/module_app/src/main/ic_launcher-web.png differ diff --git a/module_app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/module_app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index bbd3e021239ce758474da78cfc2ca3cf85ed0d91..036d09bc5fd523323794379703c4a111d1e28a04 100644 --- a/module_app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/module_app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/module_app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/module_app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index bbd3e021239ce758474da78cfc2ca3cf85ed0d91..036d09bc5fd523323794379703c4a111d1e28a04 100644 --- a/module_app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/module_app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/module_app/src/main/res/mipmap-hdpi/ic_launcher.png b/module_app/src/main/res/mipmap-hdpi/ic_launcher.png index 898f3ed59ac9f3248734a00e5902736c9367d455..53da13561f37c427bd1d9fd0da701e845c848dcd 100644 Binary files a/module_app/src/main/res/mipmap-hdpi/ic_launcher.png and b/module_app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/module_app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/module_app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..8bad78c2aa5361d1eedd4ac9a21cdd64d4750bc0 Binary files /dev/null and b/module_app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/module_app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/module_app/src/main/res/mipmap-hdpi/ic_launcher_round.png index dffca3601eba7bf5f409bdd520820e2eb5122c75..e1d4865c23a84b6647076cd826e097b36f6a9831 100644 Binary files a/module_app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/module_app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/module_app/src/main/res/mipmap-mdpi/ic_launcher.png b/module_app/src/main/res/mipmap-mdpi/ic_launcher.png index 64ba76f75e9ce021aa3d95c213491f73bcacb597..067d59bba9946d2b52b48d0c73c861704020ac20 100644 Binary files a/module_app/src/main/res/mipmap-mdpi/ic_launcher.png and b/module_app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/module_app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/module_app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..420c2e1ebdd2b284661f9e53fbb61f0b73ab9084 Binary files /dev/null and b/module_app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/module_app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/module_app/src/main/res/mipmap-mdpi/ic_launcher_round.png index dae5e082342fcdeee5db8a6e0b27028e2d2808f5..229ae11616964adccda901c390905d747a92d49b 100644 Binary files a/module_app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/module_app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/module_app/src/main/res/mipmap-xhdpi/ic_launcher.png b/module_app/src/main/res/mipmap-xhdpi/ic_launcher.png index e5ed46597ea8447d91ab1786a34e30f1c26b18bd..00697b23e7a7d250e3c025160e88d59b7b19134d 100644 Binary files a/module_app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/module_app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/module_app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/module_app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..56aa4fa8cd316fdad59807424d3788bffae9dcdd Binary files /dev/null and b/module_app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/module_app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/module_app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 14ed0af35023e4f1901cf03487b6c524257b8483..03ba3914a02594b4366081ba5cad1411dee65017 100644 Binary files a/module_app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/module_app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/module_app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/module_app/src/main/res/mipmap-xxhdpi/ic_launcher.png index b0907cac3bfd8fbfdc46e1108247f0a1055387ec..364db5ec7acd840d4f7e1201a4cddd88713201bf 100644 Binary files a/module_app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/module_app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/module_app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/module_app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..03efd8fa5d9f2f03044490b109af89bd4d22980d Binary files /dev/null and b/module_app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/module_app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/module_app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index d8ae03154975f397f8ed1b84f2d4bf9783ecfa26..3eb21cf6a4c7cfc63c5e9014c1daa8acfaaae397 100644 Binary files a/module_app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/module_app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/module_app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/module_app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 2c18de9e66108411737e910f5c1972476f03ddbf..24694c4dd2883488f409cb7ffce8f308709ce3c3 100644 Binary files a/module_app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/module_app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/module_app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/module_app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..03299dc6af55909226d20356837473b3db917a86 Binary files /dev/null and b/module_app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/module_app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/module_app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index beed3cdd2c32af5114a7dc70b9ef5b698eb8797e..41fa9adbbcf2774682e2aafc9ae616dc65bfda92 100644 Binary files a/module_app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/module_app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/module_app/src/main/res/values/ic_launcher_background.xml b/module_app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..eec658cc63bd6517bb258ddf2b1ffeaf3a42e917 --- /dev/null +++ b/module_app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #D60303 + \ No newline at end of file diff --git a/module_main/src/main/java/com/fly/tour/main/SplashActivity.java b/module_main/src/main/java/com/fly/tour/main/SplashActivity.java index 40ff2ca07f2e64425e9bbb33fb73736fd4ca6a0b..05b08924fef8364fbff6185da82dc4427aa93fbc 100644 --- a/module_main/src/main/java/com/fly/tour/main/SplashActivity.java +++ b/module_main/src/main/java/com/fly/tour/main/SplashActivity.java @@ -29,6 +29,11 @@ public class SplashActivity extends BaseMvvmActivity + xmlns:android="http://schemas.android.com/apk/res/android" + android:background="@mipmap/welcome" + > + \ No newline at end of file diff --git a/module_main/src/main/res/mipmap-xhdpi/welcome.png b/module_main/src/main/res/mipmap-xhdpi/welcome.png new file mode 100644 index 0000000000000000000000000000000000000000..ad45e04cd2161f82bde85045fd02884f30dd058f Binary files /dev/null and b/module_main/src/main/res/mipmap-xhdpi/welcome.png differ