鸡蛋页面改动

BusinessAirFryer/src/main/assets/config_000.json

@@ -10,7 +10,7 @@
       "listShow": true
     },
     {
-      "type": "COOK_EGGS ",
+      "type": "COOK_EGGS",
       "name": "cook_eggs",
       "bg": "cm_icon_cook_eggs",
       "icon": "cm_icon_cook_eggs",

BusinessCommon/src/main/res/drawable/bg_red_button_round20px.xml

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <corners android:radius="@dimen/convert_20px"/>
-    <solid android:color="@color/egg_red"/>
+    <solid android:color="@color/language_conner"/>
 
 </shape>

BusinessCommon/src/main/res/drawable/bg_red_button_round60px.xml

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <corners android:radius="@dimen/convert_60px"/>
-    <solid android:color="@color/egg_red"/>
+    <solid android:color="@color/language_conner"/>
 
 </shape>

BusinessCommon/src/main/res/drawable/eggs_selector.xml

@@ -2,5 +2,5 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/bg_white_button_round20px" android:state_checked="false" />
 
-    <item android:drawable="@drawable/bg_red_button_round20px" android:state_checked="true" />
+    <item android:drawable="@drawable/bg_yello_button_round20px" android:state_checked="true" />
 </selector>

BusinessCommon/src/main/res/layout/pop_eggs_view.xml

@@ -175,7 +175,7 @@ MAKES 2 JARS (300 ML EACH)MAKES 2 JARS (300 ML EACH)MAKES 2 JARS (300 ML EACH)MA
         android:id="@+id/egg_btn_confirm"
         android:layout_width="@dimen/convert_400px"
         android:layout_height="@dimen/convert_78px"
-        android:background="@drawable/bg_red_button_round60px"
+        android:background="@drawable/bg_yello_button_round60px"
         android:gravity="center"
         android:text="@string/confirm"
         android:textColor="#ffffff"

BusinessMain/src/main/java/com/develop/main/ui/ModesFragment.kt

@@ -74,9 +74,6 @@ class ModesFragment : CommonBVMFragment<FragmentModesBinding, HomeViewModel>() {
     private fun initView() {
 
         val configJson = ConfigUtils.loadConfig()
-        configJson?.workModes?.forEach {
-            Log.d("TAG ModesFragment", "ModesFragment :$it")
-        }
         var modes =
             configJson?.workModes?.filter { it.devMode == CofarSDK.devInfo().devMode && it.listShow == true }
 

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

@@ -1164,7 +1164,6 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             //设置鸡蛋
             visibilityEgg(View.GONE)
             if (viewModel.modeType == ModesType.TURBO.name) {
-                Log.d("dddddd", "llTurboView===VISIBLE")
                 binding.llTurboView.visibility = View.VISIBLE
             }
         } else {
@@ -1638,8 +1637,6 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
         this.minMotorGear = minMotorGear.toInt()
         this.maxMotorGear = maxMotorGear.toInt()
-        Log.e("TAG updateMotorGearUI","minMotorGear :"+minMotorGear)
-        Log.e("TAG updateMotorGearUI","maxMotorGear :"+minMotorGear)
 
         this.isMotorGearChange = isMotorGearChange
         binding.apply {

BusinessStep/src/main/res/layout/activity_mode_detail.xml

@@ -74,9 +74,10 @@
                 android:layout_height="@dimen/convert_60px"
                 android:layout_marginTop="@dimen/convert_28px"
                 android:layout_marginEnd="@dimen/convert_40px"
-                android:layout_toStartOf="@id/iv_turbo"
                 android:background="@drawable/ic_egg"
-                android:visibility="gone" />
+                android:visibility="gone"
+
+                />
 
             <ImageView
                 android:id="@+id/iv_turbo"

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

@@ -187,7 +187,7 @@ fun getSN(): String {
     var serial: String
 
 //    return "045A10220020123010120023"
-//    return "000A30150020123010190001"
+    return "000A30150020123010190001"
 //    return "010D30150020123010190001"
 
 //    return "011A30150020123010190001"