refactor(viewmodel): 统一 DbViewModel 初始化并拆分 DAO 结构

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

app/src/main/java/com/shuwei/dish/match/ui/DeviceConfigActivity.kt

@@ -29,8 +29,6 @@
 //import com.shuwei.dish.match.utils.ext.startActivity
 //import com.shuwei.dish.match.utils.ext.toast
 //import com.shuwei.dish.match.utils.ext.visible
-//import com.shuwei.dish.match.viewmodel.DbViewModel
-//import com.shuwei.dish.match.viewmodel.factory.AppFactory
 //import com.shuwei.dish.match.adapter.TextCellAdapter
 //import com.shuwei.dish.match.databinding.ActivityDeviceConfigBinding
 //import com.shuwei.dish.match.dialog.SeasoningSearchDialog

app/src/main/java/com/shuwei/dish/match/ui/DishSamplingActivity.kt

@@ -7,7 +7,6 @@ import android.util.Log
 import android.view.View
 import androidx.activity.addCallback
 import androidx.activity.viewModels
-import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.shuwei.dish.match.R
@@ -15,7 +14,6 @@ import com.shuwei.dish.match.adapter.DishPartAdapter
 import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.BaseApp
 import com.shuwei.dish.match.databinding.ActivityDishSamplingBinding
-import com.shuwei.dish.match.db.DbRepository
 import com.shuwei.dish.match.dialog.FoodSearchDialog
 import com.shuwei.dish.match.dialog.CommonDialog
 import com.shuwei.dish.match.entity.CookFoodEntity
@@ -33,8 +31,6 @@ import com.shuwei.dish.match.utils.ext.startActivity
 import com.shuwei.dish.match.utils.ext.toJsonString
 import com.shuwei.dish.match.utils.ext.toast
 import com.shuwei.dish.match.utils.ext.visible
-import com.shuwei.dish.match.viewmodel.DbViewModel
-import com.shuwei.dish.match.viewmodel.factory.AppFactory
 import java.io.Serializable
 
 class DishSamplingActivity : BaseActivity() {
@@ -62,7 +58,6 @@ class DishSamplingActivity : BaseActivity() {
         setTitleBar()
         setHeaderBackground()
         addViewClickListener()
-        initViewModel()
         foodName = intent.getStringExtra(FOOD_NAME)
         binding.etInputDish.setText(foodName)
 
@@ -97,15 +92,7 @@ class DishSamplingActivity : BaseActivity() {
         })
     }
 
-    private lateinit var appViewModel: DbViewModel
 
