修复bug

Author: zsc-sudo

app/src/main/java/com/uiuang/cloudknowledge/app/http/ApiService.kt

@@ -196,13 +196,13 @@ interface ApiService {
      * 收藏
      */
     @POST("/lg/collect/{id}/json")
-    suspend fun collect(@Path("id") id: Int): ApiResponse<Any>
+    suspend fun collect(@Path("id") id: Int): ApiResponse<Any?>
 
     /**
      * 取消收藏
      */
     @POST("/lg/uncollect_originId/{id}/json")
-    suspend fun unCollect(@Path("id") id: Int): ApiResponse<Any>
+    suspend fun unCollect(@Path("id") id: Int): ApiResponse<Any?>
 
 
     /**
@@ -218,7 +218,7 @@ interface ApiService {
      * 取消收藏网址
      */
     @POST("lg/collect/deletetool/json")
-    suspend fun deletetool(@Query("id") id: Int): ApiResponse<Any?>
+    suspend fun delCollectUrl(@Query("id") id: Int): ApiResponse<Any?>
 
     /**
      * 获取收藏文章数据

app/src/main/java/com/uiuang/cloudknowledge/bean/ArticlesBean.kt

@@ -17,7 +17,7 @@ class ArticlesBean(
     var origin: String? = null,
     var projectLink: String? = null,
     var publishTime: Long = 0,
-    var title: String? = null,
+    var title: String = "",
     var visible: Int? = 0,
     var zan: Int? = 0,
     var order: Int,

app/src/main/java/com/uiuang/cloudknowledge/bean/GankIOResultBean.kt

@@ -20,5 +20,5 @@ data class GankIOResultBean(
     var author: String? = null,
     var images: List<String>? = null,
     var image: String = "",
-    var title: String? = null
+    var title: String = ""
 )

app/src/main/java/com/uiuang/cloudknowledge/bean/WanAndroidBannerBean.kt

@@ -4,7 +4,10 @@ data class WanAndroidBannerBean(
     val desc: String,
     val imagePath: String,
     val title: String,
-    val url: String
+    val url: String,
+    var id: Int = 0,
+    var order: Int = 0,
+    var type: Int = 0
 ) {
 
     /**

app/src/main/java/com/uiuang/cloudknowledge/bean/wan/WebBean.kt

@@ -0,0 +1,14 @@
+package com.uiuang.cloudknowledge.bean.wan
+
+import android.os.Parcelable
+import com.uiuang.cloudknowledge.data.enums.CollectType
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
+data class WebBean(
+    var id: Int,
+    var collect: Boolean,//是否收藏
+    var title: String,
+    var url: String,
+    var collectType: Int = CollectType.Article.type
+) : Parcelable

app/src/main/java/com/uiuang/cloudknowledge/ext/CustomViewExt.kt

@@ -2,30 +2,39 @@ package com.uiuang.cloudknowledge.ext
 
 import android.app.Activity
 import android.content.Context
+import android.content.res.ColorStateList
 import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.GradientDrawable
 import android.view.View
 import android.view.animation.AccelerateInterpolator
 import android.view.animation.DecelerateInterpolator
 import android.view.inputmethod.InputMethodManager
+import android.widget.CompoundButton
 import android.widget.FrameLayout
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.appcompat.widget.AppCompatRadioButton
 import androidx.appcompat.widget.Toolbar
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import com.chad.library.adapter.base.BaseQuickAdapter
+import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.appbar.CollapsingToolbarLayout
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import com.ittianyu.bottomnavigationviewex.BottomNavigationViewEx
 import com.kingja.loadsir.core.LoadService
 import com.kingja.loadsir.core.LoadSir
 import com.uiuang.cloudknowledge.R
+import com.uiuang.cloudknowledge.app.App
 import com.uiuang.cloudknowledge.app.state.ListDataUiState
 import com.uiuang.cloudknowledge.bean.ClassifyResponse
 import com.uiuang.cloudknowledge.ui.fragment.gank.GankFragment
@@ -89,13 +98,13 @@ fun LoadService<*>.showLoading() {
 }
 
 fun loadServiceInit(view: View, callback: () -> Unit): LoadService<Any> {
-    val loadsir = LoadSir.getDefault().register(view) {
+    val loadSir = LoadSir.getDefault().register(view) {
         //点击重试时触发的操作
         callback.invoke()
     }
-    loadsir.showSuccess()
-//    SettingUtil.setLoadingColor(SettingUtil.getColor(appContext), loadsir)
-    return loadsir
+    loadSir.showSuccess()
+    SettingUtil.setLoadingColor(SettingUtil.getColor(appContext), loadSir)
+    return loadSir
 }
 
 //绑定普通的Recyclerview
@@ -144,7 +153,7 @@ fun SwipeRecyclerView.initFooter(loadMoreListener: SwipeRecyclerView.LoadMoreLis
     return footerView
 }
 
-fun RecyclerView.initFloatBtn(floatbtn: FloatingActionButton) {
+fun RecyclerView.initFloatBtn(floatBtn: FloatingActionButton) {
     //监听recyclerview滑动到顶部的时候，需要把向上返回顶部的按钮隐藏
 //    addOnScrollListener(object : RecyclerView.OnScrollListener() {
 //        @SuppressLint("RestrictedApi")
@@ -155,8 +164,8 @@ fun RecyclerView.initFloatBtn(floatbtn: FloatingActionButton) {
 //            }
 //        }
 //    })
-    floatbtn.backgroundTintList = SettingUtil.getOneColorStateList(appContext)
-    floatbtn.setOnClickListener {
+    floatBtn.backgroundTintList = SettingUtil.getOneColorStateList(appContext)
+    floatBtn.setOnClickListener {
         val layoutManager = layoutManager as LinearLayoutManager
         //如果当前recyclerview 最后一个视图位置的索引大于等于40，则迅速返回顶部，否则带有滚动动画效果返回到顶部
         if (layoutManager.findLastVisibleItemPosition() >= 40) {
@@ -223,11 +232,22 @@ fun setUiTheme(color: Int, vararg anyList: Any?) {
                     it.itemIconTintList = SettingUtil.getColorStateList(color)
                     it.itemTextColor = SettingUtil.getColorStateList(color)
                 }
+                is CompoundButton -> it.setTextColor(SettingUtil.getColorStateList(color))
+                is LinearLayout -> it.setBackgroundColor(color)
                 is Toolbar -> it.setBackgroundColor(color)
                 is TextView -> it.setTextColor(color)
-                is LinearLayout -> it.setBackgroundColor(color)
                 is ConstraintLayout -> it.setBackgroundColor(color)
+                is CollapsingToolbarLayout -> it.contentScrim = ColorDrawable(color)
+
+                is AppBarLayout -> it.setBackgroundColor(color)
+                is TabLayout -> {
+                    it.setTabTextColors(ContextCompat.getColor(appContext, R.color.colorGray),color)
+                    it.setSelectedTabIndicatorColor(color)
+                }
+                is View -> it.setBackgroundColor(color)
                 is FrameLayout -> it.setBackgroundColor(color)
+
+
             }
         }
     }

app/src/main/java/com/uiuang/cloudknowledge/ui/adapter/wan/WanAndroidAdapter.kt

@@ -12,9 +12,14 @@ import com.chad.library.adapter.base.viewholder.BaseViewHolder
 import com.uiuang.cloudknowledge.R
 import com.uiuang.cloudknowledge.bean.ArticlesBean
 import com.uiuang.cloudknowledge.utils.DataUtil
+import com.uiuang.cloudknowledge.weight.customview.CollectView
 
 class WanAndroidAdapter(data: MutableList<ArticlesBean>) :
     BaseQuickAdapter<ArticlesBean, BaseViewHolder>(R.layout.item_wan_android, data) {
+
+    private var collectAction: (item: ArticlesBean, v: CollectView, position: Int) -> Unit =
+        { _: ArticlesBean, _: CollectView, _: Int -> }
+
     /**
      * 是我的收藏页进来的，全部是收藏状态。bean里面没有返回isCollect信息
      */
@@ -67,11 +72,13 @@ class WanAndroidAdapter(data: MutableList<ArticlesBean>) :
 
         holder.setText(R.id.tv_time, item.niceDate)
         holder.setText(R.id.tv_title, Html.fromHtml(item.title))
-        if (isCollectList) {
-            val cbCollect = holder.getView<CheckBox>(R.id.cb_collect)
-            cbCollect.isChecked = true
-        }
-
+        holder.getView<CollectView>(R.id.item_home_collect).isChecked = item.collect
+        holder.getView<CollectView>(R.id.item_home_collect)
+            .setOnCollectViewClickListener(object : CollectView.OnCollectViewClickListener {
+                override fun onClick(v: CollectView) {
+                    collectAction.invoke(item, v, holder.adapterPosition)
+                }
+            })
     }
 
     fun setCollectList() {
@@ -86,6 +93,10 @@ class WanAndroidAdapter(data: MutableList<ArticlesBean>) :
         isNoShowAuthorName = true
     }
 
