From 9fe35bb65593ddfd07e71c70420149f6675283bd Mon Sep 17 00:00:00 2001
From: yanzs <yanzs.work@foxmail.com>
Date: Thu, 16 Nov 2023 09:47:43 +0800
Subject: [PATCH] home

---
 .idea/gradle.xml                              |   2 +-
 .idea/misc.xml                                |   3 +-
 app/build.gradle                              |  15 +-
 app/src/main/AndroidManifest.xml              |   2 +
 .../service/module/home/view/HomeItemView.kt  |  54 +++++-
 .../res/drawable/ic_launcher_background.xml   | 179 +-----------------
 .../wecom_logo.png => drawable/logo_bg.png}   | Bin
 app/src/main/res/layout/activity_main.xml     |  15 +-
 app/src/main/res/layout/activity_wecome.xml   |  50 ++---
 app/src/main/res/layout/home_content_view.xml |  41 ++++
 app/src/main/res/layout/home_item_view.xml    |   1 +
 app/src/main/res/values-night/themes.xml      |  16 --
 app/src/main/res/values/themes.xml            |  12 +-
 settings.gradle                               |   4 +-
 uikit/build.gradle                            |   5 +-
 util/build.gradle                             |   7 +-
 16 files changed, 169 insertions(+), 237 deletions(-)
 rename app/src/main/res/{mipmap-xxxhdpi/wecom_logo.png => drawable/logo_bg.png} (100%)
 create mode 100644 app/src/main/res/layout/home_content_view.xml
 delete mode 100644 app/src/main/res/values-night/themes.xml

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 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="corretto-11" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="corretto-11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
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" >
         <activity
             android:name=".module.wecome.WecomeActivity"
+            android:theme="@style/AppStartupTheme"
             android:exported="true" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -23,6 +24,7 @@
         </activity>
         <activity
             android:name=".module.home.MainActivity"
+            android:screenOrientation="landscape"
             android:launchMode="singleTask">
         </activity>
         <activity
diff --git a/app/src/main/java/com/uls/service/module/home/view/HomeItemView.kt b/app/src/main/java/com/uls/service/module/home/view/HomeItemView.kt
index cd31a4f..f2c84cc 100644
--- a/app/src/main/java/com/uls/service/module/home/view/HomeItemView.kt
+++ b/app/src/main/java/com/uls/service/module/home/view/HomeItemView.kt
@@ -5,7 +5,9 @@ import android.graphics.Color
 import android.graphics.drawable.GradientDrawable
 import android.util.AttributeSet
 import android.view.LayoutInflater
+import android.widget.FrameLayout
 import android.widget.LinearLayout
+import com.uls.service.databinding.HomeContentViewBinding
 import com.uls.service.databinding.HomeItemViewBinding
 import com.util.extension.dp
 import com.util.extension.roundCorner
@@ -13,16 +15,60 @@ import com.util.extension.roundCorner
 /**
 Created by yanzs on 2023/11/14
  */
