zhangshenjie 1 month ago
parent
commit
9174cb4651

+ 14 - 8
BusinessSetting/src/main/java/com/develop/setting/ui/BrightnessActivity.kt

@@ -49,15 +49,21 @@ class BrightnessActivity : CommonBindingActivity<ActivityBirghtnessBinding>() {
         }
         if (sn.startsWith("011")) {
             //需要需要 011 需要显示亮度出来 亮度title隐藏
-            binding.tvSound.visibility = View.INVISIBLE
-            binding.sbBrightness.visibility = View.VISIBLE
-            binding.ivSoundOne.visibility = View.VISIBLE
-            binding.ivSoundTwo.visibility = View.VISIBLE
-
-
-
+            //011G需要把控制亮度隐藏
+            if (sn.startsWith("011G")){
+                binding.tvSound.visibility = View.GONE
+                binding.sbBrightness.visibility = View.GONE
+                binding.ivSoundOne.visibility = View.GONE
+                binding.ivSoundTwo.visibility = View.GONE
+                binding.tvScreenLockTime.visibility = View.INVISIBLE
+            }else{
+                binding.tvSound.visibility = View.INVISIBLE
+                binding.sbBrightness.visibility = View.VISIBLE
+                binding.ivSoundOne.visibility = View.VISIBLE
+                binding.ivSoundTwo.visibility = View.VISIBLE
+                binding.tvScreenLockTime.visibility = View.INVISIBLE
+            }
 
-            binding.tvScreenLockTime.visibility = View.INVISIBLE
             binding.tvTitle.updateText(getString(com.develop.common.R.string.brightness_011))
         } else {
             binding.tvTitle.updateText(getString(com.develop.common.R.string.brightness))

+ 1 - 1
BusinessSetting/src/main/java/com/develop/setting/ui/ScreensaverActivity.kt

@@ -73,7 +73,7 @@ class ScreensaverActivity : CommonBindingActivity<ActivityScreensaverBinding>()
 
 
         val bannerAdapter = ScreenBannerAdapter(
-            if (sn.startsWith("011A")) dataList011A
+            if (sn.startsWith("011A")||sn.startsWith("011G")) dataList011A
             else if (sn.startsWith("011D")) dataList011D
             else if (sn.startsWith("011F")) dataList011F
             else if (sn.startsWith("011E")) dataList011E