优化

app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt

@@ -25,8 +25,8 @@ import androidx.recyclerview.widget.GridLayoutManager
 import com.google.common.util.concurrent.ListenableFuture
 import com.sw.dualscreen.GlobalData
 import com.sw.dualscreen.GlobalKey
-import com.sw.dualscreen.activity.fragment.CollectFragment
-import com.sw.dualscreen.adapter.SearchFoodAdapter
+import com.sw.dualscreen.adapter.DialogSearchFoodAdapter
+import com.sw.dualscreen.adapter.MainFoodListAdapter
 import com.sw.dualscreen.databinding.ActivityMainBinding
 import com.sw.dualscreen.dialog.RemindDialog
 import com.sw.dualscreen.ext.dp
@@ -38,7 +38,6 @@ import com.sw.dualscreen.model.response.ClickBackEvent
 import com.sw.dualscreen.model.response.FoodInfo
 import com.sw.dualscreen.model.response.FoodOrder
 import com.sw.dualscreen.model.response.PaySuccessEvent
-import com.sw.dualscreen.model.response.ResetBoxEvent
 import com.sw.dualscreen.model.response.UserFaceModel
 import com.sw.dualscreen.objbox.Food
 import com.sw.dualscreen.objbox.FoodModule
@@ -80,7 +79,6 @@ import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.util.Locale
 import java.util.concurrent.Executors
-import kotlin.collections.get
 import kotlin.math.roundToInt
 
 /**
@@ -104,7 +102,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
     private val handler by lazy { Handler(Looper.getMainLooper()) }
     private val searchFoodList = mutableListOf<FoodInfo>()
     private val adapter by lazy {
-        SearchFoodAdapter(searchFoodList).apply {
+        MainFoodListAdapter(searchFoodList).apply {
             setOnItemClickListener { adapter, view, position ->
                 if (searchFoodList[position].isChecked) {
                     return@setOnItemClickListener
@@ -122,6 +120,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                 val mode = SPUtil.getInstance().get(GlobalKey.KEY_CHARGE_MODE, 0)
                 //不计费模式切换菜品，重新加载数据
                 if (mode == 1) {
+                    presentation?.isAgainLoadData = false
                     presentation?.loadUnbilledMode()
                 }
             }

app/src/main/java/com/sw/dualscreen/activity/fragment/CollectFragment.kt

@@ -17,8 +17,9 @@ import com.sw.dualscreen.GlobalData
 import com.sw.dualscreen.R
 import com.sw.dualscreen.activity.CollectedFoodActivity
 import com.sw.dualscreen.activity.SettingActivity
+import com.sw.dualscreen.adapter.CollectFoodListAdapter
 import com.sw.dualscreen.adapter.FoodCollectionAdapter
-import com.sw.dualscreen.adapter.SearchFoodAdapter
+import com.sw.dualscreen.adapter.DialogSearchFoodAdapter
 import com.sw.dualscreen.databinding.FragmentCollectBinding
 import com.sw.dualscreen.databinding.LayoutCameraPreviewBinding
 import com.sw.dualscreen.ext.clickWithDebounce
@@ -28,7 +29,6 @@ import com.sw.dualscreen.objbox.Food
 import com.sw.dualscreen.objbox.FoodCollectionBean
 import com.sw.dualscreen.objbox.FoodModule
 import com.sw.dualscreen.objbox.ObjectBox
-import com.sw.dualscreen.utils.BitmapCropper
 import com.sw.dualscreen.utils.BitmapSaver
 import com.sw.dualscreen.utils.CameraUtils
 import com.sw.dualscreen.utils.Debouncer
@@ -72,7 +72,7 @@ class CollectFragment : BaseFragment<FragmentCollectBinding>() {
     private var settingActivity: SettingActivity? = null
     private var checkedItem: FoodInfo? = null
     private val searchFoodAdapter by lazy {
-        SearchFoodAdapter(searchFoodList).apply {
+        CollectFoodListAdapter(searchFoodList).apply {
             setOnItemClickListener { adapter, view, position ->
                 searchFoodList.forEachIndexed { index, item -> item.isChecked = index == position }
                 checkedItem = searchFoodList[position]