Browse Source

修改宿舍版分机为自动熄屏,其他类型设备保持常亮

weizhengliang 6 tháng trước cách đây
mục cha
commit
92b9a2eb7b

+ 6 - 3
common/src/main/code/com/wdkl/ncs/android/lib/base/BaseActivity.kt

@@ -100,13 +100,16 @@ abstract class BaseActivity<PresenterType : BaseContract.BasePresenter, DataBind
         /**父类初始化*/
         /**父类初始化*/
         super.onCreate(savedInstanceState)
         super.onCreate(savedInstanceState)
         requestWindowFeature(Window.FEATURE_NO_TITLE)
         requestWindowFeature(Window.FEATURE_NO_TITLE)
-        if (!BuildConfig.device_type.equals("4")){
+
+        if (BuildConfig.device_type.equals("4") && BuildConfig.isandroid_bed.toBoolean()) {
+            //系统决定休眠时间
             window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN or
             window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN or
-                    WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or
                     WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
                     WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
                     WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON)
                     WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON)
-        }else{
+        } else {
+            //保持常亮
             window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN or
             window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN or
+                    WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or
                     WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
                     WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
                     WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON)
                     WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON)
         }
         }