11207优化

BusinessMain/src/main/java/com/develop/main/init/ui/RecipesFragment.kt

@@ -310,13 +310,19 @@ class RecipesFragment : ViewBindingFragment<FragmentCommeListBinding>() {
 
     }
 
+    var firstResume= true;
+
     override fun onResume() {
         super.onResume()
-//        if (homeViewModel.recipesType == HomeViewModel.RecipesType.ONLINE) {
-//            homeViewModel.getOnLineCategoryList()
-//        } else {
-//            homeViewModel.queryRecipesCategory()
-//        }
+        if(firstResume){
+            if (homeViewModel.recipesType == HomeViewModel.RecipesType.ONLINE) {
+                homeViewModel.getOnLineCategoryList()
+            } else {
+                homeViewModel.queryRecipesCategory()
+            }
+            firstResume = false
+        }
+
 
 
     }

BusinessStep/src/main/java/com/develop/step/CookStepActivity2.kt

@@ -786,6 +786,11 @@ class CookStepActivity2 : CookStepToolActivity() {
 
         if (keyCode == PRESS_DOWN_KEY_CODE) {
             Log.d("QQQQ", "catch key down")
+
+             if(!viewModel.isCurrentOnCookingStep()){
+                  return false
+             }
+
             //当前是turbo模式下
             if (viewModel.cookingStep?.isTurboMode() != true && viewModel.cookingStep?.isWeightMode() != true) {
 

libBase/build.gradle

@@ -28,7 +28,10 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            buildConfigField("String", "HTTP_BASE", '"https://www.baidu.com/api/release/"')
         }
+
+
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

libBase/src/main/java/com/develop/food/base/utils/GlobalExt.kt

@@ -12,6 +12,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.room.TypeConverter
+import com.develop.base.BuildConfig
 import com.develop.food.base.FoodCookBaseApp
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
@@ -266,8 +267,8 @@ fun timeStamp2Time(timeSeconds: Long, format: String = "yyyy/MM/dd HH:mm"): Stri
 fun getSN(): String {
     var serial: String
     //通过android.os获取sn号
-//    val append = "03403015"
-    val append = "01703015"
+    val append = "03403015"
+//    val append = "01703015"
     try {
         serial = Build.SERIAL
         return if (serial != "" && serial != "unknown") "${append}$serial" else "${append}888888"