diff --git a/app/src/main/java/com/cniao5/cainiaowo/CnApplication.kt b/app/src/main/java/com/cniao5/cainiaowo/CnApplication.kt
index ac28cbd..1139525 100644
--- a/app/src/main/java/com/cniao5/cainiaowo/CnApplication.kt
+++ b/app/src/main/java/com/cniao5/cainiaowo/CnApplication.kt
@@ -4,6 +4,7 @@ import com.alibaba.android.arouter.launcher.ARouter
 import com.cniao5.common.BaseApplication
 import com.cniao5.common.ktx.application
 import com.cniao5.course.moduleCourse
+import com.cniao5.home.moduleHome
 import com.cniao5.mine.moduleMine
 import com.cniao5.study.moduleStudy
 import com.test.service.assistant.AssistantApp
@@ -15,7 +16,7 @@ import org.koin.core.module.Module
 class CnApplication : BaseApplication() {
 
     private val modules = arrayListOf<Module>(
-        moduleService,/*moduleHome,*/ moduleLogin, moduleMine, moduleStudy, moduleCourse
+        moduleService, moduleHome, moduleLogin, moduleMine, moduleStudy, moduleCourse
     )
 
     override fun initConfig() {
diff --git a/app/src/main/java/com/cniao5/cainiaowo/MainActivity.kt b/app/src/main/java/com/cniao5/cainiaowo/MainActivity.kt
index cc2426e..05d0dd7 100644
--- a/app/src/main/java/com/cniao5/cainiaowo/MainActivity.kt
+++ b/app/src/main/java/com/cniao5/cainiaowo/MainActivity.kt
@@ -7,7 +7,7 @@ import com.cniao5.cainiaowo.databinding.ActivityMainBinding
 import com.cniao5.common.base.BaseActivity
 import com.cniao5.common.widget.BnvVp2Mediator
 import com.cniao5.course.ui.CourseFragment
-import com.cniao5.home.HomeFragment
+import com.cniao5.home.ui.HomeFragment
 import com.cniao5.mine.MineContainerFragment
 import com.cniao5.study.ui.StudyFragment
 
diff --git a/course/src/main/java/com/cniao5/course/ui/CourseViewModel.kt b/course/src/main/java/com/cniao5/course/CourseViewModel.kt
similarity index 93%
rename from course/src/main/java/com/cniao5/course/ui/CourseViewModel.kt
rename to course/src/main/java/com/cniao5/course/CourseViewModel.kt
index fde3066..3213433 100644
--- a/course/src/main/java/com/cniao5/course/ui/CourseViewModel.kt
+++ b/course/src/main/java/com/cniao5/course/CourseViewModel.kt
@@ -1,4 +1,4 @@
-package com.cniao5.course.ui
+package com.cniao5.course
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.viewModelScope
@@ -7,6 +7,8 @@ import com.cniao5.common.base.BaseViewModel
 import com.cniao5.course.net.CourseListRsp
 import com.cniao5.course.net.CourseTypes
 import com.cniao5.course.repo.ICourseResource
+import com.cniao5.course.ui.CoursePagingAdapter
+import com.cniao5.course.ui.CourseRecycAdapter
 
 class CourseViewModel(val repo: ICourseResource) : BaseViewModel() {
 
diff --git a/course/src/main/java/com/cniao5/course/libCourse.kt b/course/src/main/java/com/cniao5/course/libCourse.kt
index 3fe2e0f..ab848f3 100644
--- a/course/src/main/java/com/cniao5/course/libCourse.kt
+++ b/course/src/main/java/com/cniao5/course/libCourse.kt
@@ -5,7 +5,6 @@ import com.cniao5.common.utils.getBaseHost
 import com.cniao5.course.net.CourseService
 import com.cniao5.course.repo.CourseResource
 import com.cniao5.course.repo.ICourseResource
-import com.cniao5.course.ui.CourseViewModel
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.parameter.parametersOf
 import org.koin.dsl.bind
diff --git a/course/src/main/java/com/cniao5/course/ui/CourseFragment.kt b/course/src/main/java/com/cniao5/course/ui/CourseFragment.kt
index 1165072..ac2f342 100644
--- a/course/src/main/java/com/cniao5/course/ui/CourseFragment.kt
+++ b/course/src/main/java/com/cniao5/course/ui/CourseFragment.kt
@@ -3,7 +3,6 @@ package com.cniao5.course.ui
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -14,9 +13,9 @@ import androidx.lifecycle.lifecycleScope
 import androidx.paging.LoadState
 import com.blankj.utilcode.util.ToastUtils
 import com.cniao5.common.base.BaseFragment
+import com.cniao5.course.CourseViewModel
 import com.cniao5.course.R
 import com.cniao5.course.databinding.*
-import com.cniao5.course.net.CourseListRsp
 import com.google.android.material.tabs.TabLayout
 import kotlinx.coroutines.flow.collectLatest
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -51,11 +50,33 @@ class CourseFragment: BaseFragment() {
         mBinding = FragmentCourseBinding.bind(view)
 
         return mBinding.apply {
+
+            vm = viewModel
+
             val adapter = viewModel.coursePagingAdapter
             //下方的load Header头部load
             rvCourse.adapter = adapter.withLoadStateFooter(CourseLoadAdapter(adapter))
 
-            vm = viewModel
+            //Load上滑进度条监听
+            adapter.addLoadStateListener { loadState ->
+                if (loadState.refresh is LoadState.Loading) {
+                    pbFragmentCourse.visibility = View.VISIBLE
+                } else {
+                    pbFragmentCourse.visibility = View.GONE
+
+                    //获取加载错误事件
+                    val error = when {
+                        loadState.prepend is LoadState.Error -> loadState.prepend as LoadState.Error
+                        loadState.append is LoadState.Error -> loadState.append as LoadState.Error
+                        loadState.refresh is LoadState.Error -> loadState.refresh as LoadState.Error
+                        else -> null
+                    }
+
+                    error?.let {
+                        ToastUtils.showShort(it.error.message)
+                    }
+                }
+            }
 
             viewModel.apply {
 
@@ -118,27 +139,6 @@ class CourseFragment: BaseFragment() {
                     courseRecycAdapter.submitClear(it?.datas ?: emptyList())
                 }
 
-                //Load上滑进度条监听
-                adapter.addLoadStateListener { loadState ->
-                    if (loadState.refresh is LoadState.Loading) {
-                        pbFragmentCourse.visibility = View.VISIBLE
-                    } else {
-                        pbFragmentCourse.visibility = View.GONE
-
-                        //获取加载错误事件
-                        val error = when {
-                            loadState.prepend is LoadState.Error -> loadState.prepend as LoadState.Error
-                            loadState.append is LoadState.Error -> loadState.append as LoadState.Error
-                            loadState.refresh is LoadState.Error -> loadState.refresh as LoadState.Error
-                            else -> null
-                        }
-
-                        error?.let {
-                            ToastUtils.showShort(it.error.message)
-                        }
-                    }
-                }
-
                 //全部类型按钮点击事件
                 spinnerTypeCourse.setOnClickListener {
                     popupWindow_type.showAsDropDown(it)
diff --git a/course/src/main/res/layout/fragment_course.xml b/course/src/main/res/layout/fragment_course.xml
index f62ce3c..a0a26a4 100644
--- a/course/src/main/res/layout/fragment_course.xml
+++ b/course/src/main/res/layout/fragment_course.xml
@@ -6,7 +6,7 @@
     <data>
         <variable
             name="vm"
-            type="com.cniao5.course.ui.CourseViewModel" />
+            type="com.cniao5.course.CourseViewModel" />
 
     </data>
 
diff --git a/course/src/main/res/layout/item_course_recyc.xml b/course/src/main/res/layout/item_course_recyc.xml
index c0a44ec..f134803 100644
--- a/course/src/main/res/layout/item_course_recyc.xml
+++ b/course/src/main/res/layout/item_course_recyc.xml
@@ -102,7 +102,7 @@
                 android:gravity="center"
                 android:paddingVertical="2dp"
                 android:text="免费学"
-                android:textColor="@color/colorAccent"
+                android:textColor="@color/lightseagreen"
                 android:textSize="12sp"
                 android:visibility="@{(info.isFree()==1)?View.VISIBLE:View.GONE}"
                 app:layout_constraintBottom_toBottomOf="parent"
diff --git a/home/build.gradle b/home/build.gradle
index 7024922..76c536a 100644
--- a/home/build.gradle
+++ b/home/build.gradle
@@ -17,5 +17,9 @@ android {
 }
 dependencies {
     implementation project(path:':service')
+    //第三方banner
+    implementation 'com.youth.banner:banner:2.1.0'
+
     //from dependencies.gradle
+
 }
\ No newline at end of file
diff --git a/home/src/main/AndroidManifest.xml b/home/src/main/AndroidManifest.xml
index 668a732..86c21a6 100644
--- a/home/src/main/AndroidManifest.xml
+++ b/home/src/main/AndroidManifest.xml
@@ -2,4 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.cniao5.home">
 
+    <!--网络权限-->
+    <uses-permission android:name="android.permission.INTERNET"/>
+
 </manifest>
\ No newline at end of file
diff --git a/home/src/main/java/com/cniao5/home/HomeFragment.kt b/home/src/main/java/com/cniao5/home/HomeFragment.kt
deleted file mode 100644
index 280a699..0000000
--- a/home/src/main/java/com/cniao5/home/HomeFragment.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.cniao5.home
-
-import android.os.Bundle
-import android.view.View
-import androidx.databinding.ViewDataBinding
-import com.cniao5.common.base.BaseFragment
-import com.cniao5.home.databinding.FragmentHomeBinding
-
-/*
-* 主页的Fragment
-* 传入了R.layout.fragment_course之后就不用写onCreateView,因为布局已经被关联到fragment里了
-* */
-class HomeFragment: BaseFragment() {
-
-    //传入布局资源,将布局和view绑定到一起
-    override fun getLayoutRes() = R.layout.fragment_home
-
-    //传入view,将view和databinding绑定到一起
-    override fun bindView(view: View, savedInstanceState: Bundle?): ViewDataBinding {
-        return FragmentHomeBinding.bind(view)
-    }
-
-}
\ No newline at end of file
diff --git a/home/src/main/java/com/cniao5/home/LibHome.kt b/home/src/main/java/com/cniao5/home/LibHome.kt
new file mode 100644
index 0000000..3375686
--- /dev/null
+++ b/home/src/main/java/com/cniao5/home/LibHome.kt
@@ -0,0 +1,36 @@
+package com.cniao5.home
+
+import com.cniao5.common.network.KtRetrofit
+import com.cniao5.common.utils.getBaseHost
+import com.cniao5.home.net.HomeService
+import com.cniao5.home.repo.HomeResource
+import com.cniao5.home.repo.IHomeResource
+import com.cniao5.home.ui.HomeViewModel
+import org.koin.core.parameter.parametersOf
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.dsl.bind
+import org.koin.dsl.module
+
+
+/*
+* 依赖注入管理 Home的module
+* */
+val moduleHome = module {
+
+    //service retrofit
+    //single声明单例对象
+    // single {
+    //     KtRetrofit.initConfig("http://yapi.54yct.com/mock/24/") //baseurl
+    //         .getService(MineService::class.java)
+    // }
+
+    single {
+        get<KtRetrofit> { parametersOf(getBaseHost()) }.getService(HomeService::class.java)
+    }
+
+    //repo IMineResource
+    single { HomeResource(get()) } bind IHomeResource::class
+
+    viewModel { HomeViewModel(get()) }
+
+}
\ No newline at end of file
diff --git a/home/src/main/java/com/cniao5/home/net/HomeRsp.kt b/home/src/main/java/com/cniao5/home/net/HomeRsp.kt
new file mode 100644
index 0000000..e897144
--- /dev/null
+++ b/home/src/main/java/com/cniao5/home/net/HomeRsp.kt
@@ -0,0 +1,30 @@
+package com.cniao5.home.net
+import androidx.annotation.Keep
+
+import com.google.gson.annotations.SerializedName
+
+
+/*
+* 首页上方banner图数据
+* */
+class BannerList : ArrayList<BannerList.BannerListItem>(){
+    @Keep
+    data class BannerListItem(
+        @SerializedName("client_url")
+        val clientUrl: Any?,
+        @SerializedName("created_time")
+        val createdTime: String?,
+        val id: Int,
+        @SerializedName("img_url")
+        val imgUrl: String?,
+        val name: Any?,
+        @SerializedName("order_num")
+        val orderNum: Int,
+        @SerializedName("page_show")
+        val pageShow: Int,
+        @SerializedName("redirect_url")
+        val redirectUrl: String?,
+        val state: Int,
+        val type: String?
+    )
+}
\ No newline at end of file
diff --git a/home/src/main/java/com/cniao5/home/net/HomeService.kt b/home/src/main/java/com/cniao5/home/net/HomeService.kt
new file mode 100644
index 0000000..4fe95de
--- /dev/null
+++ b/home/src/main/java/com/cniao5/home/net/HomeService.kt
@@ -0,0 +1,23 @@
+package com.cniao5.home.net
+
+import com.test.service.net.BaseResponse
+import retrofit2.Call
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+
+/*
+* 主页模块的接口
+* */
+interface HomeService {
+
+    /*
+    * 首页上方banner
+    * */
+    @GET("ad/new/banner/list")
+    fun getBanner(
+        @Query("type")type: Int = 2,   //类型 1:小程序 2:web 3:h5 4:ios 5:android 如: 2表示web 默认2
+        @Query("page_show") pageshow:Int = 1  //页面显示 1 首页 2 课程 3 大数据学院 4 机器人学院 5 人工智能学院 6 推广员 默认1
+    ) : Call<BaseResponse>
+
+}
\ No newline at end of file
diff --git a/home/src/main/java/com/cniao5/home/repo/HomeResource.kt b/home/src/main/java/com/cniao5/home/repo/HomeResource.kt
new file mode 100644
index 0000000..da125b4
--- /dev/null
+++ b/home/src/main/java/com/cniao5/home/repo/HomeResource.kt
@@ -0,0 +1,41 @@
+package com.cniao5.home.repo
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.blankj.utilcode.util.LogUtils
+import com.cniao5.common.network.support.serverData
+import com.cniao5.home.net.BannerList
+import com.cniao5.home.net.HomeService
+import com.test.service.net.onBizError
+import com.test.service.net.onBizOK
+import com.test.service.net.onFailure
+import com.test.service.net.onSuccess
+
+class HomeResource (val service: HomeService) : IHomeResource {
+
+    private val _liveBanner = MutableLiveData<BannerList>()
+
+    override val liveBanner: LiveData<BannerList>
+        get() = _liveBanner
+
+    /*
+    * 获取首页上方banner图数据
+    * */
+    override suspend fun getBanner() {
+        service.getBanner()
+            .serverData()
+            .onSuccess {
+                onBizError { code, message ->
+                    LogUtils.w("获取banner信息 onBizzError $code$message")
+                }
+                onBizOK<BannerList> { code, data, message ->
+                    _liveBanner.value = data
+                    LogUtils.i("获取banner信息 onBizzOK $data")
+                }
+            }
+            .onFailure {
+                LogUtils.e("获取banner信息 接口异常 ${it.message}")
+            }
+    }
+
+}
\ No newline at end of file
diff --git a/home/src/main/java/com/cniao5/home/repo/IHomeResource.kt b/home/src/main/java/com/cniao5/home/repo/IHomeResource.kt
new file mode 100644
index 0000000..73fbbdc
--- /dev/null
+++ b/home/src/main/java/com/cniao5/home/repo/IHomeResource.kt
@@ -0,0 +1,15 @@
+package com.cniao5.home.repo
+
+import androidx.lifecycle.LiveData
+import com.cniao5.home.net.BannerList
+/*
+* 抽象接口
+* */
+interface IHomeResource {
+
+    //首页上方banner图
+    val liveBanner: LiveData<BannerList>
+
+    suspend fun getBanner()
+
+}
\ No newline at end of file
diff --git a/home/src/main/java/com/cniao5/home/ui/HomeFragment.kt b/home/src/main/java/com/cniao5/home/ui/HomeFragment.kt
new file mode 100644
index 0000000..ca0946b
--- /dev/null
+++ b/home/src/main/java/com/cniao5/home/ui/HomeFragment.kt
@@ -0,0 +1,59 @@
+package com.cniao5.home.ui
+
+import android.os.Bundle
+import android.util.Log
+import android.view.View
+import androidx.databinding.ViewDataBinding
+import com.cniao5.common.base.BaseFragment
+import com.cniao5.home.R
+import com.cniao5.home.databinding.FragmentHomeBinding
+import com.cniao5.home.net.BannerList
+import com.cniao5.home.ui.adapter.BannerAdapter
+import com.youth.banner.indicator.CircleIndicator
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+/*
+* 主页的Fragment
+* 传入了R.layout.fragment_course之后就不用写onCreateView,因为布局已经被关联到fragment里了
+* */
+class HomeFragment: BaseFragment() {
+
+    private val viewmodel: HomeViewModel by viewModel()
+
+    private val bannerList = BannerList()
+
+    private val bannerAdapter by lazy { BannerAdapter(bannerList) }
+
+    //传入布局资源,将布局和view绑定到一起
+    override fun getLayoutRes() = R.layout.fragment_home
+
+    //传入view,将view和databinding绑定到一起
+    override fun bindView(view: View, savedInstanceState: Bundle?): ViewDataBinding {
+        return FragmentHomeBinding.bind(view).apply {
+
+            bannerHome.addBannerLifecycleObserver(viewLifecycleOwner) //生命周期观察者
+                .setAdapter(bannerAdapter).indicator = CircleIndicator(requireContext()) //轮播图上的小点
+        }
+    }
+
+    override fun initConfig() {
+        super.initConfig()
+
+    }
+
+    override fun initData() {
+        super.initData()
+
+        //上方banner
+        viewmodel.getBanner()
+        viewmodel.liveBanner.observeKt {
+            it ?: return@observeKt
+            bannerList.clear()
+            bannerList.addAll(it) //todo 添加多一次，因为返回的只有一个数据
+            bannerList.addAll(it)
+            bannerAdapter.notifyDataSetChanged()
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/home/src/main/java/com/cniao5/home/ui/HomeViewModel.kt b/home/src/main/java/com/cniao5/home/ui/HomeViewModel.kt
new file mode 100644
index 0000000..250256c
--- /dev/null
+++ b/home/src/main/java/com/cniao5/home/ui/HomeViewModel.kt
@@ -0,0 +1,22 @@
+package com.cniao5.home.ui
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.cniao5.common.base.BaseViewModel
+import com.cniao5.home.net.BannerList
+import com.cniao5.home.repo.IHomeResource
+
+/*
+* 首页的viewmodel
+* */
+class HomeViewModel(private val resource: IHomeResource) : BaseViewModel() {
+
+    //首页上方的banner图
+    val liveBanner = resource.liveBanner
+    val liveBannerMu =  MutableLiveData<BannerList>()
+
+    fun getBanner() = serverAwait {
+        resource.getBanner()
+    }
+
+}
\ No newline at end of file
diff --git a/home/src/main/java/com/cniao5/home/ui/adapter/BannerAdapter.kt b/home/src/main/java/com/cniao5/home/ui/adapter/BannerAdapter.kt
new file mode 100644
index 0000000..94307d8
--- /dev/null
+++ b/home/src/main/java/com/cniao5/home/ui/adapter/BannerAdapter.kt
@@ -0,0 +1,41 @@
+package com.cniao5.home.ui.adapter
+
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners
+import com.bumptech.glide.request.RequestOptions
+import com.cniao5.home.R
+import com.cniao5.home.net.BannerList
+import com.youth.banner.adapter.BannerImageAdapter
+import com.youth.banner.holder.BannerImageHolder
+
+/*
+* 首页上方banner的适配器,传入bannerList解析的数据格式
+* */
+class BannerAdapter(val bannerList: BannerList) : BannerImageAdapter<BannerList.BannerListItem>(bannerList) {
+    override fun onBindView(
+        holder: BannerImageHolder?,
+        data: BannerList.BannerListItem?,
+        position: Int,
+        size: Int
+    ) {
+        holder ?: return //如果为空的话直接返回
+
+        //有的相片地址没有https:
+        val src = data?.imgUrl
+        val imageUrl = when(src) {
+            is String -> {
+                when {
+                    src.startsWith("//img.cniao5.com") -> "https:$src"
+                    else -> src
+                }
+            }
+            else -> src ?: R.drawable.img_course
+        }
+
+        //不为空时加载图片
+        Glide.with(holder.itemView)
+            .load(imageUrl)
+            .apply(RequestOptions.bitmapTransform(RoundedCorners(30)))
+            .into(holder.imageView)
+    }
+}
\ No newline at end of file
diff --git a/home/src/main/res/drawable/ic_mine_small.xml b/home/src/main/res/drawable/ic_mine_small.xml
new file mode 100644
index 0000000..f73e13f
--- /dev/null
+++ b/home/src/main/res/drawable/ic_mine_small.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="8dp"
+    android:height="8dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="#757575"
+        android:pathData="M962.56,899.06c-26.62,-137.2 -108.54,-253.94 -227.33,-321.54 -12.3,-6.14 -19.46,-11.78 -40.96,-20.46 -74.26,-30.22 -148.5,-38.93 -217.09,-38.93 -204.8,16.4 -374.78,172.05 -415.74,380.93 -4.1,16.38 0,32.78 10.24,47.1 10.24,12.3 26.62,20.48 43.01,20.48h792.58c16.38,0 32.77,-8.19 43.01,-20.48 12.29,-14.32 16.38,-30.7 12.29,-47.1zM904.83,921.12c-2.83,0 -6.11,-0.96 -9.55,-2.32 -1.06,0.16 -2.16,0.32 -3.46,0.32 -2.03,0 -4.27,-0.45 -6.62,-1.18a21.23,21.23 0,0 1,-7.38 1.18c-2.86,0 -6.16,-0.96 -9.63,-2.34a17.23,17.23 0,0 1,-9.38 2.34c-0.96,0 -1.98,-0.19 -3.01,-0.35 -3.42,2.21 -8.58,2.3 -13.95,1.31l0.45,0.18 -1.5,-0.13c-0.74,-0.06 -1.49,-0.37 -2.22,-0.48 -3.02,1.44 -6.99,1.49 -10.78,1.49h-1.01c-3.47,0 -7.23,-1.22 -11.01,-2.78 -1.49,0.11 -2.91,0.34 -4.48,0.34 -1.02,0 -1.94,-0.19 -2.96,-0.22a87.26,87.26 0,0 1,-29.95 1.63c-1.94,0.14 -3.79,0.59 -5.76,0.59L772,920.69c-5.41,0 -10.66,-0.7 -15.78,-1.78a88.99,88.99 0,0 1,-25.92 -1.22c-1.01,0.05 -1.95,0.32 -2.96,0.32h-2.67c-3.28,0 -6.4,-0.59 -9.6,-0.99 -5.44,0.83 -10.91,1.5 -16.4,1.66 -0.35,0.02 -0.69,-0.08 -1.04,-0.08 -4.45,0.8 -8.98,1.41 -13.63,1.41h-2.66c-1.79,0 -3.52,-0.37 -5.28,-0.5 -3.73,0.45 -7.52,0.69 -11.39,0.5 -8.21,-0.4 -17.06,-1.09 -25.23,-3.42 -5.07,2.16 -9.71,3.42 -13.57,3.42 -5.33,0 -8.61,-1.28 -10.34,-3.44 -3.9,1.44 -7.62,2.43 -10.67,2.43 -3.26,0 -5.55,-0.61 -7.41,-1.46 -3.89,1.42 -7.57,2.45 -10.59,2.45 -4.58,0 -7.47,-1.02 -9.34,-2.64a29.65,29.65 0,0 1,-8.66 1.65,18.72 18.72,0 0,1 -6.86,-1.12 31.41,31.41 0,0 1,-10.14 2.13c-5.18,0 -8.48,-1.18 -10.24,-3.23a87.5,87.5 0,0 1,-18.34 1.9c-8.99,0 -17.14,-1.28 -24.56,-3.5 -7.7,2.45 -16,4.16 -25.44,4.16a84.86,84.86 0,0 1,-25.92 -3.86,84.16 84.16,0 0,1 -25.41,3.86 84.66,84.66 0,0 1,-23.04 -3.17c-4.46,1.76 -8.61,2.85 -12.05,2.85 -3.18,0 -5.57,-0.5 -7.34,-1.36 -2.75,0.8 -5.38,1.36 -7.66,1.36 -3.3,0 -5.58,-0.61 -7.44,-1.49 -1.22,0.21 -2.48,0.48 -3.57,0.48 -2.14,0 -3.78,-0.32 -5.31,-0.69l-0.27,0.02c-2.96,0 -5.81,-0.18 -8.61,-0.42 -4.78,1.95 -9.17,3.09 -12.82,3.09 -3.98,0 -6.56,-0.86 -8.46,-2.11 -3.66,0.48 -7.46,0.78 -11.44,0.78 -1.6,0 -3.04,-0.22 -4.58,-0.34a29.73,29.73 0,0 1,-8.53 1.66c-4.61,0 -7.54,-1.04 -9.41,-2.69 -5.04,2.16 -9.78,3.68 -13.6,3.68 -4.35,0 -7.14,-0.98 -9.02,-2.45 -2.88,0.86 -5.62,1.46 -7.97,1.46 -4.56,0 -7.46,-1.02 -9.33,-2.64a29.14,29.14 0,0 1,-8.67 1.65c-4.06,0 -6.67,-0.9 -8.59,-2.19a80.61,80.61 0,0 1,-37.5 0.61c-5.22,2.24 -10,3.58 -13.92,3.58 -4.56,0 -7.46,-1.02 -9.33,-2.64a29.66,29.66 0,0 1,-8.67 1.65,18.72 18.72,0 0,1 -6.98,-1.18 27.57,27.57 0,0 1,-6.96 1.15c-2.91,0 -5.09,-0.45 -6.88,-1.14a27.09,27.09 0,0 1,-7.12 1.14,16.96 16.96,0 0,1 -7.36,-1.44c-3.9,1.42 -7.58,2.43 -10.64,2.43 -11.76,0 -13.66,-6.1 -9.87,-14.74a9.42,9.42 0,0 1,-0.3 -5.71c-1.15,-3.49 0.42,-8.42 3.81,-14.08 -3.28,-4.26 -0.34,-12 6.13,-20.88a16.48,16.48 0,0 1,1.63 -7.86c0.14,-4.48 3.25,-10.43 8.1,-16.96a11.41,11.41 0,0 1,0.38 -5.63c0.06,-0.32 -0.06,-0.46 0.08,-0.85a51.2,51.2 0,0 1,3.31 -7.5c0.59,-1.02 1.52,-1.92 2.37,-2.86 0.69,-1.42 1.58,-2.91 2.54,-4.43 -6.18,-0.45 -1.1,-7.79 5.82,-13.73 2.7,-8.91 6.46,-17.44 12,-24.85a77.92,77.92 0,0 1,9.06 -16.34c3.82,-8.37 8.86,-16.16 15.47,-22.64 1.66,-3.09 3.46,-6.13 5.46,-9.01 4.08,-7.55 9.39,-14.37 15.92,-20.13 0.74,-0.8 1.38,-1.65 2.14,-2.38 0.61,-0.7 1.02,-1.55 1.66,-2.22a71.71,71.71 0,0 1,19.68 -22.66,69.46 69.46,0 0,1 8.46,-8.48 69.01,69.01 0,0 1,17.2 -14.35c3.81,-4.35 7.97,-8.43 12.88,-11.79a69.28,69.28 0,0 1,24.38 -17.02,69.38 69.38,0 0,1 27.17,-17.49c3.98,-2.64 8.26,-4.96 12.93,-6.82a70.16,70.16 0,0 1,18.35 -9.18c4.61,-2.7 9.54,-5.07 15.01,-6.77a73.65,73.65 0,0 1,30.45 -11.36,76.7 76.7,0 0,1 20.35,-5.6 81.76,81.76 0,0 1,26.7 -5.23,82.83 82.83,0 0,1 26.29,-4.72 89.38,89.38 0,0 1,26.37 -1.22,90.72 90.72,0 0,1 13.14,-1.02c3.42,0 6.72,0.21 9.92,0.54 0.21,0 0.37,-0.05 0.58,-0.05 3.81,0 7.42,0.29 10.94,0.7 1.36,-0.06 2.67,-0.21 4.06,-0.21a87,87 0,0 1,21.44 2.67,86.24 86.24,0 0,1 17.44,2.37 83.94,83.94 0,0 1,26.34 4.29c9.07,0.64 16.99,2.94 24.32,5.92 7.26,1.18 13.66,3.5 19.66,6.3a72.19,72.19 0,0 1,30.16 11.44c8.42,2.14 16.48,5.7 23.94,10.48a86.08,86.08 0,0 1,16.69 7.84l-2.02,-1.57 1.58,1.01c3.76,2.35 7.06,5.18 10.34,8.03 0.43,0.22 0.83,0.51 1.25,0.74 13.68,4.24 24.5,12 32.78,21.73 4.4,2.93 8.62,6.18 12.5,10.02l0.35,0.45c0.32,0.22 0.58,0.51 0.9,0.74 6.5,3.3 10.61,6.9 20.75,14.82 4.67,3.65 8.54,8.51 11.81,13.95 1.12,0.99 2.08,2.13 3.14,3.17 7.62,5.3 13.73,12.03 18.66,19.54a83.58,83.58 0,0 1,16.27 19.87c8.99,8.64 15.62,19.46 19.84,31.36 4.46,5.25 8.08,11.15 10.98,17.41 2.86,3.47 5.58,7.06 7.82,10.9 4.26,7.28 6.78,15.07 8.43,22.99l0.03,0.05c2.91,4.32 6.08,9.71 8.06,15.34 5.2,7.81 8.8,16.29 9.46,25.14 5.7,8.98 8.91,17.3 8.21,23.33 0.66,2.37 1.1,4.64 1.06,6.64 2.27,5.17 3.42,9.87 2.93,13.62 6.94,14.02 6.32,25.09 -9.73,25.09z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M930.82,905.71C907.26,780.8 832,674.82 719.36,607.23c-43.01,-27.14 -131.07,-55.81 -222.72,-55.81h-15.36C290.82,565.25 131.58,711.17 93.7,905.71c-1.02,5.12 -0.51,13.84 4.61,18.96 0.51,0.51 0.51,1.01 1.02,1.55 3.58,4.59 9.73,7.15 16.38,7.15L908.8,933.38c6.66,0 12.8,-2.56 16.38,-7.15 5.14,-6.66 6.66,-13.31 5.63,-20.51zM904.83,921.12c-2.83,0 -6.11,-0.96 -9.55,-2.32 -1.06,0.16 -2.16,0.32 -3.46,0.32 -2.03,0 -4.27,-0.45 -6.62,-1.18a21.23,21.23 0,0 1,-7.38 1.18c-2.86,0 -6.16,-0.96 -9.63,-2.34a17.23,17.23 0,0 1,-9.38 2.34c-0.96,0 -1.98,-0.19 -3.01,-0.35 -3.42,2.21 -8.58,2.3 -13.95,1.31l0.45,0.18 -1.5,-0.13c-0.74,-0.06 -1.49,-0.37 -2.22,-0.48 -3.02,1.44 -6.99,1.49 -10.78,1.49h-1.01c-3.47,0 -7.23,-1.22 -11.01,-2.78 -1.49,0.11 -2.91,0.34 -4.48,0.34 -1.02,0 -1.94,-0.19 -2.96,-0.22a87.26,87.26 0,0 1,-29.95 1.63c-1.94,0.14 -3.79,0.59 -5.76,0.59L772,920.69c-5.41,0 -10.66,-0.7 -15.78,-1.78a88.99,88.99 0,0 1,-25.92 -1.22c-1.01,0.05 -1.95,0.32 -2.96,0.32h-2.67c-3.28,0 -6.4,-0.59 -9.6,-0.99 -5.44,0.83 -10.91,1.5 -16.4,1.66 -0.35,0.02 -0.69,-0.08 -1.04,-0.08 -4.45,0.8 -8.98,1.41 -13.63,1.41h-2.66c-1.79,0 -3.52,-0.37 -5.28,-0.5 -3.73,0.45 -7.52,0.69 -11.39,0.5 -8.21,-0.4 -17.06,-1.09 -25.23,-3.42 -5.07,2.16 -9.71,3.42 -13.57,3.42 -5.33,0 -8.61,-1.28 -10.34,-3.44 -3.9,1.44 -7.62,2.43 -10.67,2.43 -3.26,0 -5.55,-0.61 -7.41,-1.46 -3.89,1.42 -7.57,2.45 -10.59,2.45 -4.58,0 -7.47,-1.02 -9.34,-2.64a29.65,29.65 0,0 1,-8.66 1.65,18.72 18.72,0 0,1 -6.86,-1.12 31.41,31.41 0,0 1,-10.14 2.13c-5.18,0 -8.48,-1.18 -10.24,-3.23a87.5,87.5 0,0 1,-18.34 1.9c-8.99,0 -17.14,-1.28 -24.56,-3.5 -7.7,2.45 -16,4.16 -25.44,4.16a84.86,84.86 0,0 1,-25.92 -3.86,84.16 84.16,0 0,1 -25.41,3.86 84.66,84.66 0,0 1,-23.04 -3.17c-4.46,1.76 -8.61,2.85 -12.05,2.85 -3.18,0 -5.57,-0.5 -7.34,-1.36 -2.75,0.8 -5.38,1.36 -7.66,1.36 -3.3,0 -5.58,-0.61 -7.44,-1.49 -1.22,0.21 -2.48,0.48 -3.57,0.48 -2.14,0 -3.78,-0.32 -5.31,-0.69l-0.27,0.02c-2.96,0 -5.81,-0.18 -8.61,-0.42 -4.78,1.95 -9.17,3.09 -12.82,3.09 -3.98,0 -6.56,-0.86 -8.46,-2.11 -3.66,0.48 -7.46,0.78 -11.44,0.78 -1.6,0 -3.04,-0.22 -4.58,-0.34a29.73,29.73 0,0 1,-8.53 1.66c-4.61,0 -7.54,-1.04 -9.41,-2.69 -5.04,2.16 -9.78,3.68 -13.6,3.68 -4.35,0 -7.14,-0.98 -9.02,-2.45 -2.88,0.86 -5.62,1.46 -7.97,1.46 -4.56,0 -7.46,-1.02 -9.33,-2.64a29.14,29.14 0,0 1,-8.67 1.65c-4.06,0 -6.67,-0.9 -8.59,-2.19a80.61,80.61 0,0 1,-37.5 0.61c-5.22,2.24 -10,3.58 -13.92,3.58 -4.56,0 -7.46,-1.02 -9.33,-2.64a29.66,29.66 0,0 1,-8.67 1.65,18.72 18.72,0 0,1 -6.98,-1.18 27.57,27.57 0,0 1,-6.96 1.15c-2.91,0 -5.09,-0.45 -6.88,-1.14a27.09,27.09 0,0 1,-7.12 1.14,16.96 16.96,0 0,1 -7.36,-1.44c-3.9,1.42 -7.58,2.43 -10.64,2.43 -11.76,0 -13.66,-6.1 -9.87,-14.74a9.42,9.42 0,0 1,-0.3 -5.71c-1.15,-3.49 0.42,-8.42 3.81,-14.08 -3.28,-4.26 -0.34,-12 6.13,-20.88a16.48,16.48 0,0 1,1.63 -7.86c0.14,-4.48 3.25,-10.43 8.1,-16.96a11.41,11.41 0,0 1,0.38 -5.63c0.06,-0.32 -0.06,-0.46 0.08,-0.85a51.2,51.2 0,0 1,3.31 -7.5c0.59,-1.02 1.52,-1.92 2.37,-2.86 0.69,-1.42 1.58,-2.91 2.54,-4.43 -6.18,-0.45 -1.1,-7.79 5.82,-13.73 2.7,-8.91 6.46,-17.44 12,-24.85a77.92,77.92 0,0 1,9.06 -16.34c3.82,-8.37 8.86,-16.16 15.47,-22.64 1.66,-3.09 3.46,-6.13 5.46,-9.01 4.08,-7.55 9.39,-14.37 15.92,-20.13 0.74,-0.8 1.38,-1.65 2.14,-2.38 0.61,-0.7 1.02,-1.55 1.66,-2.22a71.71,71.71 0,0 1,19.68 -22.66,69.46 69.46,0 0,1 8.46,-8.48 69.01,69.01 0,0 1,17.2 -14.35c3.81,-4.35 7.97,-8.43 12.88,-11.79a69.28,69.28 0,0 1,24.38 -17.02,69.38 69.38,0 0,1 27.17,-17.49c3.98,-2.64 8.26,-4.96 12.93,-6.82a70.16,70.16 0,0 1,18.35 -9.18c4.61,-2.7 9.54,-5.07 15.01,-6.77a73.65,73.65 0,0 1,30.45 -11.36,76.7 76.7,0 0,1 20.35,-5.6 81.76,81.76 0,0 1,26.7 -5.23,82.83 82.83,0 0,1 26.29,-4.72 89.38,89.38 0,0 1,26.37 -1.22,90.72 90.72,0 0,1 13.14,-1.02c3.42,0 6.72,0.21 9.92,0.54 0.21,0 0.37,-0.05 0.58,-0.05 3.81,0 7.42,0.29 10.94,0.7 1.36,-0.06 2.67,-0.21 4.06,-0.21a87,87 0,0 1,21.44 2.67,86.24 86.24,0 0,1 17.44,2.37 83.94,83.94 0,0 1,26.34 4.29c9.07,0.64 16.99,2.94 24.32,5.92 7.26,1.18 13.66,3.5 19.66,6.3a72.19,72.19 0,0 1,30.16 11.44c8.42,2.14 16.48,5.7 23.94,10.48a86.08,86.08 0,0 1,16.69 7.84l-2.02,-1.57 1.58,1.01c3.76,2.35 7.06,5.18 10.34,8.03 0.43,0.22 0.83,0.51 1.25,0.74 13.68,4.24 24.5,12 32.78,21.73 4.4,2.93 8.62,6.18 12.5,10.02l0.35,0.45c0.32,0.22 0.58,0.51 0.9,0.74 6.5,3.3 10.61,6.9 20.75,14.82 4.67,3.65 8.54,8.51 11.81,13.95 1.12,0.99 2.08,2.13 3.14,3.17 7.62,5.3 13.73,12.03 18.66,19.54a83.58,83.58 0,0 1,16.27 19.87c8.99,8.64 15.62,19.46 19.84,31.36 4.46,5.25 8.08,11.15 10.98,17.41 2.86,3.47 5.58,7.06 7.82,10.9 4.26,7.28 6.78,15.07 8.43,22.99l0.03,0.05c2.91,4.32 6.08,9.71 8.06,15.34 5.2,7.81 8.8,16.29 9.46,25.14 5.7,8.98 8.91,17.3 8.21,23.33 0.66,2.37 1.1,4.64 1.06,6.64 2.27,5.17 3.42,9.87 2.93,13.62 6.94,14.02 6.32,25.09 -9.73,25.09z" />
+    <path
+        android:fillColor="#757575"
+        android:pathData="M512,65.54c-129.02,0 -235.52,106.5 -235.52,235.52S382.98,536.58 512,536.58s235.54,-106.5 235.54,-235.52S641.02,65.54 512,65.54zM699.25,316.29a91.81,91.81 0,0 1,-3.98 25.2,87.31 87.31,0 0,1 -7.23,25.79 81.76,81.76 0,0 1,-8 18.85c-4.54,11.2 -11.25,21.44 -20.61,29.36a67.84,67.84 0,0 1,-13.58 15.23,70.24 70.24,0 0,1 -28.35,24.53 69.18,69.18 0,0 1,-23.7 14.59,72.26 72.26,0 0,1 -29.95,12.67c-5.2,1.71 -10.96,2.72 -16.98,3.38a85.54,85.54 0,0 1,-24.19 3.39c-1.18,0 -2.27,-0.18 -3.42,-0.22 -1.54,0.08 -3.01,0.22 -4.58,0.22a96.48,96.48 0,0 1,-7.89 -0.38c-1.81,0.16 -3.55,0.38 -5.44,0.38a84.8,84.8 0,0 1,-26.1 -3.9c-18.96,-0.54 -34.3,-6.56 -46.02,-16a69.82,69.82 0,0 1,-32.14 -21.15,78.03 78.03,0 0,1 -30.86,-28.74 75.09,75.09 0,0 1,-10.66 -15.62,78.7 78.7,0 0,1 -14.18,-24.32 85.76,85.76 0,0 1,-6.14 -18.82,85.73 85.73,0 0,1 -8.72,-29.2 91.84,91.84 0,0 1,-2.91 -39.23,90.99 90.99,0 0,1 4.75,-33.58c0.98,-3.84 2.22,-7.58 3.66,-11.25a85.6,85.6 0,0 1,8.24 -24.58,76.91 76.91,0 0,1 18.72,-30.1 73.6,73.6 0,0 1,20.16 -25.92c4.14,-4.86 8.91,-9.22 14.38,-12.9a69.76,69.76 0,0 1,27.66 -18c2.91,-1.52 5.7,-3.18 8.91,-4.35 10.11,-6.96 22.67,-11.39 37.44,-12.54a80.32,80.32 0,0 1,18.64 -4.67,86.08 86.08,0 0,1 51.12,0.21h0.03A78.4,78.4 0,0 1,575.36 124c17.1,2.96 30.62,10.86 40.64,21.6a68.42,68.42 0,0 1,27.66 20.3,73.62 73.62,0 0,1 22.45,29.3c1.46,2.4 2.88,4.82 4.16,7.3 10.99,11.58 17.86,26.53 20.5,42.34 1.54,3.76 2.7,7.66 3.7,11.63 5.18,13.15 6.77,27.66 5.36,41.84a93.07,93.07 0,0 1,-0.54 16.35c-0.03,0.54 0.03,1.09 -0.03,1.63zM943.63,903.17c-24.59,-131.07 -102.4,-238.59 -217.09,-307.2 -43.54,-27.14 -132.61,-57.86 -229.89,-57.86 -5.12,0 -10.75,0 -15.87,0.51C284.16,552.98 120.32,702.46 81.41,903.17c-2.05,10.24 0,22.51 8.19,30.72 6.14,8.19 16.38,12.29 26.62,12.29L908.8,946.18c10.24,0 20.48,-4.1 26.62,-12.29 6.14,-8.21 10.24,-18.43 8.21,-30.72zM904.83,921.12c-1.95,0 -4.08,-0.38 -6.34,-1.06h-45.68c-3.12,0.86 -6.98,0.74 -10.94,0.02l0.45,0.18 -1.5,-0.13c-0.1,0 -0.19,-0.05 -0.29,-0.06h-2.8c-2.91,1.06 -6.48,1.06 -9.92,1.06L826.8,921.12c-1.79,0 -3.74,-0.58 -5.66,-1.06h-22.14a94.02,94.02 0,0 1,-10.35 0.61c-3.54,0 -6.91,-0.24 -10.19,-0.59 -1.95,0.14 -3.82,0.59 -5.81,0.59L772,920.67c-2.02,0 -3.92,-0.45 -5.9,-0.61L284.29,920.06c-2.3,0.59 -4.48,0.94 -6.42,0.94 -2.69,0 -4.83,-0.34 -6.56,-0.94L189.28,920.06c-2.3,0.59 -4.48,0.94 -6.42,0.94 -2.69,0 -4.83,-0.34 -6.56,-0.94h-51.01c-2.3,0.59 -4.48,0.94 -6.42,0.94 -6.02,0 -9.26,-1.71 -10.74,-4.4 -0.4,-0.38 -0.67,-0.91 -1.14,-1.14 -1.02,-1.01 -2.05,-4.1 -1.02,-7.66 0.69,-3.52 1.57,-6.96 2.34,-10.43a16.32,16.32 0,0 1,1.04 -4.64c0.66,-2.8 1.6,-5.46 2.3,-8.22 -1.15,-3.58 0.46,-8.62 4.05,-14.46 5.26,-18.24 11.23,-36.13 18.67,-53.2a9.73,9.73 0,0 1,1.98 -4.26,431.81 431.81,0 0,1 75.12,-114.77c2.74,-3.36 5.79,-6.43 9.14,-9.26a424.8,424.8 0,0 1,44.46 -40.26c4.22,-4.1 9.04,-7.66 14.4,-10.67 4.35,-3.07 8.72,-6.16 13.2,-9.06a69.18,69.18 0,0 1,16.9 -10.27,406.24 406.24,0 0,1 53.46,-26.37 74.43,74.43 0,0 1,25.33 -9.18c2.35,-0.77 4.64,-1.68 7.01,-2.4a395.66,395.66 0,0 1,86.42 -16.59c4.61,0.5 9.73,0 14.85,0 29.65,0 58.85,3.1 86.21,8.16 1.41,0.24 2.83,0.48 4.19,0.8 3.95,0.77 7.76,1.65 11.65,2.48a79.2,79.2 0,0 1,18.35 4.35c40.05,10.3 73.95,24.3 95.66,37.95h0.51c7.34,4.35 14.5,8.93 21.52,13.63a69.44,69.44 0,0 1,10.86 7.62,447.25 447.25,0 0,1 39.98,32.24l2.34,1.82c2.06,1.62 3.97,3.47 5.76,5.49a424.8,424.8 0,0 1,53.14 61.47c1.04,1.42 2.1,2.82 3.04,4.3a419.38,419.38 0,0 1,48.85 93.54c0.19,0.45 0.34,0.91 0.51,1.36 2.21,6 4.13,12.13 5.95,18.29 3.89,7.07 5.94,13.47 5.44,18.4 0.59,1.97 1.02,3.86 1.14,5.58l0.85,3.23c1.26,3.23 2,6.22 2.14,8.9 0.46,2.14 1.09,4.21 1.54,6.34 4.99,12.16 3.22,21.41 -11.44,21.41z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M512,98.82c-111.62,0 -202.24,90.62 -202.24,202.24s90.62,202.24 202.24,202.24c111.63,0 202.26,-90.62 202.26,-202.24S623.63,98.82 512,98.82zM699.25,316.29a91.81,91.81 0,0 1,-3.98 25.2,87.31 87.31,0 0,1 -7.23,25.79 81.76,81.76 0,0 1,-8 18.85c-4.54,11.2 -11.25,21.44 -20.61,29.36a67.84,67.84 0,0 1,-13.58 15.23,70.24 70.24,0 0,1 -28.35,24.53 69.18,69.18 0,0 1,-23.7 14.59,72.26 72.26,0 0,1 -29.95,12.67c-5.2,1.71 -10.96,2.72 -16.98,3.38a85.54,85.54 0,0 1,-24.19 3.39c-1.18,0 -2.27,-0.18 -3.42,-0.22 -1.54,0.08 -3.01,0.22 -4.58,0.22a96.48,96.48 0,0 1,-7.89 -0.38c-1.81,0.16 -3.55,0.38 -5.44,0.38a84.8,84.8 0,0 1,-26.1 -3.9c-18.96,-0.54 -34.3,-6.56 -46.02,-16a69.82,69.82 0,0 1,-32.14 -21.15,78.03 78.03,0 0,1 -30.86,-28.74 75.09,75.09 0,0 1,-10.66 -15.62,78.7 78.7,0 0,1 -14.18,-24.32 85.76,85.76 0,0 1,-6.14 -18.82,85.73 85.73,0 0,1 -8.72,-29.2 91.84,91.84 0,0 1,-2.91 -39.23,90.99 90.99,0 0,1 4.75,-33.58c0.98,-3.84 2.22,-7.58 3.66,-11.25a85.6,85.6 0,0 1,8.24 -24.58,76.91 76.91,0 0,1 18.72,-30.1 73.6,73.6 0,0 1,20.16 -25.92c4.14,-4.86 8.91,-9.22 14.38,-12.9a69.76,69.76 0,0 1,27.66 -18c2.91,-1.52 5.7,-3.18 8.91,-4.35 10.11,-6.96 22.67,-11.39 37.44,-12.54a80.32,80.32 0,0 1,18.64 -4.67,86.08 86.08,0 0,1 51.12,0.21h0.03A78.4,78.4 0,0 1,575.36 124c17.1,2.96 30.62,10.86 40.64,21.6a68.42,68.42 0,0 1,27.66 20.3,73.62 73.62,0 0,1 22.45,29.3c1.46,2.4 2.88,4.82 4.16,7.3 10.99,11.58 17.86,26.53 20.5,42.34 1.54,3.76 2.7,7.66 3.7,11.63 5.18,13.15 6.77,27.66 5.36,41.84a93.07,93.07 0,0 1,-0.54 16.35c-0.03,0.54 0.03,1.09 -0.03,1.63z" />
+    <path
+        android:fillColor="#757575"
+        android:pathData="M512,86.02c-118.78,0 -215.04,96.26 -215.04,215.04 0,118.78 96.26,215.04 215.04,215.04s215.02,-96.26 215.02,-215.04c0,-118.78 -96.24,-215.04 -215.02,-215.04zM582.46,476.75a74.35,74.35 0,0 1,-10.56 3.87A188.02,188.02 0,0 1,512 490.5c-15.66,0 -30.8,-2.13 -45.36,-5.74a75.26,75.26 0,0 1,-29.65 -9.87,190.72 190.72,0 0,1 -61.42,-42.91c-0.21,-0.22 -0.43,-0.42 -0.62,-0.64a188.88,188.88 0,0 1,-51.63 -115.12,93.12 93.12,0 0,1 -0.64,-12.67c0,-0.83 -0.13,-1.65 -0.13,-2.48 0,-6.03 0.38,-11.97 0.94,-17.86 0.32,-5.25 1.04,-10.43 2.24,-15.52 2.02,-11.22 5.38,-21.89 9.3,-32.3a81.09,81.09 0,0 1,3.97 -9.95c0.74,-1.68 1.25,-3.47 2.03,-5.12a78.56,78.56 0,0 1,10.61 -19.44c4.21,-6.72 8.8,-13.17 13.78,-19.31l0.05,-0.06 0.02,-0.02c3.57,-5.1 7.86,-9.71 12.72,-13.79 1.17,-1.18 2.18,-2.51 3.38,-3.66 2.67,-2.85 5.55,-5.55 8.72,-7.94 1.23,-1.02 2.66,-1.81 3.92,-2.8a69.28,69.28 0,0 1,23.49 -15.94c6.74,-3.87 13.58,-7.6 20.8,-10.66 3.95,-1.97 8.19,-3.6 12.7,-4.86a190.19,190.19 0,0 1,41.33 -9.06A88.1,88.1 0,0 1,512 110.62c6.67,0 12.91,0.69 18.7,1.95 6.66,0.66 13.17,1.73 19.6,3.06 5.89,0.85 11.38,2.24 16.45,4.14 5.74,1.74 11.34,3.82 16.86,6.08a71.04,71.04 0,0 1,23.7 11.66c7.47,4.37 14.56,9.31 21.34,14.62a70.4,70.4 0,0 1,14.99 13.14c0.94,0.91 1.74,1.94 2.67,2.85 4.96,4.24 9.26,9.04 12.85,14.35a188.27,188.27 0,0 1,39.98 90.26c0.58,3.15 1.02,6.34 1.28,9.57 0.62,6.18 1.01,12.42 1.01,18.75 0,79.54 -49.34,147.66 -118.98,175.7z" />
+</vector>
diff --git a/home/src/main/res/drawable/img_course.png b/home/src/main/res/drawable/img_course.png
new file mode 100644
index 0000000..a8ddceb
Binary files /dev/null and b/home/src/main/res/drawable/img_course.png differ
diff --git a/home/src/main/res/layout/fragment_home.xml b/home/src/main/res/layout/fragment_home.xml
index 868e51d..a34f41e 100644
--- a/home/src/main/res/layout/fragment_home.xml
+++ b/home/src/main/res/layout/fragment_home.xml
@@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout
-    >
+<layout xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
 
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_title_fragment"
+        <com.youth.banner.Banner
+            android:id="@+id/banner_home"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:text="HomeFragment"
-            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_height="120dp"
+            android:layout_margin="8dp"
+            app:banner_radius="6dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/login/src/debug/AndroidManifest.xml b/login/src/debug/AndroidManifest.xml
index 7583558..24dcc92 100644
--- a/login/src/debug/AndroidManifest.xml
+++ b/login/src/debug/AndroidManifest.xml
@@ -11,7 +11,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/CommonTheme">
         <activity
-            android:name=".LoginActivity"
+            android:name=".ui.LoginActivity"
             android:label="@string/modelu_name">
 <!--            <intent-filter>-->
 <!--                <action android:name="android.intent.action.MAIN" />-->
diff --git a/login/src/debug/java/login/LoginActivity.kt b/login/src/debug/java/login/ui/LoginActivity.kt
similarity index 95%
rename from login/src/debug/java/login/LoginActivity.kt
rename to login/src/debug/java/login/ui/LoginActivity.kt
index 949f596..55198ec 100644
--- a/login/src/debug/java/login/LoginActivity.kt
+++ b/login/src/debug/java/login/ui/LoginActivity.kt
@@ -1,15 +1,15 @@
-package login
+package login.ui
 
 import com.alibaba.android.arouter.facade.annotation.Route
-import com.alibaba.android.arouter.launcher.ARouter
 import com.blankj.utilcode.util.ToastUtils
 import com.cniao5.common.base.BaseActivity
 import com.cniao5.common.ktx.context
 import com.cniao5.common.network.config.SP_KEY_USER_TOKEN
 import com.cniao5.common.utils.MySpUtils
 import com.test.service.repo.DbHelper
+import login.LoginViewModel
+import login.R
 import login.databinding.ActivityLoginBinding
-import login.net.LoginRsp
 import login.net.RegisterRsp
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
diff --git a/login/src/main/AndroidManifest.xml b/login/src/main/AndroidManifest.xml
index e95d59f..961de1d 100644
--- a/login/src/main/AndroidManifest.xml
+++ b/login/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     package="login">
 
     <application>
-        <activity android:name=".LoginActivity"
+        <activity android:name=".ui.LoginActivity"
             android:launchMode="singleTop">
         </activity>
     </application>
diff --git a/mine/src/main/java/com/cniao5/mine/LibMine.kt b/mine/src/main/java/com/cniao5/mine/LibMine.kt
index 4061acc..e140482 100644
--- a/mine/src/main/java/com/cniao5/mine/LibMine.kt
+++ b/mine/src/main/java/com/cniao5/mine/LibMine.kt
@@ -5,7 +5,6 @@ import com.cniao5.common.utils.getBaseHost
 import com.cniao5.mine.net.MineService
 import com.cniao5.mine.repo.IMineResource
 import com.cniao5.mine.repo.MineRepo
-import com.cniao5.mine.ui.MineViewModel
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.parameter.parametersOf
 import org.koin.dsl.bind
diff --git a/mine/src/main/java/com/cniao5/mine/ui/MineViewModel.kt b/mine/src/main/java/com/cniao5/mine/MineViewModel.kt
similarity index 97%
rename from mine/src/main/java/com/cniao5/mine/ui/MineViewModel.kt
rename to mine/src/main/java/com/cniao5/mine/MineViewModel.kt
index 7ef562e..b975686 100644
--- a/mine/src/main/java/com/cniao5/mine/ui/MineViewModel.kt
+++ b/mine/src/main/java/com/cniao5/mine/MineViewModel.kt
@@ -1,4 +1,4 @@
-package com.cniao5.mine.ui
+package com.cniao5.mine
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
diff --git a/mine/src/main/java/com/cniao5/mine/ui/MineFragment.kt b/mine/src/main/java/com/cniao5/mine/ui/MineFragment.kt
index bfaab7f..9abf636 100644
--- a/mine/src/main/java/com/cniao5/mine/ui/MineFragment.kt
+++ b/mine/src/main/java/com/cniao5/mine/ui/MineFragment.kt
@@ -1,20 +1,16 @@
 package com.cniao5.mine.ui
 
 import android.os.Bundle
-import android.util.Log
 import android.view.View
 import androidx.databinding.ViewDataBinding
 import androidx.navigation.fragment.findNavController
 import com.alibaba.android.arouter.launcher.ARouter
-import com.blankj.utilcode.util.LogUtils
-import com.blankj.utilcode.util.ToastUtils
 import com.cniao5.common.base.BaseFragment
 import com.cniao5.common.network.config.SP_KEY_USER_TOKEN
 import com.cniao5.common.utils.MySpUtils
+import com.cniao5.mine.MineViewModel
 import com.cniao5.mine.R
 import com.cniao5.mine.databinding.FragmentMineBinding
-import com.cniao5.mine.net.UserInfoRsp
-import com.cniao5.mine.repo.UserInfoRspDB
 import com.cniao5.mine.repo.UserInfoRspDBHelper
 import com.test.service.repo.DbHelper
 import org.koin.androidx.viewmodel.ext.android.viewModel
diff --git a/mine/src/main/res/layout/fragment_mine.xml b/mine/src/main/res/layout/fragment_mine.xml
index 0192636..9893f9f 100644
--- a/mine/src/main/res/layout/fragment_mine.xml
+++ b/mine/src/main/res/layout/fragment_mine.xml
@@ -7,7 +7,7 @@
 
         <variable
             name="vm"
-            type="com.cniao5.mine.ui.MineViewModel" />
+            type="com.cniao5.mine.MineViewModel" />
 
         <import type="android.view.View"/>
 
diff --git a/service/src/main/res/values/colors.xml b/service/src/main/res/values/colors.xml
index ef143d7..abbdda4 100644
--- a/service/src/main/res/values/colors.xml
+++ b/service/src/main/res/values/colors.xml
@@ -137,4 +137,142 @@
     <color name="tooltip_background_light">#e6ffffff</color>
     <color name="white">#ffffffff</color>
 
+    <color name="snow">#fffafa</color><!--雪白色 -->
+    <color name="floralwhite">#fffaf0</color><!--花白色 -->
+    <color name="blanchedalmond">#ffebcd</color><!--杏白色 -->
+    <color name="ghostwhite">#f8f8ff</color><!--幽灵白 -->
+    <color name="whitesmoke">#f5f5f5</color><!--烟白色 -->
+    <color name="antiquewhite">#faebd7</color><!--古董白 -->
+    <color name="navajowhite">#ffdead</color><!--纳瓦白 -->
+    <color name="grey">#808080</color><!--灰色 -->
+    <color name="gainsboro">#dcdcdc</color><!--淡灰色 -->
+    <color name="lightgrey">#d3d3d3</color><!--亮灰色 -->
+    <color name="darkgrey">#a9a9a9</color><!--暗灰色 -->
+    <color name="dimgrey">#696969</color><!--暗灰色 -->
+    <color name="slategrey">#708090</color><!--灰石色 -->
+    <color name="lightslategrey">#778899</color><!--亮蓝灰 -->
+    <color name="darkslategrey">#2f4f4f</color><!--暗瓦灰色 -->
+    <color name="silver">#c0c0c0</color><!--银色 -->
+
+    <color name="red">#ff0000</color><!--红色 -->
+    <color name="darkred">#8b0000</color><!--暗红色 -->
+    <color name="crimson">#dc143c</color><!--暗深红色 -->
+    <color name="darkmagenta">#8b008b</color><!--暗洋红 -->
+    <color name="fuchsia">#ff00ff</color><!--紫红色 -->
+    <color name="tomato">#ff6347</color><!--西红柿色 -->
+    <color name="lightcoral">#f08080</color><!--亮珊瑚色 -->
+    <color name="darksalmon">#e9967a</color><!--暗肉色 -->
+    <color name="peachpuff">#ffdab9</color><!--桃色 -->
+    <color name="plum">#dda0dd</color><!--洋李色 -->
+    <color name="pink">#ffc0cb</color><!--粉红色 -->
+    <color name="lightpink">#ffb6c1</color><!--亮粉红色 -->
+    <color name="deeppink">#ff1493</color><!--深粉红色 -->
+    <color name="hotpink">#ff69b4</color><!--热粉红色 -->
+    <color name="lavenderblush">#fff0f5</color><!--淡紫红 -->
+    <color name="indianred">#cd5c5c</color><!--印第安红 -->
+    <color name="rosybrown">#bc8f8f</color><!--褐玫瑰红 -->
+    <color name="firebrick">#b22222</color><!--红砖色 -->
+    <color name="maroon">#800000</color><!--粟色 -->
+    <color name="honeydew">#f0fff0</color><!--蜜色 -->
+    <color name="orangered">#ff4500</color><!--红橙色 -->
+    <color name="orange">#ffa500</color><!--橙色 -->
+    <color name="limegreen">#32cd32</color><!--橙绿色 -->
+    <color name="lime">#00ff00</color><!--酸橙色 -->
+    <color name="yellow">#ffff00</color><!--黄色 -->
+    <color name="wheat">#f5deb3</color><!--浅黄色 -->
+    <color name="khaki">#f0e68c</color><!--黄褐色 -->
+    <color name="burlywood">#deb887</color><!--实木色 -->
+    <color name="bisque">#ffe4c4</color><!--桔黄色 -->
+    <color name="lightyellow">#ffffe0</color><!--亮黄色 -->
+    <color name="darkgoldenrod">#b8860b</color><!--暗金黄色 -->
+    <color name="darkorange">#ff8c00</color><!--暗桔黄色 -->
+    <color name="lightgoldenrodyellow">#fafad2</color><!--亮金黄色 -->
+    <color name="lemonchiffon">#fffacd</color><!--柠檬绸色 -->
+    <color name="cornsilk">#fff8dc</color><!--米绸色 -->
+    <color name="seaShell">#fff5ee</color><!--海贝色 -->
+    <color name="papayawhip">#ffefd5</color><!--番木色 -->
+    <color name="mistyrose">#ffe4e1</color><!--浅玫瑰色 -->
+    <color name="moccasin">#ffe4b5</color><!--鹿皮色 -->
+    <color name="ivory">#fffff0</color><!--象牙色 -->
+    <color name="gold">#ffd700</color><!--金色 -->
+    <color name="goldenrod">#daa520</color><!--金麒麟色 -->
+    <color name="lightsalmon">#ffa07a</color><!--亮肉色 -->
+    <color name="coral">#ff7f50</color><!--珊瑚色 -->
+    <color name="mintcream">#f5fffa</color><!--薄荷色 -->
+    <color name="beige">#f5f5dc</color><!--米色 -->
+    <color name="sandybrown">#f4a460</color><!--沙褐色 -->
+    <color name="oldlace">#fdf5e6</color><!--老花色 -->
+    <color name="linen">#faf0e6</color><!--亚麻色 -->
+    <color name="salmon">#fa8072</color><!--鲜肉色 -->
+    <color name="thistle">#d8bfd8</color><!--蓟色 -->
+    <color name="tan">#d2b48c</color><!--茶色 -->
+    <color name="chocolate">#d2691e</color><!--巧可力色 -->
+    <color name="peru">#cd853f</color><!--秘鲁色 -->
+    <color name="darkkhaki">#bdb76b</color><!--暗黄褐色 -->
+    <color name="palegoldenrod">#eee8aa</color><!--苍麒麟色 -->
+    <color name="brown">#a52a2a</color><!--褐色 -->
+    <color name="saddlebrown">#8b4513</color><!--重褐色 -->
+    <color name="sienna">#a0522d</color><!--赭色 -->
+    <color name="olive">#808000</color><!--橄榄色 -->
+    <color name="chartreuse">#7fff00</color><!--黄绿色 -->
+    <color name="greenyellow">#adff2f</color><!--黄绿色 -->
+    <color name="green">#008000</color><!--绿色 -->
+    <color name="darkgreen">#006400</color><!--暗绿色 -->
+    <color name="darkolivegreen">#556b2f</color><!--暗橄榄绿 -->
+    <color name="olivedrab">#6b8e23</color><!--深绿褐色 -->
+    <color name="lawngreen">#7cfc00</color><!--草绿色 -->
+    <color name="forestgreen">#228b22</color><!--森林绿 -->
+    <color name="aquamarine">#7fffd4</color><!--碧绿色 -->
+    <color name="paleturquoise">#afeeee</color><!--苍宝石绿 -->
+    <color name="palegreen">#98fb98</color><!--苍绿色 -->
+    <color name="mediumturquoise">#48d1cc</color><!--中绿宝石 -->
+    <color name="mediumaquamarine">#66cdaa</color><!--中绿色 -->
+    <color name="aqua">#00ffff</color><!--浅绿色 -->
+    <color name="springgreen">#00ff7f</color><!--春绿色 -->
+    <color name="mediumspringgreen">#00fa9a</color><!--中春绿色 -->
+    <color name="darkturquoise">#00ced1</color><!--暗宝石绿 -->
+    <color name="seagreen">#2e8b57</color><!--海绿色 -->
+    <color name="lightgreen">#90ee90</color><!--亮绿色 -->
+    <color name="darkseagreen">#8fbc8f</color><!--暗海兰色 -->
+    <color name="turquoise">#40e0d0</color><!--青绿色 -->
+    <color name="cyan">#00ffff</color><!--青色 -->
+    <color name="darkcyan">#008b8b</color><!--暗青色 -->
+    <color name="lightcyan">#e0ffff</color><!--亮青色 -->
+    <color name="teal">#008080</color><!--水鸭色 -->
+    <color name="indigo">#4b0082</color><!--靛青色 -->
+    <color name="blue">#0000ff</color><!--蓝色 -->
+    <color name="darkblue">#00008b</color><!--暗蓝色 -->
+    <color name="mediumblue">#0000cd</color><!--中兰色 -->
+    <color name="midnightblue">#191970</color><!--中灰兰色 -->
+    <color name="navy">#000080</color><!--海军色 -->
+    <color name="royalblue">#4169e1</color><!--皇家蓝 -->
+    <color name="azure">#f0ffff</color><!--天蓝色 -->
+    <color name="skyblue">#87ceeb</color><!--天蓝色 -->
+    <color name="deepskyblue">#00bfff</color><!--深天蓝色 -->
+    <color name="lightskyblue">#87cefa</color><!--亮天蓝色 -->
+    <color name="lightseagreen">#20b2aa</color><!--亮海蓝色 -->
+    <color name="lightblue">#add8e6</color><!--亮蓝色 -->
+    <color name="powderblue">#b0e0e6</color><!--粉蓝色 -->
+    <color name="aliceblue">#f0f8ff</color><!--艾利斯兰 -->
+    <color name="mediumslateblue">#7b68ee</color><!--中暗蓝色 -->
+    <color name="slateblue">#6a5acd</color><!--石蓝色 -->
+    <color name="darkslateblue">#483d8b</color><!--暗灰蓝色 -->
+    <color name="mediumseagreen">#3cb371</color><!--中海蓝 -->
+    <color name="steelblue">#4682b4</color><!--钢兰色 -->
+    <color name="lightsteelblue">#b0c4de</color><!--亮钢兰色 -->
+    <color name="cornflowerblue">#6495ed</color><!--菊兰色 -->
+    <color name="dodgerblue">#1e90ff</color><!--闪兰色 -->
+    <color name="cadetblue">#5f9ea0</color><!--军兰色 -->
+    <color name="blueviolet">#8a2be2</color><!--紫罗兰蓝色 -->
+    <color name="purple">#800080</color><!--紫色 -->
+    <color name="lavender">#e6e6fa</color><!--淡紫色 -->
+    <color name="orchid">#da70d6</color><!--淡紫色 -->
+    <color name="mediumpurple">#9370db</color><!--中紫色 -->
+    <color name="darkorchid">#9932cc</color><!--暗紫色 -->
+    <color name="violet">#ee82ee</color><!--紫罗兰色 -->
+    <color name="mediumvioletred">#c71585</color><!--中紫罗兰色 -->
+    <color name="palevioletred">#db7093</color><!--苍紫罗兰色 -->
+    <color name="darkviolet">#9400d3</color><!--暗紫罗兰色 -->
+    <color name="mediumorchid">#ba55d3</color><!--中粉紫色 -->
+
 </resources>
\ No newline at end of file
diff --git a/study/src/main/java/com/cniao5/study/LibStudy.kt b/study/src/main/java/com/cniao5/study/LibStudy.kt
index a9009d1..9099297 100644
--- a/study/src/main/java/com/cniao5/study/LibStudy.kt
+++ b/study/src/main/java/com/cniao5/study/LibStudy.kt
@@ -2,11 +2,9 @@ package com.cniao5.study
 
 import com.cniao5.common.network.KtRetrofit
 import com.cniao5.common.utils.getBaseHost
-import com.cniao5.study.net.StudyInfoRsp
 import com.cniao5.study.net.StudyService
 import com.cniao5.study.repo.IStudyResource
 import com.cniao5.study.repo.StudyResource
-import com.cniao5.study.ui.StudyViewModel
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.parameter.parametersOf
 import org.koin.dsl.bind
diff --git a/study/src/main/java/com/cniao5/study/ui/StudyViewModel.kt b/study/src/main/java/com/cniao5/study/StudyViewModel.kt
similarity index 95%
rename from study/src/main/java/com/cniao5/study/ui/StudyViewModel.kt
rename to study/src/main/java/com/cniao5/study/StudyViewModel.kt
index 109b699..69125a8 100644
--- a/study/src/main/java/com/cniao5/study/ui/StudyViewModel.kt
+++ b/study/src/main/java/com/cniao5/study/StudyViewModel.kt
@@ -1,4 +1,4 @@
-package com.cniao5.study.ui
+package com.cniao5.study
 
 import androidx.databinding.ObservableField
 import androidx.lifecycle.LiveData
@@ -9,6 +9,7 @@ import com.cniao5.study.net.BoughtRsp
 import com.cniao5.study.net.StudiedRsp
 import com.cniao5.study.net.StudyInfoRsp
 import com.cniao5.study.repo.StudyResource
+import com.cniao5.study.ui.StudiedAdapter
 import com.test.service.repo.UserInfo
 
 class StudyViewModel(private val resource: StudyResource) : BaseViewModel() {
diff --git a/study/src/main/java/com/cniao5/study/ui/StudyFragment.kt b/study/src/main/java/com/cniao5/study/ui/StudyFragment.kt
index 4def484..0fa9473 100644
--- a/study/src/main/java/com/cniao5/study/ui/StudyFragment.kt
+++ b/study/src/main/java/com/cniao5/study/ui/StudyFragment.kt
@@ -1,11 +1,12 @@
 package com.cniao5.study.ui
 
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import androidx.databinding.ViewDataBinding
-import androidx.lifecycle.lifecycleScope
 import com.cniao5.common.base.BaseFragment
 import com.cniao5.study.R
+import com.cniao5.study.StudyViewModel
 import com.cniao5.study.databinding.FragmentStudyBinding
 import com.cniao5.study.repo.StudyInfoDbHelper
 import com.google.android.material.tabs.TabLayout
@@ -17,7 +18,7 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 * 学习中心的Fragmennt
 * 传入了R.layout.fragment_course之后就不用写onCreateView,因为布局已经被关联到fragment里了
 * */
-class StudyFragment: BaseFragment() {
+class StudyFragment : BaseFragment() {
 
     private val viewModel: StudyViewModel by viewModel()
 
@@ -38,10 +39,12 @@ class StudyFragment: BaseFragment() {
                     //页面position从0开始
                     // Log.d("yyy","${tab!!.position}")
                 }
+
                 //tab未被选择时回调
                 override fun onTabUnselected(tab: TabLayout.Tab?) {
 
                 }
+
                 //tab重新选择时回调
                 override fun onTabReselected(tab: TabLayout.Tab?) {
 
@@ -65,6 +68,7 @@ class StudyFragment: BaseFragment() {
                 //清空界面上的数据
                 StudyInfoDbHelper.deleteStudyInfo(requireContext())
                 viewModel.obUserInfo.set(it) //数据库发生变化的时候拿到Userinfo的值
+                viewModel.adapter.submit(emptyList()) //清空recyclerview的数据
             } else {
                 viewModel.obUserInfo.set(it) //数据库发生变化的时候拿到Userinfo的值
                 viewModel.getStudyData()
@@ -80,7 +84,7 @@ class StudyFragment: BaseFragment() {
             }
             //已经学习过的课程列表 使用传统加载数据的方式实现
             liveStudyList.observeKt {
-                adapter.submit(it?.datas?: emptyList())
+                adapter.submit(it?.datas ?: emptyList())
             }
 
             //paging分页库加载数据方式实现 挂起函数需要在协程里启动
@@ -96,11 +100,9 @@ class StudyFragment: BaseFragment() {
 
         }
 
-        //studyinfo数据库的数据有变化时触发
+        //studyinfo数据库的数据有变化时触发 用户信息
         StudyInfoDbHelper.getLiveStudyInfo(requireContext()).observeKt { info ->
-            info.let {
-                viewModel.liveStudyInfoR.value = info //清空liveStudyInfoR的数据
-            }
+            viewModel.liveStudyInfoR.value = info //清空liveStudyInfoR的数据
         }
     }
 
diff --git a/study/src/main/java/com/cniao5/study/utils/StudyUtils.kt b/study/src/main/java/com/cniao5/study/utils/StudyUtils.kt
index 253af37..940a88e 100644
--- a/study/src/main/java/com/cniao5/study/utils/StudyUtils.kt
+++ b/study/src/main/java/com/cniao5/study/utils/StudyUtils.kt
@@ -5,7 +5,7 @@ import com.cniao5.study.net.StudiedRsp
 import com.daimajia.numberprogressbar.NumberProgressBar
 
 /**
- *
+ * DataBinding数据解析
  */
 object StudyUtils {
     @JvmStatic
diff --git a/study/src/main/res/layout/fragment_study.xml b/study/src/main/res/layout/fragment_study.xml
index c613677..ca3a75a 100644
--- a/study/src/main/res/layout/fragment_study.xml
+++ b/study/src/main/res/layout/fragment_study.xml
@@ -7,7 +7,7 @@
         <import type="com.cniao5.study.utils.StudyUtils"/>
         <variable
             name="vm"
-            type="com.cniao5.study.ui.StudyViewModel" />
+            type="com.cniao5.study.StudyViewModel" />
 
     </data>