restaurant/DishMatch
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(db): 将 entity 包拆分为 db/entity（数据库实体）和 model（数据模型）

Browse Source 
- 新建 db/entity 包，迁入 4 个 Room 实体类：CookFoodEntity、CookFoodGoodsEntity、SeasoningEntity、SeasoningSlotEntity
- 新建 model 包，迁入 7 个普通数据模型：FoodRecord、GoodsItem、CookFoodDTO、CookFoodGoodsDTO、GoodsNameQueryDTO、CollectedFoodItem、DataBean
- 删除原 entity 包
- 更新全部引用文件的 import 路径（共 33 个文件）
This commit is contained in:
lvmeng
2026-05-15 11:46:37 +08:00
parent deb03a0c37
commit d3f02620af
45 changed files with 81 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/shuwei/dish/match/adapter/CollectedFoodAdapter.kt
+1 -1
View File
@@ -6,7 +6,7 @@ import android.view.ViewGroup
import com.chad.library.adapter4.BaseQuickAdapter import com.chad.library.adapter4.BaseQuickAdapter
import com.chad.library.adapter4.viewholder.QuickViewHolder import com.chad.library.adapter4.viewholder.QuickViewHolder
import com.shuwei.dish.match.databinding.ListItemCollectedFoodBinding import com.shuwei.dish.match.databinding.ListItemCollectedFoodBinding
import com.shuwei.dish.match.entity.CollectedFoodItem import com.shuwei.dish.match.model.CollectedFoodItem
/** /**
* 已采集食材列表适配器 * 已采集食材列表适配器
app/src/main/java/com/shuwei/dish/match/adapter/Food2Adapter.kt
+1 -1
View File
@@ -6,7 +6,7 @@ import android.view.ViewGroup
import com.chad.library.adapter4.BaseQuickAdapter import com.chad.library.adapter4.BaseQuickAdapter
import com.chad.library.adapter4.viewholder.QuickViewHolder import com.chad.library.adapter4.viewholder.QuickViewHolder
import com.shuwei.dish.match.databinding.ListItemFood2Binding import com.shuwei.dish.match.databinding.ListItemFood2Binding
import com.shuwei.dish.match.entity.FoodRecord import com.shuwei.dish.match.model.FoodRecord
/** /**
* 菜品搜索页面的适配器 * 菜品搜索页面的适配器
app/src/main/java/com/shuwei/dish/match/adapter/Food3Adapter.kt
+1 -1
View File
@@ -7,7 +7,7 @@ import android.view.ViewGroup
import com.chad.library.adapter4.BaseQuickAdapter import com.chad.library.adapter4.BaseQuickAdapter
import com.chad.library.adapter4.viewholder.QuickViewHolder import com.chad.library.adapter4.viewholder.QuickViewHolder
import com.shuwei.dish.match.databinding.ListItemFood3Binding import com.shuwei.dish.match.databinding.ListItemFood3Binding
import com.shuwei.dish.match.entity.GoodsItem import com.shuwei.dish.match.model.GoodsItem
/** /**
* 向量采集页面的适配器 * 向量采集页面的适配器
app/src/main/java/com/shuwei/dish/match/adapter/FoodAdapter.kt
+1 -1
View File
@@ -8,7 +8,7 @@ import com.chad.library.adapter4.BaseQuickAdapter
import com.chad.library.adapter4.viewholder.QuickViewHolder import com.chad.library.adapter4.viewholder.QuickViewHolder
import com.shuwei.dish.match.R import com.shuwei.dish.match.R
import com.shuwei.dish.match.databinding.ListItemFoodBinding import com.shuwei.dish.match.databinding.ListItemFoodBinding
import com.shuwei.dish.match.entity.GoodsItem import com.shuwei.dish.match.model.GoodsItem
import com.shuwei.dish.match.utils.ext.gone import com.shuwei.dish.match.utils.ext.gone
import com.shuwei.dish.match.utils.ext.roundedDecimalPlace import com.shuwei.dish.match.utils.ext.roundedDecimalPlace
import com.shuwei.dish.match.utils.ext.visible import com.shuwei.dish.match.utils.ext.visible
app/src/main/java/com/shuwei/dish/match/adapter/FoodListAdapter.kt
+1 -1
View File
@@ -8,7 +8,7 @@ import com.chad.library.adapter4.BaseQuickAdapter
import com.chad.library.adapter4.viewholder.QuickViewHolder import com.chad.library.adapter4.viewholder.QuickViewHolder
import com.shuwei.dish.match.R import com.shuwei.dish.match.R
import com.shuwei.dish.match.databinding.ListItemFoodListBinding import com.shuwei.dish.match.databinding.ListItemFoodListBinding
import com.shuwei.dish.match.entity.FoodRecord import com.shuwei.dish.match.model.FoodRecord
import com.shuwei.dish.match.utils.ext.gone import com.shuwei.dish.match.utils.ext.gone
import com.shuwei.dish.match.utils.ext.visible import com.shuwei.dish.match.utils.ext.visible
import java.text.DecimalFormat import java.text.DecimalFormat
app/src/main/java/com/shuwei/dish/match/adapter/FoodMaterialAdapter.kt
+1 -1
View File
@@ -9,7 +9,7 @@ import com.chad.library.adapter4.BaseQuickAdapter
import com.chad.library.adapter4.viewholder.QuickViewHolder import com.chad.library.adapter4.viewholder.QuickViewHolder
import com.shuwei.dish.match.R import com.shuwei.dish.match.R
import com.shuwei.dish.match.databinding.ListItemFoodMaterialBinding import com.shuwei.dish.match.databinding.ListItemFoodMaterialBinding
import com.shuwei.dish.match.entity.GoodsItem import com.shuwei.dish.match.model.GoodsItem
import com.shuwei.dish.match.utils.ext.gone import com.shuwei.dish.match.utils.ext.gone
import com.shuwei.dish.match.utils.ext.roundedOneDecimalPlace import com.shuwei.dish.match.utils.ext.roundedOneDecimalPlace
import com.shuwei.dish.match.utils.ext.visible import com.shuwei.dish.match.utils.ext.visible
app/src/main/java/com/shuwei/dish/match/adapter/HomeModeAdapter.kt
+1 -1
View File
@@ -8,7 +8,7 @@ import com.chad.library.adapter4.BaseQuickAdapter
import com.chad.library.adapter4.viewholder.QuickViewHolder import com.chad.library.adapter4.viewholder.QuickViewHolder
import com.shuwei.dish.match.R import com.shuwei.dish.match.R
import com.shuwei.dish.match.databinding.ListItemHomeModeBinding import com.shuwei.dish.match.databinding.ListItemHomeModeBinding
import com.shuwei.dish.match.entity.HomeModeBean import com.shuwei.dish.match.model.HomeModeBean
import com.shuwei.dish.match.utils.ext.gone import com.shuwei.dish.match.utils.ext.gone
import com.shuwei.dish.match.utils.ext.visible import com.shuwei.dish.match.utils.ext.visible
app/src/main/java/com/shuwei/dish/match/adapter/SeasoningSearchAdapter.kt
+1 -1
View File
@@ -8,7 +8,7 @@ import com.chad.library.adapter4.BaseQuickAdapter
import com.chad.library.adapter4.viewholder.QuickViewHolder import com.chad.library.adapter4.viewholder.QuickViewHolder
import com.shuwei.dish.match.R import com.shuwei.dish.match.R
import com.shuwei.dish.match.databinding.ListItemSeasoningBinding import com.shuwei.dish.match.databinding.ListItemSeasoningBinding
import com.shuwei.dish.match.entity.GoodsItem import com.shuwei.dish.match.model.GoodsItem
/** /**
* 调料搜索弹窗适配器 * 调料搜索弹窗适配器
app/src/main/java/com/shuwei/dish/match/adapter/VectorCollectionAdapter.kt
+1 -1
View File
@@ -9,7 +9,7 @@ import com.chad.library.adapter4.BaseQuickAdapter
import com.chad.library.adapter4.viewholder.QuickViewHolder import com.chad.library.adapter4.viewholder.QuickViewHolder
import com.shuwei.dish.match.R import com.shuwei.dish.match.R
import com.shuwei.dish.match.databinding.ListItemVectorCollectionBinding import com.shuwei.dish.match.databinding.ListItemVectorCollectionBinding
import com.shuwei.dish.match.entity.FoodCollectionBean import com.shuwei.dish.match.model.FoodCollectionBean
import com.shuwei.dish.match.utils.ext.load import com.shuwei.dish.match.utils.ext.load
class VectorCollectionAdapter (var list: MutableList<FoodCollectionBean>) : class VectorCollectionAdapter (var list: MutableList<FoodCollectionBean>) :
app/src/main/java/com/shuwei/dish/match/db/AppDatabase.kt
+4 -4
View File
@@ -10,10 +10,10 @@ import com.shuwei.dish.match.db.dao.CookFoodDao
import com.shuwei.dish.match.db.dao.CookFoodGoodsDao import com.shuwei.dish.match.db.dao.CookFoodGoodsDao
import com.shuwei.dish.match.db.dao.SeasoningDao import com.shuwei.dish.match.db.dao.SeasoningDao
import com.shuwei.dish.match.db.dao.SeasoningSlotDao import com.shuwei.dish.match.db.dao.SeasoningSlotDao
import com.shuwei.dish.match.entity.CookFoodEntity import com.shuwei.dish.match.db.entity.CookFoodEntity
import com.shuwei.dish.match.entity.CookFoodGoodsEntity import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
import com.shuwei.dish.match.entity.SeasoningEntity import com.shuwei.dish.match.db.entity.SeasoningEntity
import com.shuwei.dish.match.entity.SeasoningSlotEntity import com.shuwei.dish.match.db.entity.SeasoningSlotEntity
// 步骤1：更新版本号 // 步骤1：更新版本号
app/src/main/java/com/shuwei/dish/match/db/DbRepository.kt
+4 -4
View File
@@ -1,10 +1,10 @@
package com.shuwei.dish.match.db package com.shuwei.dish.match.db
import com.shuwei.dish.match.base.BaseApp import com.shuwei.dish.match.base.BaseApp
import com.shuwei.dish.match.entity.CookFoodEntity import com.shuwei.dish.match.db.entity.CookFoodEntity
import com.shuwei.dish.match.entity.CookFoodGoodsEntity import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
import com.shuwei.dish.match.entity.SeasoningEntity import com.shuwei.dish.match.db.entity.SeasoningEntity
import com.shuwei.dish.match.entity.SeasoningSlotEntity import com.shuwei.dish.match.db.entity.SeasoningSlotEntity
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
app/src/main/java/com/shuwei/dish/match/db/DbViewModel.kt
+5 -5
View File
@@ -2,12 +2,12 @@ package com.shuwei.dish.match.db
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import com.shuwei.dish.match.entity.CollectedFoodItem import com.shuwei.dish.match.model.CollectedFoodItem
import com.shuwei.dish.match.entity.CookFoodEntity import com.shuwei.dish.match.db.entity.CookFoodEntity
import com.shuwei.dish.match.objbox.ObjectBox import com.shuwei.dish.match.objbox.ObjectBox
import com.shuwei.dish.match.entity.CookFoodGoodsEntity import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
import com.shuwei.dish.match.entity.SeasoningEntity import com.shuwei.dish.match.db.entity.SeasoningEntity
import com.shuwei.dish.match.entity.SeasoningSlotEntity import com.shuwei.dish.match.db.entity.SeasoningSlotEntity
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.asStateFlow
app/src/main/java/com/shuwei/dish/match/db/dao/CookFoodDao.kt
+1 -1
View File
@@ -5,7 +5,7 @@ import androidx.room.Insert
import androidx.room.OnConflictStrategy import androidx.room.OnConflictStrategy
import androidx.room.Query import androidx.room.Query
import androidx.room.Update import androidx.room.Update
import com.shuwei.dish.match.entity.CookFoodEntity import com.shuwei.dish.match.db.entity.CookFoodEntity
@Dao @Dao
interface CookFoodDao { interface CookFoodDao {
app/src/main/java/com/shuwei/dish/match/db/dao/CookFoodGoodsDao.kt
+1 -1
View File
@@ -5,7 +5,7 @@ import androidx.room.Insert
import androidx.room.OnConflictStrategy import androidx.room.OnConflictStrategy
import androidx.room.Query import androidx.room.Query
import androidx.room.Update import androidx.room.Update
import com.shuwei.dish.match.entity.CookFoodGoodsEntity import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
@Dao @Dao
interface CookFoodGoodsDao { interface CookFoodGoodsDao {
app/src/main/java/com/shuwei/dish/match/db/dao/SeasoningDao.kt
+1 -1
View File
@@ -5,7 +5,7 @@ import androidx.room.Insert
import androidx.room.OnConflictStrategy import androidx.room.OnConflictStrategy
import androidx.room.Query import androidx.room.Query
import androidx.room.Update import androidx.room.Update
import com.shuwei.dish.match.entity.SeasoningEntity import com.shuwei.dish.match.db.entity.SeasoningEntity
@Dao @Dao
interface SeasoningDao { interface SeasoningDao {
app/src/main/java/com/shuwei/dish/match/db/dao/SeasoningSlotDao.kt
+1 -1
View File
@@ -4,7 +4,7 @@ import androidx.room.Dao
import androidx.room.Insert import androidx.room.Insert
import androidx.room.OnConflictStrategy import androidx.room.OnConflictStrategy
import androidx.room.Query import androidx.room.Query
import com.shuwei.dish.match.entity.SeasoningSlotEntity import com.shuwei.dish.match.db.entity.SeasoningSlotEntity
/** /**
* 调料槽位配置 DAO * 调料槽位配置 DAO
app/src/main/java/com/shuwei/dish/match/entity/CookFoodEntity.kt → app/src/main/java/com/shuwei/dish/match/db/entity/CookFoodEntity.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.shuwei.dish.match.entity package com.shuwei.dish.match.db.entity
import androidx.room.Entity import androidx.room.Entity
import androidx.room.Ignore import androidx.room.Ignore
app/src/main/java/com/shuwei/dish/match/entity/CookFoodGoodsEntity.kt → app/src/main/java/com/shuwei/dish/match/db/entity/CookFoodGoodsEntity.kt
+2 -1
View File
@@ -1,8 +1,9 @@
package com.shuwei.dish.match.entity package com.shuwei.dish.match.db.entity
import androidx.room.Entity import androidx.room.Entity
import androidx.room.PrimaryKey import androidx.room.PrimaryKey
import com.shuwei.dish.match.db.BaseEntity import com.shuwei.dish.match.db.BaseEntity
import com.shuwei.dish.match.model.GoodsItem
import com.shuwei.dish.match.utils.DateTimeUtil import com.shuwei.dish.match.utils.DateTimeUtil
import java.io.Serializable import java.io.Serializable
import java.time.LocalDateTime import java.time.LocalDateTime
app/src/main/java/com/shuwei/dish/match/entity/SeasoningEntity.kt → app/src/main/java/com/shuwei/dish/match/db/entity/SeasoningEntity.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.shuwei.dish.match.entity package com.shuwei.dish.match.db.entity
import androidx.room.Entity import androidx.room.Entity
import androidx.room.PrimaryKey import androidx.room.PrimaryKey
app/src/main/java/com/shuwei/dish/match/entity/SeasoningSlotEntity.kt → app/src/main/java/com/shuwei/dish/match/db/entity/SeasoningSlotEntity.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.shuwei.dish.match.entity package com.shuwei.dish.match.db.entity
import androidx.room.Entity import androidx.room.Entity
app/src/main/java/com/shuwei/dish/match/dialog/FoodSearchDialog.kt
+1 -1
View File
@@ -26,7 +26,7 @@ import com.shuwei.dish.match.base.BaseActivity
import com.shuwei.dish.match.databinding.DialogFoodSearchBinding import com.shuwei.dish.match.databinding.DialogFoodSearchBinding
import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
import com.shuwei.dish.match.dialog.SeasoningSelectDialog.Companion.PAGE_SIZE import com.shuwei.dish.match.dialog.SeasoningSelectDialog.Companion.PAGE_SIZE
import com.shuwei.dish.match.entity.GoodsItem import com.shuwei.dish.match.model.GoodsItem
import com.shuwei.dish.match.net.UiState import com.shuwei.dish.match.net.UiState
import com.shuwei.dish.match.utils.KeyboardUtil import com.shuwei.dish.match.utils.KeyboardUtil
import com.shuwei.dish.match.utils.buildMockGoodsList import com.shuwei.dish.match.utils.buildMockGoodsList
app/src/main/java/com/shuwei/dish/match/dialog/SeasoningSelectDialog.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import com.shuwei.dish.match.adapter.SeasoningSearchAdapter
import com.shuwei.dish.match.base.BaseActivity import com.shuwei.dish.match.base.BaseActivity
import com.shuwei.dish.match.databinding.DialogSeasoningSelectBinding import com.shuwei.dish.match.databinding.DialogSeasoningSelectBinding
import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
import com.shuwei.dish.match.entity.GoodsItem import com.shuwei.dish.match.model.GoodsItem
import com.shuwei.dish.match.net.UiState import com.shuwei.dish.match.net.UiState
import com.shuwei.dish.match.utils.KeyboardUtil import com.shuwei.dish.match.utils.KeyboardUtil
import com.shuwei.dish.match.utils.ext.addOnActionSearchListener import com.shuwei.dish.match.utils.ext.addOnActionSearchListener
app/src/main/java/com/shuwei/dish/match/entity/CollectedFoodItem.kt → app/src/main/java/com/shuwei/dish/match/model/CollectedFoodItem.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.shuwei.dish.match.entity package com.shuwei.dish.match.model
/** /**
* 已采集食材列表项数据模型 * 已采集食材列表项数据模型
app/src/main/java/com/shuwei/dish/match/entity/CookFoodDTO.kt → app/src/main/java/com/shuwei/dish/match/model/CookFoodDTO.kt
+3 -1
View File
@@ -1,5 +1,7 @@
package com.shuwei.dish.match.entity package com.shuwei.dish.match.model
import com.shuwei.dish.match.db.entity.CookFoodEntity
import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
import java.io.Serializable import java.io.Serializable
/** /**
app/src/main/java/com/shuwei/dish/match/entity/CookFoodGoodsDTO.kt → app/src/main/java/com/shuwei/dish/match/model/CookFoodGoodsDTO.kt
+3 -1
View File
@@ -1,5 +1,7 @@
package com.shuwei.dish.match.entity package com.shuwei.dish.match.model
import com.shuwei.dish.match.db.entity.CookFoodEntity
import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
import java.io.Serializable import java.io.Serializable
/** /**
app/src/main/java/com/shuwei/dish/match/entity/DataBean.kt → app/src/main/java/com/shuwei/dish/match/model/DataBean.kt
+1 -3
View File
@@ -1,4 +1,4 @@
package com.shuwei.dish.match.entity package com.shuwei.dish.match.model
import android.graphics.Bitmap import android.graphics.Bitmap
import android.net.Uri import android.net.Uri
@@ -50,5 +50,3 @@ data class FoodCollectionBean(
return result return result
} }
} }
app/src/main/java/com/shuwei/dish/match/entity/FoodRecord.kt → app/src/main/java/com/shuwei/dish/match/model/FoodRecord.kt
+1 -2
View File
@@ -1,4 +1,4 @@
package com.shuwei.dish.match.entity package com.shuwei.dish.match.model
import java.io.Serializable import java.io.Serializable
@@ -17,4 +17,3 @@ data class FoodRecord(
var isOriginalData: Boolean = true, var isOriginalData: Boolean = true,
var sort: Int = 0 var sort: Int = 0
) : Serializable ) : Serializable
app/src/main/java/com/shuwei/dish/match/entity/GoodsItem.kt → app/src/main/java/com/shuwei/dish/match/model/GoodsItem.kt
+3 -1
View File
@@ -1,5 +1,7 @@
package com.shuwei.dish.match.entity package com.shuwei.dish.match.model
import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
import com.shuwei.dish.match.db.entity.SeasoningEntity
import java.io.Serializable import java.io.Serializable
/** /**
app/src/main/java/com/shuwei/dish/match/entity/GoodsNameQueryDTO.kt → app/src/main/java/com/shuwei/dish/match/model/GoodsNameQueryDTO.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.shuwei.dish.match.entity package com.shuwei.dish.match.model
/** /**
* 物品名称批量查询入参 DTO * 物品名称批量查询入参 DTO
app/src/main/java/com/shuwei/dish/match/net/ApiService.kt
+3 -3
View File
@@ -1,9 +1,9 @@
package com.shuwei.dish.match.net package com.shuwei.dish.match.net
import com.shuwei.dish.match.base.GlobalData import com.shuwei.dish.match.base.GlobalData
import com.shuwei.dish.match.entity.CookFoodDTO import com.shuwei.dish.match.model.CookFoodDTO
import com.shuwei.dish.match.entity.FoodRecord import com.shuwei.dish.match.model.FoodRecord
import com.shuwei.dish.match.entity.GoodsItem import com.shuwei.dish.match.model.GoodsItem
import okhttp3.MultipartBody import okhttp3.MultipartBody
import okhttp3.RequestBody import okhttp3.RequestBody
import retrofit2.http.Body import retrofit2.http.Body
app/src/main/java/com/shuwei/dish/match/net/NetViewModel.kt
+4 -4
View File
@@ -3,10 +3,10 @@ package com.shuwei.dish.match.net
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import com.shuwei.dish.match.base.BaseApp import com.shuwei.dish.match.base.BaseApp
import com.shuwei.dish.match.entity.CookFoodDTO import com.shuwei.dish.match.model.CookFoodDTO
import com.shuwei.dish.match.entity.FoodRecord import com.shuwei.dish.match.model.FoodRecord
import com.shuwei.dish.match.entity.GoodsItem import com.shuwei.dish.match.model.GoodsItem
import com.shuwei.dish.match.entity.GoodsNameQueryDTO import com.shuwei.dish.match.model.GoodsNameQueryDTO
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
app/src/main/java/com/shuwei/dish/match/net/RemoteRepository.kt
+3 -3
View File
@@ -1,8 +1,8 @@
package com.shuwei.dish.match.net package com.shuwei.dish.match.net
import com.shuwei.dish.match.entity.CookFoodDTO import com.shuwei.dish.match.model.CookFoodDTO
import com.shuwei.dish.match.entity.FoodRecord import com.shuwei.dish.match.model.FoodRecord
import com.shuwei.dish.match.entity.GoodsItem import com.shuwei.dish.match.model.GoodsItem
import okhttp3.MultipartBody import okhttp3.MultipartBody
import okhttp3.RequestBody import okhttp3.RequestBody
app/src/main/java/com/shuwei/dish/match/ui/CollectedFoodActivity.kt
+1 -1
View File
@@ -19,7 +19,7 @@ import com.shuwei.dish.match.base.BaseActivity
import com.shuwei.dish.match.databinding.ActivityCollectedFoodBinding import com.shuwei.dish.match.databinding.ActivityCollectedFoodBinding
import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
import com.shuwei.dish.match.dialog.CommonDialog import com.shuwei.dish.match.dialog.CommonDialog
import com.shuwei.dish.match.entity.CollectedFoodItem import com.shuwei.dish.match.model.CollectedFoodItem
import com.shuwei.dish.match.utils.KeyboardUtil import com.shuwei.dish.match.utils.KeyboardUtil
import com.shuwei.dish.match.utils.ext.appendText import com.shuwei.dish.match.utils.ext.appendText
import com.shuwei.dish.match.utils.ext.buildSpannableString import com.shuwei.dish.match.utils.ext.buildSpannableString
app/src/main/java/com/shuwei/dish/match/ui/FoodRecognizeActivity.kt
+2 -2
View File
@@ -12,8 +12,8 @@ import com.shuwei.dish.match.base.BaseActivity
import com.shuwei.dish.match.databinding.ActivityFoodRecognizeBinding import com.shuwei.dish.match.databinding.ActivityFoodRecognizeBinding
import com.shuwei.dish.match.dialog.CommonDialog import com.shuwei.dish.match.dialog.CommonDialog
import com.shuwei.dish.match.dialog.FoodSearchDialog import com.shuwei.dish.match.dialog.FoodSearchDialog
import com.shuwei.dish.match.entity.GoodsItem import com.shuwei.dish.match.model.GoodsItem
import com.shuwei.dish.match.entity.GoodsNameQueryDTO import com.shuwei.dish.match.model.GoodsNameQueryDTO
import com.shuwei.dish.match.utils.ActivityManager import com.shuwei.dish.match.utils.ActivityManager
import com.shuwei.dish.match.utils.AddressUtil import com.shuwei.dish.match.utils.AddressUtil
import com.shuwei.dish.match.utils.WeightUtil import com.shuwei.dish.match.utils.WeightUtil
app/src/main/java/com/shuwei/dish/match/ui/FoodSearchActivity.kt
+1 -1
View File
@@ -14,7 +14,7 @@ import com.shuwei.dish.match.base.BaseActivity
import com.shuwei.dish.match.base.BaseApp import com.shuwei.dish.match.base.BaseApp
import com.shuwei.dish.match.databinding.ActivityFoodSearchBinding import com.shuwei.dish.match.databinding.ActivityFoodSearchBinding
import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
import com.shuwei.dish.match.entity.FoodRecord import com.shuwei.dish.match.model.FoodRecord
import com.shuwei.dish.match.net.UiState import com.shuwei.dish.match.net.UiState
import com.shuwei.dish.match.utils.KeyboardUtil import com.shuwei.dish.match.utils.KeyboardUtil
import com.shuwei.dish.match.utils.SpTool import com.shuwei.dish.match.utils.SpTool
app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt
+1 -1
View File
@@ -10,7 +10,7 @@ import com.shuwei.dish.match.adapter.HomeModeAdapter
import com.shuwei.dish.match.base.BaseActivity import com.shuwei.dish.match.base.BaseActivity
import com.shuwei.dish.match.base.BaseApp import com.shuwei.dish.match.base.BaseApp
import com.shuwei.dish.match.databinding.ActivityHomeBinding import com.shuwei.dish.match.databinding.ActivityHomeBinding
import com.shuwei.dish.match.entity.HomeModeBean import com.shuwei.dish.match.model.HomeModeBean
import com.shuwei.dish.match.utils.SpTool import com.shuwei.dish.match.utils.SpTool
import com.shuwei.dish.match.utils.ext.startActivity import com.shuwei.dish.match.utils.ext.startActivity
import com.shuwei.dish.match.utils.ext.toast import com.shuwei.dish.match.utils.ext.toast
app/src/main/java/com/shuwei/dish/match/ui/PrepareFoodActivity.kt
+4 -4
View File
@@ -19,10 +19,10 @@ import com.shuwei.dish.match.base.BaseActivity
import com.shuwei.dish.match.databinding.ActivityPrepareFoodBinding import com.shuwei.dish.match.databinding.ActivityPrepareFoodBinding
import com.shuwei.dish.match.databinding.LayoutCameraPreviewBinding import com.shuwei.dish.match.databinding.LayoutCameraPreviewBinding
import com.shuwei.dish.match.dialog.CommonDialog import com.shuwei.dish.match.dialog.CommonDialog
import com.shuwei.dish.match.entity.CookFoodDTO import com.shuwei.dish.match.model.CookFoodDTO
import com.shuwei.dish.match.entity.CookFoodGoodsEntity import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
import com.shuwei.dish.match.entity.FoodRecord import com.shuwei.dish.match.model.FoodRecord
import com.shuwei.dish.match.entity.GoodsItem import com.shuwei.dish.match.model.GoodsItem
import com.shuwei.dish.match.net.UiState import com.shuwei.dish.match.net.UiState
import com.shuwei.dish.match.objbox.FoodModule import com.shuwei.dish.match.objbox.FoodModule
import com.shuwei.dish.match.utils.AddressUtil import com.shuwei.dish.match.utils.AddressUtil
app/src/main/java/com/shuwei/dish/match/ui/SamplingModeActivity.kt
+1 -1
View File
@@ -17,7 +17,7 @@ import com.shuwei.dish.match.base.BaseApp
import com.shuwei.dish.match.databinding.ActivitySamplingModeBinding import com.shuwei.dish.match.databinding.ActivitySamplingModeBinding
import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
import com.shuwei.dish.match.dialog.CommonDialog import com.shuwei.dish.match.dialog.CommonDialog
import com.shuwei.dish.match.entity.FoodRecord import com.shuwei.dish.match.model.FoodRecord
import com.shuwei.dish.match.net.UiState import com.shuwei.dish.match.net.UiState
import com.shuwei.dish.match.utils.DateTimeUtil import com.shuwei.dish.match.utils.DateTimeUtil
import com.shuwei.dish.match.utils.ext.dp import com.shuwei.dish.match.utils.ext.dp
app/src/main/java/com/shuwei/dish/match/ui/SlaveActivity.kt
+1 -1
View File
@@ -21,7 +21,7 @@ import com.shuwei.dish.match.base.BaseActivity
import com.shuwei.dish.match.base.GlobalData import com.shuwei.dish.match.base.GlobalData
import com.shuwei.dish.match.databinding.ActivitySlaveBinding import com.shuwei.dish.match.databinding.ActivitySlaveBinding
import com.shuwei.dish.match.dialog.CommonDialog import com.shuwei.dish.match.dialog.CommonDialog
import com.shuwei.dish.match.entity.SeasoningSlotEntity import com.shuwei.dish.match.db.entity.SeasoningSlotEntity
import com.shuwei.dish.match.scale.ScaleData import com.shuwei.dish.match.scale.ScaleData
import com.shuwei.dish.match.scale.ScaleDeviceConfig import com.shuwei.dish.match.scale.ScaleDeviceConfig
import com.shuwei.dish.match.scale.ScaleServiceManager import com.shuwei.dish.match.scale.ScaleServiceManager
app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt
+4 -4
View File
@@ -17,10 +17,10 @@ import com.shuwei.dish.match.base.BaseActivity
import com.shuwei.dish.match.base.BaseApp import com.shuwei.dish.match.base.BaseApp
import com.shuwei.dish.match.databinding.ActivitySubmitFoodBinding import com.shuwei.dish.match.databinding.ActivitySubmitFoodBinding
import com.shuwei.dish.match.dialog.CommonDialog import com.shuwei.dish.match.dialog.CommonDialog
import com.shuwei.dish.match.entity.CookFoodEntity import com.shuwei.dish.match.db.entity.CookFoodEntity
import com.shuwei.dish.match.entity.CookFoodGoodsEntity import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
import com.shuwei.dish.match.entity.FoodRecord import com.shuwei.dish.match.model.FoodRecord
import com.shuwei.dish.match.entity.toDTO import com.shuwei.dish.match.model.toDTO
import com.shuwei.dish.match.net.UiState import com.shuwei.dish.match.net.UiState
import com.shuwei.dish.match.scale.ScaleDeviceConfig import com.shuwei.dish.match.scale.ScaleDeviceConfig
import com.shuwei.dish.match.scale.ScaleServiceManager import com.shuwei.dish.match.scale.ScaleServiceManager
app/src/main/java/com/shuwei/dish/match/ui/fragment/FoodListFragment.kt
+2 -2
View File
@@ -16,8 +16,8 @@ import com.shuwei.dish.match.base.BaseFragment
import com.shuwei.dish.match.databinding.FragmentFoodListBinding import com.shuwei.dish.match.databinding.FragmentFoodListBinding
import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
import com.shuwei.dish.match.dialog.CommonDialog import com.shuwei.dish.match.dialog.CommonDialog
import com.shuwei.dish.match.entity.CookFoodEntity import com.shuwei.dish.match.db.entity.CookFoodEntity
import com.shuwei.dish.match.entity.FoodRecord import com.shuwei.dish.match.model.FoodRecord
import com.shuwei.dish.match.net.UiState import com.shuwei.dish.match.net.UiState
import com.shuwei.dish.match.ui.CookingModeActivity import com.shuwei.dish.match.ui.CookingModeActivity
import com.shuwei.dish.match.ui.PrepareFoodActivity import com.shuwei.dish.match.ui.PrepareFoodActivity
app/src/main/java/com/shuwei/dish/match/ui/fragment/SeasoningConfigFragment.kt
+1 -1
View File
@@ -19,7 +19,7 @@ import com.shuwei.dish.match.base.GlobalData
import com.shuwei.dish.match.databinding.FragmentSeasoningConfigBinding import com.shuwei.dish.match.databinding.FragmentSeasoningConfigBinding
import com.shuwei.dish.match.dialog.CommonDialog import com.shuwei.dish.match.dialog.CommonDialog
import com.shuwei.dish.match.dialog.SeasoningSelectDialog import com.shuwei.dish.match.dialog.SeasoningSelectDialog
import com.shuwei.dish.match.entity.SeasoningSlotEntity import com.shuwei.dish.match.db.entity.SeasoningSlotEntity
import com.shuwei.dish.match.scale.ScaleDeviceConfig import com.shuwei.dish.match.scale.ScaleDeviceConfig
import com.shuwei.dish.match.scale.ScaleEvent import com.shuwei.dish.match.scale.ScaleEvent
import com.shuwei.dish.match.scale.ScaleServiceManager import com.shuwei.dish.match.scale.ScaleServiceManager
app/src/main/java/com/shuwei/dish/match/ui/fragment/VectorCollectionFragment.kt
+2 -2
View File
@@ -32,8 +32,8 @@ import com.shuwei.dish.match.databinding.FragmentVectorCollectionBinding
import com.shuwei.dish.match.databinding.LayoutCameraPreviewBinding import com.shuwei.dish.match.databinding.LayoutCameraPreviewBinding
import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
import com.shuwei.dish.match.dialog.Loading import com.shuwei.dish.match.dialog.Loading
import com.shuwei.dish.match.entity.FoodCollectionBean import com.shuwei.dish.match.model.FoodCollectionBean
import com.shuwei.dish.match.entity.GoodsItem import com.shuwei.dish.match.model.GoodsItem
import com.shuwei.dish.match.net.UiState import com.shuwei.dish.match.net.UiState
import com.shuwei.dish.match.objbox.Food import com.shuwei.dish.match.objbox.Food
import com.shuwei.dish.match.objbox.FoodModule import com.shuwei.dish.match.objbox.FoodModule
app/src/main/java/com/shuwei/dish/match/utils/ImageUploader.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package com.shuwei.dish.match.utils package com.shuwei.dish.match.utils
import com.shuwei.dish.match.entity.FoodCollectionBean import com.shuwei.dish.match.model.FoodCollectionBean
import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.atomic.AtomicInteger
class ImageUploader( class ImageUploader(
app/src/main/java/com/shuwei/dish/match/utils/RawMaterialsDialogUtils.kt
+1 -1
View File
@@ -8,7 +8,7 @@ import com.google.android.material.chip.Chip
import com.google.android.material.chip.ChipGroup import com.google.android.material.chip.ChipGroup
import com.shuwei.dish.match.R import com.shuwei.dish.match.R
import com.shuwei.dish.match.dialog.CommonDialog import com.shuwei.dish.match.dialog.CommonDialog
import com.shuwei.dish.match.entity.GoodsItem import com.shuwei.dish.match.model.GoodsItem
import com.shuwei.dish.match.utils.ext.dp import com.shuwei.dish.match.utils.ext.dp
import com.shuwei.dish.match.utils.ext.gone import com.shuwei.dish.match.utils.ext.gone
import com.shuwei.dish.match.utils.ext.toast import com.shuwei.dish.match.utils.ext.toast