feat: 代码优化

m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt

@@ -7,18 +7,17 @@ import android.animation.PropertyValuesHolder
 import android.content.Context
 import android.graphics.Typeface
 import android.os.Build
-import androidx.core.content.ContextCompat
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import android.text.TextUtils
-import android.view.Gravity
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
 import com.google.android.material.appbar.AppBarLayout
@@ -59,12 +58,7 @@ import kotlinx.android.synthetic.main.consultant_item_filter_online.view.*
 import kotlinx.android.synthetic.main.consultant_layout_search_content.*
 import kotlinx.android.synthetic.main.consultant_layout_search_toolbar.*
 import org.json.JSONObject
-import java.util.*
 import java.util.concurrent.Executors
-import kotlin.collections.ArrayList
-import kotlin.collections.LinkedHashSet
-import kotlin.properties.Delegates
-import kotlin.reflect.jvm.internal.impl.load.kotlin.JvmType
 
 @Route(path = "/consultant/consultant")
 class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPresenter>(),
@@ -241,18 +235,15 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
                 } else if (newState == RecyclerView.SCROLL_STATE_IDLE) {
                     //没有滚动
                     showConsultAssistantDialog()
-                    if (sIsScrolling) {
-
-                    }
-                    sIsScrolling = false;
+                    sIsScrolling = false
                 }
             }
 
             override fun onScrollTop() {
-                var alpha = PropertyValuesHolder.ofFloat("alpha", 1f, 0f)
-                var scaleX = PropertyValuesHolder.ofFloat("scaleX", 1f, 0f)
-                var scaleY = PropertyValuesHolder.ofFloat("scaleY", 1f, 0f)
-                var animator =
+                val alpha = PropertyValuesHolder.ofFloat("alpha", 1f, 0f)
+                val scaleX = PropertyValuesHolder.ofFloat("scaleX", 1f, 0f)
+                val scaleY = PropertyValuesHolder.ofFloat("scaleY", 1f, 0f)
+                val animator =
                     ObjectAnimator.ofPropertyValuesHolder(image_scroll_top, alpha, scaleX, scaleY)
                         .setDuration(200)
                 animator.addListener(object : AnimatorListenerAdapter() {
@@ -268,10 +259,10 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
                 if (isBtnShow) {
                     return
                 }
-                var alpha = PropertyValuesHolder.ofFloat("alpha", 0f, 1f)
-                var scaleX = PropertyValuesHolder.ofFloat("scaleX", 0f, 1f)
-                var scaleY = PropertyValuesHolder.ofFloat("scaleY", 0f, 1f)
-                var animator =
+                val alpha = PropertyValuesHolder.ofFloat("alpha", 0f, 1f)
+                val scaleX = PropertyValuesHolder.ofFloat("scaleX", 0f, 1f)
+                val scaleY = PropertyValuesHolder.ofFloat("scaleY", 0f, 1f)
+                val animator =
                     ObjectAnimator.ofPropertyValuesHolder(image_scroll_top, alpha, scaleX, scaleY)
                         .setDuration(200)
                 animator.addListener(object : AnimatorListenerAdapter() {
@@ -287,10 +278,10 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
                 if (!isBtnShow) {
                     return
                 }
-                var alpha = PropertyValuesHolder.ofFloat("alpha", 1f, 0f)
-                var scaleX = PropertyValuesHolder.ofFloat("scaleX", 1f, 0f)
-                var scaleY = PropertyValuesHolder.ofFloat("scaleY", 1f, 0f)
-                var animator =
+                val alpha = PropertyValuesHolder.ofFloat("alpha", 1f, 0f)
+                val scaleX = PropertyValuesHolder.ofFloat("scaleX", 1f, 0f)
+                val scaleY = PropertyValuesHolder.ofFloat("scaleY", 1f, 0f)
+                val animator =
                     ObjectAnimator.ofPropertyValuesHolder(image_scroll_top, alpha, scaleX, scaleY)
                         .setDuration(200)
                 animator.addListener(object : AnimatorListenerAdapter() {

m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt

@@ -285,22 +285,26 @@ class ExpertSearchAdapter(
                         holder.ll_tags,
                         false
                     )
-                    if (1 == item.isPackage) {
-                        view.tvTitle.text = "单次"
-                        view.tvTitle.setTextColor(context.resources.getColor(R.color.platform_color_1DA1F2))
-                        view.tvTitle.background =
-                            context.resources.getDrawable(R.drawable.consultant_expert_search_single)
-                        view.tvContent.text = item.name
-                        holder.ll_products.addView(view)
-                    } else if (2 == item.isPackage) {
-                        view.tvTitle.text = "套餐"
-                        view.tvTitle.setTextColor(context.resources.getColor(R.color.consultant_color_FF9500))
-                        view.tvTitle.background =
-                            context.resources.getDrawable(R.drawable.consultant_expert_search_menu)
-                        view.tvContent.text = item.name
-                        holder.ll_products.addView(view)
-                    } else {
+                    when (item.isPackage) {
+                        1 -> {
+                            view.tvTitle.text = "单次"
+                            view.tvTitle.setTextColor(context.resources.getColor(R.color.platform_color_1DA1F2))
+                            view.tvTitle.background =
+                                context.resources.getDrawable(R.drawable.consultant_expert_search_single)
+                            view.tvContent.text = item.name
+                            holder.ll_products.addView(view)
+                        }
+                        2 -> {
+                            view.tvTitle.text = "套餐"
+                            view.tvTitle.setTextColor(context.resources.getColor(R.color.consultant_color_FF9500))
+                            view.tvTitle.background =
+                                context.resources.getDrawable(R.drawable.consultant_expert_search_menu)
+                            view.tvContent.text = item.name
+                            holder.ll_products.addView(view)
+                        }
+                        else -> {
 
+                        }
                     }
                 }
             }