结算页面、设置页面

app/src/main/java/com/sw/dualscreen/adapter/CollectedFoodAdapter.kt

@@ -1,34 +1,34 @@
-package com.sw.dualscreen.adapter
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import com.chad.library.adapter4.BaseQuickAdapter
-import com.chad.library.adapter4.viewholder.QuickViewHolder
-import com.sw.dualscreen.R
-import com.sw.dualscreen.databinding.ListItemCollectedDataBinding
-import com.sw.dualscreen.databinding.ListItemFoodCollectionBinding
-import com.sw.dualscreen.objbox.CollectedFoodBean
-import com.sw.dualscreen.objbox.FoodCollectionBean
-
-class CollectedFoodAdapter (var list: MutableList<CollectedFoodBean>) :
-    BaseQuickAdapter<CollectedFoodBean, CollectedFoodAdapter.VH>(list) {
-
-    inner class VH(var binding: ListItemCollectedDataBinding) : QuickViewHolder(binding.root)
-
-    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
-        val inflater = LayoutInflater.from(context)
-        val binding = ListItemCollectedDataBinding.inflate(inflater, parent, false)
-        return VH(binding)
-    }
-
-    override fun onBindViewHolder(holder: VH, position: Int, item: CollectedFoodBean?) {
-        holder.binding.tvFoodName.text = item?.foodName
-        holder.binding.divider.run {
-            visibility = if (position == list.size - 1) View.GONE else View.VISIBLE
-        }
-    }
-
-}
+//package com.sw.dualscreen.adapter
+//
+//import android.content.Context
+//import android.view.LayoutInflater
+//import android.view.View
+//import android.view.ViewGroup
+//import android.widget.ImageView
+//import com.chad.library.adapter4.BaseQuickAdapter
+//import com.chad.library.adapter4.viewholder.QuickViewHolder
+//import com.sw.dualscreen.R
+//import com.sw.dualscreen.databinding.ListItemCollectedDataBinding
+//import com.sw.dualscreen.databinding.ListItemFoodCollectionBinding
+//import com.sw.dualscreen.objbox.CollectedFoodBean
+//import com.sw.dualscreen.objbox.FoodCollectionBean
+//
+//class CollectedFoodAdapter (var list: MutableList<CollectedFoodBean>) :
+//    BaseQuickAdapter<CollectedFoodBean, CollectedFoodAdapter.VH>(list) {
+//
+//    inner class VH(var binding: ListItemCollectedDataBinding) : QuickViewHolder(binding.root)
+//
+//    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+//        val inflater = LayoutInflater.from(context)
+//        val binding = ListItemCollectedDataBinding.inflate(inflater, parent, false)
+//        return VH(binding)
+//    }
+//
+//    override fun onBindViewHolder(holder: VH, position: Int, item: CollectedFoodBean?) {
+//        holder.binding.tvFoodName.text = item?.foodName
+//        holder.binding.divider.run {
+//            visibility = if (position == list.size - 1) View.GONE else View.VISIBLE
+//        }
+//    }
+//
+//}

app/src/main/java/com/sw/dualscreen/adapter/CollectedFoodNewAdapter.kt

@@ -0,0 +1,27 @@
+package com.sw.dualscreen.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.chad.library.adapter4.BaseQuickAdapter
+import com.chad.library.adapter4.viewholder.QuickViewHolder
+import com.sw.dualscreen.databinding.ListItemCollectedFoodBinding
+import com.sw.dualscreen.objbox.CollectedFoodBean
+
+class CollectedFoodNewAdapter(var list: MutableList<CollectedFoodBean>) :
+    BaseQuickAdapter<CollectedFoodBean, CollectedFoodNewAdapter.VH>(list) {
+
+    inner class VH(var binding: ListItemCollectedFoodBinding) : QuickViewHolder(binding.root)
+
+    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+        val inflater = LayoutInflater.from(context)
+        val binding = ListItemCollectedFoodBinding.inflate(inflater, parent, false)
+        return VH(binding)
+    }
+
+    override fun onBindViewHolder(holder: VH, position: Int, item: CollectedFoodBean?) {
+        holder.binding.tvFoodName.text = item?.foodName
+        holder.binding.tvCollectedNum.text = "已采集153"
+    }
+
+}

app/src/main/java/com/sw/dualscreen/adapter/FoodCollectionAdapter.kt

@@ -9,7 +9,9 @@ import com.chad.library.adapter4.BaseQuickAdapter
 import com.chad.library.adapter4.viewholder.QuickViewHolder
 import com.sw.dualscreen.R
 import com.sw.dualscreen.databinding.ListItemFoodCollectionBinding
+import com.sw.dualscreen.ext.dp
 import com.sw.dualscreen.objbox.FoodCollectionBean
+import com.sw.dualscreen.utils.GlideUtils
 
 class FoodCollectionAdapter (var list: MutableList<FoodCollectionBean>) :
     BaseQuickAdapter<FoodCollectionBean, FoodCollectionAdapter.VH>(list) {
@@ -30,11 +32,20 @@ class FoodCollectionAdapter (var list: MutableList<FoodCollectionBean>) :
             binding.imageView.run {
                 if (it.isShowCamera) {
                     scaleType = ImageView.ScaleType.CENTER
-                    setImageResource(R.drawable.ic_camera256)
+                    setImageResource(R.drawable.ic_camera_default)
                 } else {
-                    scaleType = ImageView.ScaleType.FIT_CENTER
+                    //scaleType = ImageView.ScaleType.FIT_CENTER
+                    scaleType = ImageView.ScaleType.CENTER_CROP
                     //setImageURI(it.imageUri)
-                    setImageBitmap(it.bitmap)
+                    //setImageBitmap(it.bitmap)
+                    it.bitmap?.let { bitmap ->
+                        GlideUtils.loadRoundCornerWitBitmap(
+                            context,
+                            url = bitmap,
+                            imageView = this,
+                            radius = 8.dp
+                        )
+                    }
                 }
             }
         }

app/src/main/java/com/sw/dualscreen/adapter/SearchFoodAdapter.kt

@@ -0,0 +1,35 @@
+package com.sw.dualscreen.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.chad.library.adapter4.BaseQuickAdapter
+import com.chad.library.adapter4.viewholder.QuickViewHolder
+import com.sw.dualscreen.databinding.ListItemSearchFoodBinding
+import com.sw.dualscreen.ext.format2String
+import com.sw.dualscreen.model.response.FoodInfo
+
+class SearchFoodAdapter(var list: MutableList<FoodInfo>) :
+    BaseQuickAdapter<FoodInfo, SearchFoodAdapter.VH>(list) {
+
+    inner class VH(var binding: ListItemSearchFoodBinding) : QuickViewHolder(binding.root)
+
+    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+        val inflater = LayoutInflater.from(context)
+        val binding = ListItemSearchFoodBinding.inflate(inflater, parent, false)
+        return VH(binding)
+    }
+
+    override fun onBindViewHolder(holder: VH, position: Int, item: FoodInfo?) {
+        holder.binding.tvFoodName.run {
+            if (item!!.score == 0) {
+                text = item.foodName
+            } else {
+                val score = (item.score / 100.0).format2String(2)
+                text = "${item.foodName}\n${score}%"
+            }
+            isChecked = item.isChecked
+        }
+    }
+
+}