-    private fun initViewModel() {
-        val db = BaseApp.instance!!.database
-        val factory =
-            AppFactory(DbRepository(db.appDao(), db.seasoningSlotDao()))
-        appViewModel =
-            ViewModelProvider(this, factory)[DbViewModel::class.java]
-    }
 
     fun getCookFoodList() {
         appViewModel.getCookFoodList(cookMode = 1)

app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt

@@ -3,7 +3,6 @@ package com.shuwei.dish.match.ui
 import android.annotation.SuppressLint
 import android.os.Bundle
 import androidx.activity.addCallback
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.shuwei.dish.match.R
@@ -11,13 +10,10 @@ import com.shuwei.dish.match.adapter.HomeModeAdapter
 import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.BaseApp
 import com.shuwei.dish.match.databinding.ActivityHomeBinding
-import com.shuwei.dish.match.db.DbRepository
 import com.shuwei.dish.match.entity.HomeModeBean
 import com.shuwei.dish.match.utils.SpTool
 import com.shuwei.dish.match.utils.ext.startActivity
 import com.shuwei.dish.match.utils.ext.toast
-import com.shuwei.dish.match.viewmodel.DbViewModel
-import com.shuwei.dish.match.viewmodel.factory.AppFactory
 import kotlinx.coroutines.launch
 
 class HomeActivity : BaseActivity() {
@@ -34,7 +30,6 @@ class HomeActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         statusBarDarkFont(enable = true)
-        initViewModel()
 //        // 获取 ANDROID_ID
 //        val deviceId =
 //            Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
@@ -136,13 +131,7 @@ class HomeActivity : BaseActivity() {
         )
     }
 
-    private lateinit var appViewModel: DbViewModel
 
-    private fun initViewModel() {
-        val db = BaseApp.instance!!.database
-        val factory = AppFactory(DbRepository(db.appDao(), db.seasoningSlotDao()))
-        appViewModel = ViewModelProvider(this, factory)[DbViewModel::class.java]
-    }
 
     private fun goSampling() {
         lifecycleScope.launch {

app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt

@@ -9,14 +9,12 @@ import android.view.KeyEvent
 import android.view.animation.RotateAnimation
 import androidx.activity.addCallback
 import androidx.core.graphics.toColorInt
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.BaseApp
 import com.shuwei.dish.match.base.DeviceRole
 import com.shuwei.dish.match.base.GlobalData
 import com.shuwei.dish.match.databinding.ActivityInitBinding
-import com.shuwei.dish.match.db.DbRepository
 import com.shuwei.dish.match.objbox.FoodModule
 import com.shuwei.dish.match.scale.ScaleServiceManager
 import com.shuwei.dish.match.utils.AppUtil
@@ -27,8 +25,6 @@ import com.shuwei.dish.match.utils.WeightUtil
 import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.startActivity
 import com.shuwei.dish.match.utils.ext.visible
-import com.shuwei.dish.match.viewmodel.DbViewModel
-import com.shuwei.dish.match.viewmodel.factory.AppFactory
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
@@ -38,7 +34,6 @@ class InitActivity : BaseActivity() {
     }
 
     private lateinit var binding: ActivityInitBinding
-    private lateinit var appViewModel: DbViewModel
     private var startTime = 0L // 倒计时开始时间
     private var lastNetworkCheckTime = 0L // 上次检测网络的时间
 
@@ -59,8 +54,6 @@ class InitActivity : BaseActivity() {
 
         BaseApp.canteenId = "0"
 
-        initViewModel()
-
         WeightUtil.init()
         WeightUtil.getWeight()
         WeightUtil.startContinuousRead()
@@ -68,11 +61,6 @@ class InitActivity : BaseActivity() {
         initViews()
     }
 
-    private fun initViewModel() {
-        val db = BaseApp.instance!!.database
-        val factory = AppFactory(DbRepository(db.appDao(), db.seasoningSlotDao()))
-        appViewModel = ViewModelProvider(this, factory)[DbViewModel::class.java]
-    }
 
     private fun startNextPage(withDelay: Boolean = false) {
         lifecycleScope.launch {

app/src/main/java/com/shuwei/dish/match/ui/MasterScaleActivity.kt

@@ -26,10 +26,6 @@ import com.shuwei.dish.match.databinding.ListTypeScale18Binding
 import com.shuwei.dish.match.databinding.ListTypeScale2Binding
 import com.shuwei.dish.match.databinding.ListTypeScale22Binding
 import com.shuwei.dish.match.base.BaseApp
-import com.shuwei.dish.match.db.DbRepository
-import androidx.lifecycle.ViewModelProvider
-import com.shuwei.dish.match.viewmodel.DbViewModel
-import com.shuwei.dish.match.viewmodel.factory.AppFactory
 import com.shuwei.dish.match.databinding.ListItemScale22RowBinding
 import com.shuwei.dish.match.scale.ScaleData
 import com.shuwei.dish.match.scale.ScaleDeviceConfig
@@ -56,7 +52,6 @@ class MasterScaleActivity : BaseActivity() {
     private lateinit var binding: ActivityMasterScaleBinding
     private val size by lazy { SizeTool.getFlexLayoutSize(10.dp) }
 
-    private lateinit var appViewModel: DbViewModel
     private data class DeviceGroup(
         val deviceId: String,
         val ip: String,
@@ -80,8 +75,6 @@ class MasterScaleActivity : BaseActivity() {
         binding.rvScaleList.itemAnimator = null
         binding.rvScaleList.adapter = adapter
 
-        val db = BaseApp.instance!!.database
-        appViewModel = ViewModelProvider(this, AppFactory(DbRepository(db.appDao(), db.seasoningSlotDao())))[DbViewModel::class.java]
         loadSlotNames()
     }
 

app/src/main/java/com/shuwei/dish/match/ui/SamplingListActivity.kt

@@ -6,7 +6,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import androidx.activity.addCallback
 import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.ItemTouchHelper
@@ -17,7 +16,6 @@ import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.BaseApp
 import com.shuwei.dish.match.databinding.ActivitySamplingBinding
 import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
-import com.shuwei.dish.match.db.DbRepository
 import com.shuwei.dish.match.dialog.CommonDialog
 import com.shuwei.dish.match.entity.CookFoodEntity
 import com.shuwei.dish.match.entity.FoodRecord
@@ -27,8 +25,6 @@ import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.startActivity
 import com.shuwei.dish.match.utils.ext.toast
 import com.shuwei.dish.match.utils.ext.visible
-import com.shuwei.dish.match.viewmodel.DbViewModel
-import com.shuwei.dish.match.viewmodel.factory.AppFactory
 import java.io.Serializable
 import kotlinx.coroutines.launch
 import com.shuwei.dish.match.net.UiState
@@ -49,7 +45,6 @@ class SamplingListActivity : BaseActivity() {
         setContentView(binding.root)
         setTitleBar()
         setHeaderBackground()
-        initViewModel()
         initRecyclerView()
         addViewListener()
         initObserver()
@@ -128,13 +123,7 @@ class SamplingListActivity : BaseActivity() {
 
     }
 
-    private lateinit var appViewModel: DbViewModel
 
-    private fun initViewModel() {
-        val db = BaseApp.instance!!.database
-        val factory = AppFactory(DbRepository(db.appDao(), db.seasoningSlotDao()))
-        appViewModel = ViewModelProvider(this, factory)[DbViewModel::class.java]
-    }
 
     fun getCookFoodList() {
         appViewModel.getCookFoodList(cookMode = 1)

app/src/main/java/com/shuwei/dish/match/ui/SelectDishActivity.kt

@@ -3,14 +3,12 @@ package com.shuwei.dish.match.ui
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.addCallback
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.BaseApp
 import com.shuwei.dish.match.databinding.ActivitySelectDishBinding
-import com.shuwei.dish.match.db.DbRepository
 import com.shuwei.dish.match.dialog.CommonDialog
 import com.shuwei.dish.match.ui.fragment.DishListFragment
 import com.shuwei.dish.match.utils.KeyboardUtil
@@ -19,8 +17,6 @@ import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.startActivity
 import com.shuwei.dish.match.utils.ext.toast
 import com.shuwei.dish.match.utils.ext.visible
-import com.shuwei.dish.match.viewmodel.DbViewModel
-import com.shuwei.dish.match.viewmodel.factory.AppFactory
 
 class SelectDishActivity : BaseActivity() {
 
@@ -32,9 +28,6 @@ class SelectDishActivity : BaseActivity() {
 
     private lateinit var binding: ActivitySelectDishBinding
 
-    lateinit var appViewModel: DbViewModel
-        private set
-
     private var dinnerType: String = "1"
 
     private val fragmentList = mutableListOf<DishListFragment>().apply {
@@ -61,17 +54,11 @@ class SelectDishActivity : BaseActivity() {
         }, backAction = {
             it.gone()
         })
-        initViewModel()
         addViewListener()
         loadFragment()
         onBackPressedDispatcher.addCallback(this) {}
     }
 
-    private fun initViewModel() {
-        val db = BaseApp.instance!!.database
-        val factory = AppFactory(DbRepository(db.appDao(), db.seasoningSlotDao()))
-        appViewModel = ViewModelProvider(this, factory)[DbViewModel::class.java]
-    }
 
     fun getCookFoodList() {
         appViewModel.getCookFoodList(cookMode = 0, dinnerType = dinnerType)

app/src/main/java/com/shuwei/dish/match/ui/SingleFragmentActivity.kt

@@ -4,17 +4,13 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
 import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.BaseApp
-import com.shuwei.dish.match.db.DbRepository
 import com.shuwei.dish.match.ui.fragment.CollectFragment
 import com.shuwei.dish.match.ui.fragment.DeviceConfigFragment
 import com.shuwei.dish.match.ui.fragment.SeasoningConfigFragment
 import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.visible
-import com.shuwei.dish.match.viewmodel.DbViewModel
-import com.shuwei.dish.match.viewmodel.factory.AppFactory
 
 /**
  * 通用单 Fragment 容器 Activity
@@ -63,15 +59,9 @@ class SingleFragmentActivity : BaseActivity() {
         lifecycleCallback = callback
     }
 
-    lateinit var appViewModel: DbViewModel
-        private set
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val db = BaseApp.instance!!.database
-        appViewModel = ViewModelProvider(this, AppFactory(DbRepository(db.appDao(), db.seasoningSlotDao())))[DbViewModel::class.java]
-
         setHeaderBackground()
 
         // 解析页面类型，非法值直接关闭

app/src/main/java/com/shuwei/dish/match/ui/SlaveActivity.kt

@@ -31,10 +31,6 @@ import com.shuwei.dish.match.utils.SizeTool
 import com.shuwei.dish.match.utils.WeightUtil
 import com.shuwei.dish.match.utils.ext.dp
 import kotlinx.coroutines.launch
-import androidx.lifecycle.ViewModelProvider
-import com.shuwei.dish.match.db.DbRepository
-import com.shuwei.dish.match.viewmodel.DbViewModel
-import com.shuwei.dish.match.viewmodel.factory.AppFactory
 
 /**
  * 子设备专属页面（小屏幕设备使用）
@@ -66,17 +62,12 @@ class SlaveActivity : BaseActivity() {
     private var clearHighlightRunnable: Runnable? = null
     private val size by lazy { SizeTool.getFlexLayoutSize(10.dp) }
 
-    private lateinit var appViewModel: DbViewModel
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivitySlaveBinding.inflate(layoutInflater)
         setContentView(binding.root)
         setHeaderBackground()
 
-        val db = BaseApp.instance!!.database
-        appViewModel = ViewModelProvider(this, AppFactory(DbRepository(db.appDao(), db.seasoningSlotDao())))[DbViewModel::class.java]
-
         binding.tvDeviceId.text = "设备：${GlobalData.deviceId}"
         binding.tvDeviceIp.text = "IP：${getLocalIpAddress()}"
 

app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import android.util.Log
 import androidx.activity.addCallback
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
@@ -15,7 +14,6 @@ import com.shuwei.dish.match.adapter.SeasoningWeightAdapter
 import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.BaseApp
 import com.shuwei.dish.match.databinding.ActivitySubmitFoodBinding
-import com.shuwei.dish.match.db.DbRepository
 import com.shuwei.dish.match.dialog.CommonDialog
 import com.shuwei.dish.match.entity.CookFoodEntity
 import com.shuwei.dish.match.entity.CookFoodGoodsEntity
@@ -35,8 +33,6 @@ import com.shuwei.dish.match.utils.ext.toJsonString
 import com.shuwei.dish.match.utils.ext.toType
 import com.shuwei.dish.match.utils.ext.toast
 import com.shuwei.dish.match.utils.ext.visible
-import com.shuwei.dish.match.viewmodel.DbViewModel
-import com.shuwei.dish.match.viewmodel.factory.AppFactory
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
@@ -100,7 +96,6 @@ class SubmitFoodActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
         binding = ActivitySubmitFoodBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        initViewModel()
         setHeaderBackground()
         intent.extras?.apply {
             food = getSerializable(FOOD_ITEM) as FoodRecord?
@@ -406,13 +401,7 @@ class SubmitFoodActivity : BaseActivity() {
         }
     }
 
-    private lateinit var appViewModel: DbViewModel
 
-    private fun initViewModel() {
-        val db = BaseApp.instance!!.database
-        val factory = AppFactory(DbRepository(db.appDao(), db.seasoningSlotDao()))
-        appViewModel = ViewModelProvider(this, factory)[DbViewModel::class.java]
-    }
 
     override fun onDestroy() {
         WeightUtil.removeWeightListener(TAG)

app/src/main/java/com/shuwei/dish/match/ui/fragment/DeviceConfigFragment.kt

@@ -54,22 +54,12 @@ class DeviceConfigFragment : BaseFragment<FragmentDeviceConfigBinding>() {
     }
 
     override fun initialize() {
-        initViewModel()
         initUI()
 //        addWeighListener()
 //        addGridItemListener()
 //        loadSeasoning()
     }
 
-    /**
-     * 初始化ViewModel
-     */
-    private fun initViewModel() {
-//        val db = BaseApp.instance!!.database
-//        val factory = AppFactory(DbRepository(db.appDao()))
-//        appViewModel = ViewModelProvider(this, factory)[DbViewModel::class.java]
-    }
-
     /**
      * 初始化UI
      */