-class HomeItemView @JvmOverloads constructor(
+open class HomeItemView @JvmOverloads constructor(
     context: Context, attrs: AttributeSet? = null
 ) : LinearLayout(context, attrs) {
-    private var binding = HomeItemViewBinding.inflate(LayoutInflater.from(context), this, true)
+    protected var binding = HomeItemViewBinding.inflate(LayoutInflater.from(context), this, true)
 
     init {
         roundCorner(30.dp)
-        background = GradientDrawable(
+    }
+}
+
+class DoctorItemView(context: Context, attrs: AttributeSet? = null) : HomeItemView(context, attrs) {
+    init {
+        binding.tvTitle.text = "家庭医生"
+        binding.tvSubtitle.text = "专家坐诊，线上咨询"
+        binding.root.background = GradientDrawable(
             GradientDrawable.Orientation.LEFT_RIGHT,
-            intArrayOf(Color.parseColor("#ff36C1C8"), Color.parseColor("#ff37D1D9"))
+            intArrayOf(Color.parseColor("#ff37D1D9"), Color.parseColor(  "#ff36C1C8"))
         )
     }
+}
+class ContactItemView (context: Context, attrs: AttributeSet? = null) : HomeItemView(context, attrs) {
+    init {
+        binding.tvTitle.text = "联系家人"
+        binding.tvSubtitle.text = "视屏通话，爱在身边"
+        binding.root.background = GradientDrawable(
+            GradientDrawable.Orientation.LEFT_RIGHT,
+            intArrayOf(Color.parseColor("#F48538"), Color.parseColor("#F69244"))
+        )
+    }
+}
+class YuleItemView(context: Context, attrs: AttributeSet? = null) : HomeItemView(context, attrs) {
+    init {
+        binding.tvTitle.text = "娱乐"
+        binding.tvSubtitle.text = "看电影，听戏曲"
+        binding.root.background = GradientDrawable(
+            GradientDrawable.Orientation.LEFT_RIGHT,
+            intArrayOf(Color.parseColor("#F16A56"), Color.parseColor("#F16A56"))
+        )
+    }
+}
+class MomentItemView(context: Context, attrs: AttributeSet? = null) : HomeItemView(context, attrs) {
+    init {
+        binding.tvTitle.text = "回忆录"
+        binding.tvSubtitle.text = "生成美好瞬间"
+        binding.root.background = GradientDrawable(
+            GradientDrawable.Orientation.LEFT_RIGHT,
+            intArrayOf(Color.parseColor("#79B2F6"), Color.parseColor("#3490FD"))
+        )
+    }
+}
+
+
+class HomeContentView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : FrameLayout(context, attrs){
+    private var binding = HomeContentViewBinding.inflate(LayoutInflater.from(context), this, true)
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index 07d5da9..5017ba4 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,170 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/white" />
+    <item>
+        <bitmap
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:src="@drawable/logo_bg" />
+    </item>
+</layer-list>
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 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="horizontal"
-        >
+        android:orientation="horizontal">
 
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            >
+       <com.uls.service.module.home.view.HomeContentView
+           android:id="@+id/home_content"
+           android:layout_width="match_parent"
+           android:layout_height="wrap_content"
+           android:layout_marginStart="25dp"
+           />
 
-        </androidx.appcompat.widget.LinearLayoutCompat>
 
     </LinearLayout>
 
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">
-     <RelativeLayout
-         android:layout_width="466dp"
-         android:layout_height="466dp">
-         <ImageView
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             android:src="@mipmap/wecom_logo"
-             />
-         <TextView
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:textColor="#ff3D3D3D"
-             android:textSize="80sp"
-             android:text="尤岚氏机器人"
-            android:layout_centerHorizontal="true"
-             android:layout_alignParentBottom="true"
-             />
-     </RelativeLayout>
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@mipmap/wecom_logo_subtitle"
-        />
+<!--     <RelativeLayout-->
+<!--         android:layout_width="466dp"-->
+<!--         android:layout_height="466dp">-->
+<!--         <ImageView-->
+<!--             android:layout_width="match_parent"-->
+<!--             android:layout_height="match_parent"-->
+<!--             android:src="@drawable/logo_bg"-->
+<!--             />-->
+<!--         <TextView-->
+<!--             android:layout_width="wrap_content"-->
+<!--             android:layout_height="wrap_content"-->
+<!--             android:textColor="#ff3D3D3D"-->
+<!--             android:textSize="80sp"-->
+<!--             android:text="尤岚氏机器人"-->
+<!--            android:layout_centerHorizontal="true"-->
+<!--             android:layout_alignParentBottom="true"-->
+<!--             />-->
+<!--     </RelativeLayout>-->
+<!--    <ImageView-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:src="@mipmap/wecom_logo_subtitle"-->
+<!--        />-->
+
+
+
+
 </androidx.appcompat.widget.LinearLayoutCompat>
\ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.uls.service.module.home.view.DoctorItemView
+        android:id="@+id/vDoctor"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/vContact"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_width="0dp"
+        android:layout_marginEnd="18dp"
+        android:layout_height="wrap_content"/>
+
+    <com.uls.service.module.home.view.ContactItemView
+        android:id="@+id/vContact"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/vDoctor"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"/>
+
+    <com.uls.service.module.home.view.YuleItemView
+        android:id="@+id/vYule"
+        app:layout_constraintStart_toStartOf="@id/vDoctor"
+        app:layout_constraintEnd_toStartOf="@id/vMoment"
+        app:layout_constraintTop_toBottomOf="@id/vDoctor"
+        android:layout_marginEnd="18dp"
+        android:layout_marginTop="18dp"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"/>
+
+    <com.uls.service.module.home.view.MomentItemView
+        android:id="@+id/vMoment"
+        app:layout_constraintEnd_toEndOf="@id/vContact"
+        app:layout_constraintStart_toStartOf="@id/vContact"
+        app:layout_constraintTop_toTopOf="@id/vYule"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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">
        <TextView
            android:id="@+id/tv_title"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 157d546..0000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Android_ulsService" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>
\ 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 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.Android_ulsService" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.Android_ulsService" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">@color/white</item>
+        <item name="colorPrimaryVariant">@color/white</item>
+        <item name="colorPrimaryDark">@color/white</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
@@ -14,4 +15,9 @@
         <!-- Customize your theme here. -->
         <item name="android:screenOrientation">landscape</item>
     </style>
+
+    <style name="AppStartupTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="android:windowBackground">@drawable/ic_launcher_background</item>
+    </style>
 </resources>
\ 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