合并代码

BusinessSetting/src/main/java/com/develop/setting/ui/AboutActivity.kt

@@ -25,6 +25,7 @@ import com.develop.base.ext.dimenRes
 import com.develop.base.ext.getSN
 import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.isNightTheme
+import com.develop.base.ext.setVisible
 import com.develop.base.ext.updateText
 import com.develop.base.util.GlobalToast
 import com.develop.common.dialog.CancelConfirmDialog
@@ -88,6 +89,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         super.onCreate(savedInstanceState)
         val ivLogoParam = binding.ivLogo.layoutParams as RelativeLayout.LayoutParams
         val ivUpdateParam = binding.icUpdate.layoutParams as LinearLayout.LayoutParams
+        binding.ivClose.setVisible()
         binding.ivClose.setImageResource( com.develop.common.R.drawable.ic_close)
         //muc 过长展示需要成mcu
         if (binding.tvAboutMcu.text.length>10){

BusinessSetting/src/main/java/com/develop/setting/ui/BrightnessActivity.kt

@@ -11,6 +11,7 @@ import android.view.LayoutInflater
 import android.widget.SeekBar
 import androidx.annotation.RequiresApi
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.develop.base.ext.setVisible
 import com.develop.base.ext.updateText
 import com.develop.base.util.MMkvUtils
 import com.develop.base.util.ThreadUtils
@@ -38,6 +39,7 @@ class BrightnessActivity : CommonBindingActivity<ActivityBirghtnessBinding>() {
         binding.ivClose.setOnClickListener {
             finish()
         }
+        binding.ivClose.setVisible()
         binding.ivClose.setImageResource( com.develop.common.R.drawable.ic_close)
         setScreenManualMode()
         binding.sbBrightness.max = 127

BusinessSetting/src/main/java/com/develop/setting/ui/LanguageActivity.kt

@@ -59,6 +59,7 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
             binding.ivLogo.setVisible()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.guide_bg_036i)
         }
+        binding.ivClose.setVisible()
         binding.ivClose.setImageResource( com.develop.common.R.drawable.ic_close)
         isFromSetting = intent.extras?.getBoolean(LANGUAGE_FROM_SETTING) ?: false
         if (isFromSetting) {

BusinessSetting/src/main/java/com/develop/setting/ui/SettingMainActivity.kt

@@ -17,6 +17,7 @@ import com.develop.base.ext.getSN
 import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
+import com.develop.base.ext.setVisible
 import com.develop.base.ext.src
 import com.develop.base.ext.updateText
 import com.develop.base.manager.WifiHelp
@@ -54,6 +55,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
             DataFactory.genSettingModesList(resources)
         }
         binding.tvTitle.updateText(getString(com.develop.common.R.string.settings))
+        binding.ivClose.setVisible()
         binding.ivClose.setImageResource(com.develop.common.R.drawable.ic_close)
         binding.ivClose.setOnClickListener {
             finish()

BusinessStep/src/main/java/com/develop/step/ui/FoodListActivity.kt

@@ -50,6 +50,8 @@ class FoodListActivity : CommonBVMActivity<ActivityFoodListBinding, FoodListView
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val bundle = intent.extras
+        binding.ivClose.setVisible()
+        binding.ivClose.setImageResource(com.develop.common.R.drawable.ic_close)
         binding.ivClose.setOnClickListener {
             finish()
         }

BusinessStep/src/main/java/com/develop/step/viewmodel/FoodListViewModel.kt

@@ -89,14 +89,15 @@ class FoodListViewModel : BaseViewModel() {
                 FoodContentModel(
                     it.photoPath ?: "",
                     it.name ?: "",
-                    it.score?.toInt() ?: 5,
+                    it.score?.toInt() ?: 0,
                     getTime(it.makeHours ?: 0, it.makeMinutes ?: 0),
                     it.difficultyLevel ?: "",
                     isLike = false,
                     foodId = it.number ?: "",
                     isNetRecipes = true,
                     hasDownloaded = true,
-                    recipesEdition = it.edition
+                    recipesEdition = it.edition,
+                    useNum = it.useNum?.toInt() ?: 0
                 )
             )
         }

app/build.gradle

@@ -139,8 +139,6 @@ android {
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
             resValue("string", "app_theme", "@style/SplashTheme")
-
-
         }
 
         brand010D {

libBase/src/main/java/com/develop/base/ext/GlobaExt.kt

@@ -196,6 +196,8 @@ fun getSN(): String {
 //    return "036I21060020123010180001"
 //    return  "030A10390020123010190001"
 //    return  "017A20060020123010190001"
+//    return "010D10390020123010190001"
+  //  return "000A10390020123010190009"
     //通过反射获取sn号
     try {
         val c = Class.forName("android.os.SystemProperties")