From deab2897475c9df3034214d6ee26547111cceb89 Mon Sep 17 00:00:00 2001 From: lvmeng <848755140@qq.com> Date: Thu, 23 Apr 2026 11:06:59 +0800 Subject: [PATCH] =?UTF-8?q?refactor(rename):=20=E5=B0=86=20AppRepository?= =?UTF-8?q?=20=E9=87=8D=E5=91=BD=E5=90=8D=E4=B8=BA=20DbRepository=EF=BC=8C?= =?UTF-8?q?AppViewModel=20=E9=87=8D=E5=91=BD=E5=90=8D=E4=B8=BA=20DbViewMod?= =?UTF-8?q?el?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - DatabaseRepository.kt → DbRepository.kt，类名 AppRepository → DbRepository - AppViewModel.kt → DbViewModel.kt，类名 AppViewModel → DbViewModel - VMFactory 构造参数与创建类型同步更新 - 所有引用文件（UI 层、Fragment、ViewModel 工厂）批量更新 import 与使用处 Co-Authored-By: Claude Sonnet 4.6 --- .../db/{DatabaseRepository.kt => DbRepository.kt} | 2 +- .../com/shuwei/dish/match/ui/DeviceConfigActivity.kt | 10 +++++----- .../com/shuwei/dish/match/ui/DishSamplingActivity.kt | 10 +++++----- .../main/java/com/shuwei/dish/match/ui/HomeActivity.kt | 10 +++++----- .../main/java/com/shuwei/dish/match/ui/InitActivity.kt | 10 +++++----- .../com/shuwei/dish/match/ui/MasterScaleActivity.kt | 8 ++++---- .../com/shuwei/dish/match/ui/SamplingListActivity.kt | 10 +++++----- .../com/shuwei/dish/match/ui/SelectDishActivity.kt | 10 +++++----- .../com/shuwei/dish/match/ui/SingleFragmentActivity.kt | 8 ++++---- .../java/com/shuwei/dish/match/ui/SlaveActivity.kt | 8 ++++---- .../com/shuwei/dish/match/ui/SubmitFoodActivity.kt | 10 +++++----- .../dish/match/ui/fragment/DeviceConfigFragment.kt | 6 +++--- .../dish/match/ui/fragment/SeasoningConfigFragment.kt | 6 +++--- .../viewmodel/{AppViewModel.kt => DbViewModel.kt} | 4 ++-- .../shuwei/dish/match/viewmodel/factory/VMFactory.kt | 8 ++++---- 15 files changed, 60 insertions(+), 60 deletions(-) rename app/src/main/java/com/shuwei/dish/match/db/{DatabaseRepository.kt => DbRepository.kt} (98%) rename app/src/main/java/com/shuwei/dish/match/viewmodel/{AppViewModel.kt => DbViewModel.kt} (98%) diff --git a/app/src/main/java/com/shuwei/dish/match/db/DatabaseRepository.kt b/app/src/main/java/com/shuwei/dish/match/db/DbRepository.kt similarity index 98% rename from app/src/main/java/com/shuwei/dish/match/db/DatabaseRepository.kt rename to app/src/main/java/com/shuwei/dish/match/db/DbRepository.kt index 1c881df..a0b5bbe 100644 --- a/app/src/main/java/com/shuwei/dish/match/db/DatabaseRepository.kt +++ b/app/src/main/java/com/shuwei/dish/match/db/DbRepository.kt @@ -11,7 +11,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -class AppRepository(val appDao: AppDao, val seasoningSlotDao: SeasoningSlotDao) { +class DbRepository(val appDao: AppDao, val seasoningSlotDao: SeasoningSlotDao) { suspend fun insertCookFood(item: CookFoodEntity) = withContext(Dispatchers.IO) { appDao.insertCookFood(item) diff --git a/app/src/main/java/com/shuwei/dish/match/ui/DeviceConfigActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/DeviceConfigActivity.kt index 855083b..8e1ee14 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/DeviceConfigActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/DeviceConfigActivity.kt @@ -15,7 +15,7 @@ //import androidx.lifecycle.ViewModelProvider //import com.shuwei.dish.match.base.BaseActivity //import com.shuwei.dish.match.base.BaseApp -//import com.shuwei.dish.match.db.AppRepository +//import com.shuwei.dish.match.db.DbRepository //import com.shuwei.dish.match.dialog.CommonDialog //import com.shuwei.dish.match.entity.SeasoningEntity //import com.shuwei.dish.match.entity.ResetReasoningRecord @@ -29,7 +29,7 @@ //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.AppViewModel +//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 @@ -61,7 +61,7 @@ // // private lateinit var binding: ActivityDeviceConfigBinding // -// private lateinit var appViewModel: AppViewModel +// private lateinit var appViewModel: DbViewModel // // private var cookMode: Int = 0 //// private val weightArray = SparseIntArray() @@ -200,9 +200,9 @@ // private fun initViewModel() { // val db = BaseApp.instance!!.database // val factory = -// AppFactory(AppRepository(db.appDao())) +// AppFactory(DbRepository(db.appDao())) // appViewModel = -// ViewModelProvider(this, factory)[AppViewModel::class.java] +// ViewModelProvider(this, factory)[DbViewModel::class.java] // } // // private fun loadSeasoning() { diff --git a/app/src/main/java/com/shuwei/dish/match/ui/DishSamplingActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/DishSamplingActivity.kt index 9b9144c..29754fc 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/DishSamplingActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/DishSamplingActivity.kt @@ -15,7 +15,7 @@ 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.AppRepository +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,7 +33,7 @@ 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.AppViewModel +import com.shuwei.dish.match.viewmodel.DbViewModel import com.shuwei.dish.match.viewmodel.factory.AppFactory import java.io.Serializable @@ -97,14 +97,14 @@ class DishSamplingActivity : BaseActivity() { }) } - private lateinit var appViewModel: AppViewModel + private lateinit var appViewModel: DbViewModel private fun initViewModel() { val db = BaseApp.instance!!.database val factory = - AppFactory(AppRepository(db.appDao(), db.seasoningSlotDao())) + AppFactory(DbRepository(db.appDao(), db.seasoningSlotDao())) appViewModel = - ViewModelProvider(this, factory)[AppViewModel::class.java] + ViewModelProvider(this, factory)[DbViewModel::class.java] } fun getCookFoodList() { diff --git a/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt index 7c998fc..2deeeff 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt @@ -11,12 +11,12 @@ 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.AppRepository +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.AppViewModel +import com.shuwei.dish.match.viewmodel.DbViewModel import com.shuwei.dish.match.viewmodel.factory.AppFactory import kotlinx.coroutines.launch @@ -136,12 +136,12 @@ class HomeActivity : BaseActivity() { ) } - private lateinit var appViewModel: AppViewModel + private lateinit var appViewModel: DbViewModel private fun initViewModel() { val db = BaseApp.instance!!.database - val factory = AppFactory(AppRepository(db.appDao(), db.seasoningSlotDao())) - appViewModel = ViewModelProvider(this, factory)[AppViewModel::class.java] + val factory = AppFactory(DbRepository(db.appDao(), db.seasoningSlotDao())) + appViewModel = ViewModelProvider(this, factory)[DbViewModel::class.java] } private fun goSampling() { diff --git a/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt index cb683f0..60a76ae 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt @@ -16,7 +16,7 @@ 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.AppRepository +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,7 +27,7 @@ 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.AppViewModel +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 +38,7 @@ class InitActivity : BaseActivity() { } private lateinit var binding: ActivityInitBinding - private lateinit var appViewModel: AppViewModel + private lateinit var appViewModel: DbViewModel private var startTime = 0L // 倒计时开始时间 private var lastNetworkCheckTime = 0L // 上次检测网络的时间 @@ -70,8 +70,8 @@ class InitActivity : BaseActivity() { private fun initViewModel() { val db = BaseApp.instance!!.database - val factory = AppFactory(AppRepository(db.appDao(), db.seasoningSlotDao())) - appViewModel = ViewModelProvider(this, factory)[AppViewModel::class.java] + val factory = AppFactory(DbRepository(db.appDao(), db.seasoningSlotDao())) + appViewModel = ViewModelProvider(this, factory)[DbViewModel::class.java] } private fun startNextPage(withDelay: Boolean = false) { diff --git a/app/src/main/java/com/shuwei/dish/match/ui/MasterScaleActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/MasterScaleActivity.kt index d29c7c6..ca943ea 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/MasterScaleActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/MasterScaleActivity.kt @@ -26,9 +26,9 @@ 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.AppRepository +import com.shuwei.dish.match.db.DbRepository import androidx.lifecycle.ViewModelProvider -import com.shuwei.dish.match.viewmodel.AppViewModel +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 @@ -56,7 +56,7 @@ class MasterScaleActivity : BaseActivity() { private lateinit var binding: ActivityMasterScaleBinding private val size by lazy { SizeTool.getFlexLayoutSize(10.dp) } - private lateinit var appViewModel: AppViewModel + private lateinit var appViewModel: DbViewModel private data class DeviceGroup( val deviceId: String, val ip: String, @@ -81,7 +81,7 @@ class MasterScaleActivity : BaseActivity() { binding.rvScaleList.adapter = adapter val db = BaseApp.instance!!.database - appViewModel = ViewModelProvider(this, AppFactory(AppRepository(db.appDao(), db.seasoningSlotDao())))[AppViewModel::class.java] + appViewModel = ViewModelProvider(this, AppFactory(DbRepository(db.appDao(), db.seasoningSlotDao())))[DbViewModel::class.java] loadSlotNames() } diff --git a/app/src/main/java/com/shuwei/dish/match/ui/SamplingListActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/SamplingListActivity.kt index 8777c61..83545b6 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/SamplingListActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/SamplingListActivity.kt @@ -17,7 +17,7 @@ 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.AppRepository +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,7 +27,7 @@ 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.AppViewModel +import com.shuwei.dish.match.viewmodel.DbViewModel import com.shuwei.dish.match.viewmodel.factory.AppFactory import java.io.Serializable import kotlinx.coroutines.launch @@ -128,12 +128,12 @@ class SamplingListActivity : BaseActivity() { } - private lateinit var appViewModel: AppViewModel + private lateinit var appViewModel: DbViewModel private fun initViewModel() { val db = BaseApp.instance!!.database - val factory = AppFactory(AppRepository(db.appDao(), db.seasoningSlotDao())) - appViewModel = ViewModelProvider(this, factory)[AppViewModel::class.java] + val factory = AppFactory(DbRepository(db.appDao(), db.seasoningSlotDao())) + appViewModel = ViewModelProvider(this, factory)[DbViewModel::class.java] } fun getCookFoodList() { diff --git a/app/src/main/java/com/shuwei/dish/match/ui/SelectDishActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/SelectDishActivity.kt index db7840e..9236f03 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/SelectDishActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/SelectDishActivity.kt @@ -10,7 +10,7 @@ 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.AppRepository +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,7 +19,7 @@ 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.AppViewModel +import com.shuwei.dish.match.viewmodel.DbViewModel import com.shuwei.dish.match.viewmodel.factory.AppFactory class SelectDishActivity : BaseActivity() { @@ -32,7 +32,7 @@ class SelectDishActivity : BaseActivity() { private lateinit var binding: ActivitySelectDishBinding - lateinit var appViewModel: AppViewModel + lateinit var appViewModel: DbViewModel private set private var dinnerType: String = "1" @@ -69,8 +69,8 @@ class SelectDishActivity : BaseActivity() { private fun initViewModel() { val db = BaseApp.instance!!.database - val factory = AppFactory(AppRepository(db.appDao(), db.seasoningSlotDao())) - appViewModel = ViewModelProvider(this, factory)[AppViewModel::class.java] + val factory = AppFactory(DbRepository(db.appDao(), db.seasoningSlotDao())) + appViewModel = ViewModelProvider(this, factory)[DbViewModel::class.java] } fun getCookFoodList() { diff --git a/app/src/main/java/com/shuwei/dish/match/ui/SingleFragmentActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/SingleFragmentActivity.kt index 0516307..d3634dd 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/SingleFragmentActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/SingleFragmentActivity.kt @@ -7,13 +7,13 @@ 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.AppRepository +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.AppViewModel +import com.shuwei.dish.match.viewmodel.DbViewModel import com.shuwei.dish.match.viewmodel.factory.AppFactory /** @@ -63,14 +63,14 @@ class SingleFragmentActivity : BaseActivity() { lifecycleCallback = callback } - lateinit var appViewModel: AppViewModel + lateinit var appViewModel: DbViewModel private set override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) val db = BaseApp.instance!!.database - appViewModel = ViewModelProvider(this, AppFactory(AppRepository(db.appDao(), db.seasoningSlotDao())))[AppViewModel::class.java] + appViewModel = ViewModelProvider(this, AppFactory(DbRepository(db.appDao(), db.seasoningSlotDao())))[DbViewModel::class.java] setHeaderBackground() diff --git a/app/src/main/java/com/shuwei/dish/match/ui/SlaveActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/SlaveActivity.kt index 149dfa8..b2aacf4 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/SlaveActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/SlaveActivity.kt @@ -32,8 +32,8 @@ 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.AppRepository -import com.shuwei.dish.match.viewmodel.AppViewModel +import com.shuwei.dish.match.db.DbRepository +import com.shuwei.dish.match.viewmodel.DbViewModel import com.shuwei.dish.match.viewmodel.factory.AppFactory /** @@ -66,7 +66,7 @@ class SlaveActivity : BaseActivity() { private var clearHighlightRunnable: Runnable? = null private val size by lazy { SizeTool.getFlexLayoutSize(10.dp) } - private lateinit var appViewModel: AppViewModel + private lateinit var appViewModel: DbViewModel override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -75,7 +75,7 @@ class SlaveActivity : BaseActivity() { setHeaderBackground() val db = BaseApp.instance!!.database - appViewModel = ViewModelProvider(this, AppFactory(AppRepository(db.appDao(), db.seasoningSlotDao())))[AppViewModel::class.java] + appViewModel = ViewModelProvider(this, AppFactory(DbRepository(db.appDao(), db.seasoningSlotDao())))[DbViewModel::class.java] binding.tvDeviceId.text = "设备：${GlobalData.deviceId}" binding.tvDeviceIp.text = "IP：${getLocalIpAddress()}" diff --git a/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt index 341840e..3606f3d 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt @@ -15,7 +15,7 @@ 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.AppRepository +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,7 +35,7 @@ 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.AppViewModel +import com.shuwei.dish.match.viewmodel.DbViewModel import com.shuwei.dish.match.viewmodel.factory.AppFactory import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.collectLatest @@ -406,12 +406,12 @@ class SubmitFoodActivity : BaseActivity() { } } - private lateinit var appViewModel: AppViewModel + private lateinit var appViewModel: DbViewModel private fun initViewModel() { val db = BaseApp.instance!!.database - val factory = AppFactory(AppRepository(db.appDao(), db.seasoningSlotDao())) - appViewModel = ViewModelProvider(this, factory)[AppViewModel::class.java] + val factory = AppFactory(DbRepository(db.appDao(), db.seasoningSlotDao())) + appViewModel = ViewModelProvider(this, factory)[DbViewModel::class.java] } override fun onDestroy() { diff --git a/app/src/main/java/com/shuwei/dish/match/ui/fragment/DeviceConfigFragment.kt b/app/src/main/java/com/shuwei/dish/match/ui/fragment/DeviceConfigFragment.kt index e0160bb..11cfbf7 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/fragment/DeviceConfigFragment.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/fragment/DeviceConfigFragment.kt @@ -39,7 +39,7 @@ class DeviceConfigFragment : BaseFragment() { var modeDesc: String ) -// private lateinit var appViewModel: AppViewModel +// private lateinit var appViewModel: DbViewModel // private val weightArray = SparseArray() // private val addressArray = AddressUtil.getWeighAddressArray() @@ -66,8 +66,8 @@ class DeviceConfigFragment : BaseFragment() { */ private fun initViewModel() { // val db = BaseApp.instance!!.database -// val factory = AppFactory(AppRepository(db.appDao())) -// appViewModel = ViewModelProvider(this, factory)[AppViewModel::class.java] +// val factory = AppFactory(DbRepository(db.appDao())) +// appViewModel = ViewModelProvider(this, factory)[DbViewModel::class.java] } /** diff --git a/app/src/main/java/com/shuwei/dish/match/ui/fragment/SeasoningConfigFragment.kt b/app/src/main/java/com/shuwei/dish/match/ui/fragment/SeasoningConfigFragment.kt index 395e0f4..dc99585 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/fragment/SeasoningConfigFragment.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/fragment/SeasoningConfigFragment.kt @@ -48,7 +48,7 @@ class SeasoningConfigFragment : BaseFragment() { ) = FragmentSeasoningConfigBinding.inflate(inflater, container, false) private lateinit var currentActivity: SingleFragmentActivity -// private lateinit var appViewModel: AppViewModel +// private lateinit var appViewModel: DbViewModel private val adapter22 by lazy { buildAdapter22() } private val adapter18 by lazy { @@ -158,8 +158,8 @@ class SeasoningConfigFragment : BaseFragment() { // /** 初始化 ViewModel */ // private fun initViewModel() { -// val factory = AppFactory(AppRepository(BaseApp.instance!!.database.appDao())) -// appViewModel = ViewModelProvider(this, factory)[AppViewModel::class.java] +// val factory = AppFactory(DbRepository(BaseApp.instance!!.database.appDao())) +// appViewModel = ViewModelProvider(this, factory)[DbViewModel::class.java] // } diff --git a/app/src/main/java/com/shuwei/dish/match/viewmodel/AppViewModel.kt b/app/src/main/java/com/shuwei/dish/match/viewmodel/DbViewModel.kt similarity index 98% rename from app/src/main/java/com/shuwei/dish/match/viewmodel/AppViewModel.kt rename to app/src/main/java/com/shuwei/dish/match/viewmodel/DbViewModel.kt index 2c880b4..ab4864f 100644 --- a/app/src/main/java/com/shuwei/dish/match/viewmodel/AppViewModel.kt +++ b/app/src/main/java/com/shuwei/dish/match/viewmodel/DbViewModel.kt @@ -2,7 +2,7 @@ package com.shuwei.dish.match.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.shuwei.dish.match.db.AppRepository +import com.shuwei.dish.match.db.DbRepository import com.shuwei.dish.match.entity.CookFoodEntity import com.shuwei.dish.match.entity.CookFoodGoodsEntity import com.shuwei.dish.match.entity.SeasoningEntity @@ -15,7 +15,7 @@ import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import kotlin.collections.forEach -class AppViewModel(private val rep: AppRepository) : ViewModel() { +class DbViewModel(private val rep: DbRepository) : ViewModel() { fun updateCookFood(entity: CookFoodEntity) { viewModelScope.launch { diff --git a/app/src/main/java/com/shuwei/dish/match/viewmodel/factory/VMFactory.kt b/app/src/main/java/com/shuwei/dish/match/viewmodel/factory/VMFactory.kt index 0d1dd19..438e37c 100644 --- a/app/src/main/java/com/shuwei/dish/match/viewmodel/factory/VMFactory.kt +++ b/app/src/main/java/com/shuwei/dish/match/viewmodel/factory/VMFactory.kt @@ -2,14 +2,14 @@ package com.shuwei.dish.match.viewmodel.factory import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.shuwei.dish.match.db.AppRepository +import com.shuwei.dish.match.db.DbRepository import com.shuwei.dish.match.db.dao.SeasoningSlotDao -import com.shuwei.dish.match.viewmodel.AppViewModel +import com.shuwei.dish.match.viewmodel.DbViewModel @Suppress("UNCHECKED_CAST") -class AppFactory(private val repo: AppRepository) : ViewModelProvider.Factory { +class AppFactory(private val repo: DbRepository) : ViewModelProvider.Factory { override fun create(modelClass: Class): T { - return AppViewModel(repo) as T + return DbViewModel(repo) as T } }