+    fun setCollectClick(inputCollectAction: (item: ArticlesBean, v: CollectView, position: Int) -> Unit) {
+        this.collectAction = inputCollectAction
+    }
+
 
     fun setNoImage(isNoImage: Boolean) {
         this.isNoImage = isNoImage

app/src/main/java/com/uiuang/cloudknowledge/ui/fragment/gank/AndroidFragment.kt

@@ -8,6 +8,8 @@ import com.kingja.loadsir.core.LoadService
 import com.uiuang.cloudknowledge.R
 import com.uiuang.cloudknowledge.app.base.BaseFragment
 import com.uiuang.cloudknowledge.app.http.Constants.TYPE
+import com.uiuang.cloudknowledge.bean.wan.WebBean
+import com.uiuang.cloudknowledge.data.enums.CollectType
 import com.uiuang.cloudknowledge.databinding.FragmentAndroidBinding
 import com.uiuang.cloudknowledge.ext.*
 import com.uiuang.cloudknowledge.ui.adapter.gank.GankAndroidAdapter
@@ -17,14 +19,15 @@ import com.uiuang.cloudknowledge.weight.recyclerview.DefineLoadMoreView
 import com.uiuang.mvvm.ext.nav
 import com.uiuang.mvvm.ext.navigateAction
 import com.yanzhenjie.recyclerview.SwipeRecyclerView
-import kotlinx.android.synthetic.main.fragment_sister.*
+import kotlinx.android.synthetic.main.include_list.*
+import kotlinx.android.synthetic.main.include_recyclerview.*
 
 
 class AndroidFragment : BaseFragment<HomeViewModel, FragmentAndroidBinding>() {
     private var type: String? = null
 
     //界面状态管理者
-    private lateinit var loadsir: LoadService<Any>
+    private lateinit var loadSir: LoadService<Any>
 
     //请求ViewModel
     private val requestGankViewModel: RequestGankViewModel by viewModels()
@@ -45,17 +48,17 @@ class AndroidFragment : BaseFragment<HomeViewModel, FragmentAndroidBinding>() {
         }
     }
 
-    override fun layoutId(): Int = R.layout.fragment_android
+    override fun layoutId(): Int = R.layout.include_list
 
     override fun initView(savedInstanceState: Bundle?) {
         arguments?.let {
             type = it.getString(TYPE)
         }
 
         //状态页配置
-        loadsir = loadServiceInit(swipeRefresh) {
+        loadSir = loadServiceInit(swipeRefresh) {
             //点击重试时触发的操作
-            loadsir.showLoading()
+            loadSir.showLoading()
             requestGankViewModel.loadGankData(true, type)
         }
         //初始化recyclerView
@@ -68,7 +71,7 @@ class AndroidFragment : BaseFragment<HomeViewModel, FragmentAndroidBinding>() {
                 requestGankViewModel.loadGankData(false, type)
             })
             //初始化FloatingActionButton
-//            it.initFloatBtn(floatBtn)
+            it.initFloatBtn(floatBtn)
         }
         //初始化 SwipeRefreshLayout
         swipeRefresh.init {
@@ -77,31 +80,35 @@ class AndroidFragment : BaseFragment<HomeViewModel, FragmentAndroidBinding>() {
         }
         gankAndroidAdapter.setOnItemClickListener { _, _, position ->
             val item = gankAndroidAdapter.getItem(position)
-            openDetail(item.url, item.desc)
+            nav().navigateAction(R.id.action_global_webViewFragment, Bundle().apply {
+                val webBean = WebBean(
+                    0,
+                    false,
+                    item.title,
+                    item.url,
+                    CollectType.Url.type
+                )
+                putParcelable("webBean", webBean)
+            })
         }
     }
 
     override fun createObserver() {
         requestGankViewModel.sisterDataState.observe(viewLifecycleOwner, Observer {
             //设值 新写了个拓展函数，搞死了这个恶心的重复代码
-            loadListData(it, gankAndroidAdapter, loadsir, recyclerView, swipeRefresh)
+            loadListData(it, gankAndroidAdapter, loadSir, recyclerView, swipeRefresh)
+        })
+        appViewModel.appColor.observe(viewLifecycleOwner, Observer {
+            //监听全局的主题颜色改变
+            setUiTheme(it, floatBtn, swipeRefresh, loadSir, footView)
         })
     }
 
     override fun lazyLoadData() {
         //设置界面 加载中
-        loadsir.showLoading()
+        loadSir.showLoading()
         requestGankViewModel.loadGankData(true, type)
     }
 
 
-    private fun openDetail(url: String?, title: String?, isTitleFix: Boolean = false) {
-        if (!url.isNullOrEmpty()) {
-            nav().navigateAction(R.id.action_global_webViewFragment, Bundle().apply {
-                putString("url", url)
-                putBoolean("isTitleFix", isTitleFix)
-                putString("title", if (title.isNullOrEmpty()) url else title)
-            })
-        }
-    }
 }