|
@@ -4,6 +4,7 @@ import android.view.LayoutInflater
|
|
import android.view.ViewGroup
|
|
import android.view.ViewGroup
|
|
import android.widget.ImageView
|
|
import android.widget.ImageView
|
|
import android.widget.TextView
|
|
import android.widget.TextView
|
|
|
|
+import com.develop.base.ext.getSN
|
|
import com.develop.base.ext.load
|
|
import com.develop.base.ext.load
|
|
import com.develop.base.ext.updateText
|
|
import com.develop.base.ext.updateText
|
|
import com.develop.common.data_repo.FoodDataProvider
|
|
import com.develop.common.data_repo.FoodDataProvider
|
|
@@ -19,6 +20,8 @@ import com.drake.brv.utils.setup
|
|
//配件Fragment
|
|
//配件Fragment
|
|
class CookDetailToolsFragment :
|
|
class CookDetailToolsFragment :
|
|
CommonBVMFragment<FragmentDetailCookMethodBinding, CookDetailViewModel>() {
|
|
CommonBVMFragment<FragmentDetailCookMethodBinding, CookDetailViewModel>() {
|
|
|
|
+ private var sn = getSN()
|
|
|
|
+
|
|
override fun createViewModel(): CookDetailViewModel {
|
|
override fun createViewModel(): CookDetailViewModel {
|
|
return getViewModelOfActivity(CookDetailViewModel::class.java)
|
|
return getViewModelOfActivity(CookDetailViewModel::class.java)
|
|
}
|
|
}
|
|
@@ -46,7 +49,12 @@ class CookDetailToolsFragment :
|
|
viewModel.getRecipeLiveData().observe(viewLifecycleOwner) {
|
|
viewModel.getRecipeLiveData().observe(viewLifecycleOwner) {
|
|
val sourceItems = mutableListOf<CookToolItem>()
|
|
val sourceItems = mutableListOf<CookToolItem>()
|
|
for (accessory in it.accessory) {
|
|
for (accessory in it.accessory) {
|
|
- val path = FoodDataProvider.getResourcePath(accessory.photoPath)
|
|
|
|
|
|
+ val path = if (sn.startsWith("011D")){
|
|
|
|
+ viewModel.tuyaAccessoryPhoto(accessory.number)
|
|
|
|
+ }else{
|
|
|
|
+ FoodDataProvider.getResourcePath(accessory.photoPath)
|
|
|
|
+ }
|
|
|
|
+
|
|
sourceItems.add(CookToolItem(path, accessory.name ?: ""))
|
|
sourceItems.add(CookToolItem(path, accessory.name ?: ""))
|
|
}
|
|
}
|
|
binding.rvTools.models = sourceItems
|
|
binding.rvTools.models = sourceItems
|