提交人：jtm

提交内容:bug fixed

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

@@ -71,6 +71,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="Brightness">Brightness</string>
     <string name="screen_lock_time">Screen lock time</string>
     <string name="time_3min">3Min</string>
+    <string name="time_5min">5Min</string>
     <string name="time_10min">10Min</string>
     <string name="time_30min">30Min</string>
     <string name="Sound">Sound</string>

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

@@ -71,6 +71,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="Brightness">Brightness</string>
     <string name="screen_lock_time">Screen lock time</string>
     <string name="time_3min">3Min</string>
+    <string name="time_5min">5Min</string>
     <string name="time_10min">10Min</string>
     <string name="time_30min">30Min</string>
     <string name="Sound">Sound</string>

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

@@ -69,6 +69,7 @@
     <string name="screen_lock_time">Screen lock time</string>
     <string name="time_3min">3Min</string>
     <string name="time_10min">10Min</string>
+    <string name="time_5min">5Min</string>
     <string name="time_30min">30Min</string>
     <string name="Sound">Sound</string>
     <string name="text_to_speech">Text to speech</string>

BusinessCommon/src/main/res/values-zh-rCN/strings.xml

@@ -68,6 +68,7 @@
     <string name="Brightness">Brightness</string>
     <string name="screen_lock_time">Screen lock time</string>
     <string name="time_3min">3Min</string>
+    <string name="time_5min">5Min</string>
     <string name="time_10min">10Min</string>
     <string name="time_30min">30Min</string>
     <string name="Sound">Sound</string>

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

@@ -71,6 +71,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="Brightness">Brightness</string>
     <string name="screen_lock_time">Screen lock time</string>
     <string name="time_3min">3Min</string>
+    <string name="time_5min">5Min</string>
     <string name="time_10min">10Min</string>
     <string name="time_30min">30Min</string>
     <string name="Sound">Sound</string>

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

@@ -76,11 +76,11 @@ class BrightnessActivity : CommonBindingActivity<ActivityBirghtnessBinding>() {
                     minute = 3
                 }
                 R.id.rb_10_min -> {
-                    minute = 10
+                    minute = 5
                 }
 
                 R.id.rb_30_min -> {
-                    minute = 30
+                    minute = 10
                 }
             }
             setScreenSaverEnable(minute)

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

@@ -102,7 +102,7 @@
             android:layout_marginStart="@dimen/convert_102px"
             android:button="@drawable/lock_time_selector"
             android:gravity="center_vertical"
-            android:text="@string/time_10min"
+            android:text="@string/time_5min"
             android:paddingStart="@dimen/convert_26px"
             android:textColor="@color/color_1A1A1A"
             android:textSize="@dimen/convert_30px" />
@@ -115,7 +115,7 @@
             android:button="@drawable/lock_time_selector"
             android:gravity="center_vertical"
             android:paddingStart="@dimen/convert_26px"
-            android:text="@string/time_30min"
+            android:text="@string/time_10min"
             android:textColor="@color/color_1A1A1A"
             android:textSize="@dimen/convert_30px" />