diff --git a/.idea/gradle.xml b/.idea/gradle.xml index d31ec7f..74cce85 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,7 +7,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index d81a5c8..6e4b8a0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,7 @@ + - + diff --git a/app/build.gradle b/app/build.gradle index 3d12e33..9c4d4c3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,8 +28,15 @@ android { sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = '1.8' +// kotlinOptions { +// jvmTarget = '1.8' +// } + + kotlin { +// jvmToolchain { +// languageVersion.set(JavaLanguageVersion.of(17)) +// } + jvmToolchain(11) } buildFeatures { viewBinding true @@ -37,9 +44,5 @@ android { } dependencies { - implementation project(":uikit") - implementation 'androidx.appcompat:appcompat:1.4.1' - implementation 'com.google.android.material:material:1.5.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a184d96..77c4c7b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,7 @@ tools:targetApi="31" > @@ -23,6 +24,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/app/src/main/res/mipmap-xxxhdpi/wecom_logo.png b/app/src/main/res/drawable/logo_bg.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/wecom_logo.png rename to app/src/main/res/drawable/logo_bg.png diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c8acf67..743693a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -8,16 +8,15 @@ + android:orientation="horizontal"> - + - diff --git a/app/src/main/res/layout/activity_wecome.xml b/app/src/main/res/layout/activity_wecome.xml index b456a0d..d28cdd2 100644 --- a/app/src/main/res/layout/activity_wecome.xml +++ b/app/src/main/res/layout/activity_wecome.xml @@ -7,27 +7,31 @@ android:orientation="vertical" android:gravity="center" tools:context=".module.wecome.WecomeActivity"> - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/home_content_view.xml b/app/src/main/res/layout/home_content_view.xml new file mode 100644 index 0000000..0574ade --- /dev/null +++ b/app/src/main/res/layout/home_content_view.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/home_item_view.xml b/app/src/main/res/layout/home_item_view.xml index 6f9bd2d..0a6898d 100644 --- a/app/src/main/res/layout/home_item_view.xml +++ b/app/src/main/res/layout/home_item_view.xml @@ -14,6 +14,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:orientation="vertical" + android:layout_marginLeft="18dp" android:layout_weight="1"> - - - \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 7616a35..96a8413 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,9 +1,10 @@ - + + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index bba81d4..d2dbe59 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,6 +3,7 @@ pluginManagement { google() mavenCentral() gradlePluginPortal() + maven { url "https://jitpack.io" } } } dependencyResolutionManagement { @@ -10,6 +11,7 @@ dependencyResolutionManagement { repositories { google() mavenCentral() + maven { url "https://jitpack.io" } } versionCatalogs{ @@ -36,7 +38,7 @@ dependencyResolutionManagement { bundle('androidx', ['navigation-fragment','navigation-ui','core-ktx', 'appcompat', 'constraintlayout','livedata','viewmodel']) } create('googleLibs') { - library('material', 'com.google.android', 'material').version('1.5.0') + library('material', 'com.google.android.material', 'material').version('1.5.0') } } } diff --git a/uikit/build.gradle b/uikit/build.gradle index 1bafbf9..dd64448 100644 --- a/uikit/build.gradle +++ b/uikit/build.gradle @@ -25,9 +25,10 @@ android { sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = '1.8' + kotlin { + jvmToolchain(17) } + } dependencies { diff --git a/util/build.gradle b/util/build.gradle index d543ffb..b1f91f2 100644 --- a/util/build.gradle +++ b/util/build.gradle @@ -25,8 +25,8 @@ android { sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = '1.8' + kotlin { + jvmToolchain(11) } } @@ -39,6 +39,7 @@ dependencies { api 'com.squareup.retrofit2:adapter-rxjava3:2.9.0' api 'com.squareup.retrofit2:converter-gson:2.9.0' api 'com.squareup.okhttp3:okhttp:4.2.2' - api 'com.ljx.rxlife3:rxlife-rxjava:3.0.0' + api 'com.github.liujingxing.rxlife:rxlife-rxjava3:2.2.2' + api 'com.geyifeng.immersionbar:immersionbar:3.2.2' } \ No newline at end of file