Merge branch 'master' of https://git.kuyuntech.com/developer/FoodCooking_LandScape

BusinessCommon/src/main/res/values-fr/strings.xml

@@ -284,5 +284,5 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="no_net_error">Veuillez vous connecter au Wifi</string>
     <string name="no_login">Please enter the fields above to log in</string>
     <string name="enjoy_your_meal_desc">Votre recette est prête ！</string>
-
+    <string name="login_expire_tips">Veuillez saisir les champs ci-dessus pour vous connecter</string>
 </resources>

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

@@ -85,7 +85,7 @@ class BrightnessActivity : CommonBindingActivity<ActivityBirghtnessBinding>() {
         if (min == 10) {
             binding.rgLockTime.check(R.id.rb_10_min)
         }
-        if (min == 30) {
+        if (min == 20) {
             binding.rgLockTime.check(R.id.rb_30_min)
         }
 

BusinessSetting/src/main/res/layout/activity_birghtness.xml

@@ -87,7 +87,7 @@
         <RadioButton
             android:id="@+id/rb_3_min"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:button="@drawable/lock_time_selector"
             android:gravity="center_vertical"
             android:text="@string/time_5min"
@@ -99,7 +99,7 @@
         <RadioButton
             android:id="@+id/rb_10_min"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/convert_102px"
             android:button="@drawable/lock_time_selector"
             android:gravity="center_vertical"
@@ -111,7 +111,7 @@
         <RadioButton
             android:id="@+id/rb_30_min"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/convert_102px"
             android:button="@drawable/lock_time_selector"
             android:gravity="center_vertical"

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

@@ -1209,6 +1209,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         isTimeChange: Boolean,
         focusUpdate: Boolean = false,
     ) {
+
         this.isTimeChange = isTimeChange
         this.maxTime = maxTime.toLong()
         this.minTime = minTime.toLong()