From be267a3d7ff869b5c4974dfe9ff17b80b1053138 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Tue, 30 May 2023 17:07:31 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E8=83=8C=E5=85=89=E8=B0=83=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  29 ++++--
 .../watcher/ui/LightSettingActivity.kt        |  95 +++++++++++++++++-
 app/src/main/res/drawable/cancel_btn_bg.xml   |  10 ++
 app/src/main/res/drawable/confirm_btn_bg.xml  |  10 ++
 .../light_seekbar_progress_drawable.xml       |  25 +++++
 .../res/layout/activity_light_setting.xml     |  57 ++++++++++-
 app/src/main/res/mipmap-hdpi/ic_light.png     | Bin 0 -> 5421 bytes
 app/src/main/res/values/colors.xml            |   3 +
 app/src/main/res/values/dimens.xml            |   7 ++
 app/src/main/res/values/strings.xml           |   2 +
 app/src/main/res/values/styles.xml            |  13 ++-
 11 files changed, 234 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/res/drawable/cancel_btn_bg.xml
 create mode 100644 app/src/main/res/drawable/confirm_btn_bg.xml
 create mode 100644 app/src/main/res/drawable/light_seekbar_progress_drawable.xml
 create mode 100644 app/src/main/res/mipmap-hdpi/ic_light.png

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6452a95..94266cf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.yinuo.safetywatcher">
 
     <uses-feature
@@ -8,7 +9,13 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+
+    <!-- 修改系统屏幕亮度 -->
+    <uses-permission
+        android:name="android.permission.WRITE_SETTINGS"
+        tools:ignore="ProtectedPermissions" />
+
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -41,43 +48,43 @@
         <activity
             android:name=".watcher.ui.SettingActivity"
             android:exported="false"
-            android:screenOrientation="landscape"/>
+            android:screenOrientation="landscape" />
         <activity
             android:name=".watcher.ui.CloudActivity"
             android:exported="false"
-            android:screenOrientation="landscape"/>
+            android:screenOrientation="landscape" />
         <activity
             android:name=".watcher.ui.WarnDataActivity"
             android:exported="false"
-            android:screenOrientation="landscape"/>
+            android:screenOrientation="landscape" />
         <activity
             android:name=".watcher.ui.SensorActivity"
             android:exported="false"
-            android:screenOrientation="landscape"/>
+            android:screenOrientation="landscape" />
         <activity
             android:name=".watcher.ui.SensorDataActivity"
             android:exported="false"
-            android:screenOrientation="landscape"/>
+            android:screenOrientation="landscape" />
         <activity
             android:name=".watcher.ui.SensorSettingActivity"
             android:exported="false"
-            android:screenOrientation="landscape"/>
+            android:screenOrientation="landscape" />
         <activity
             android:name=".watcher.ui.QueryDataActivity"
             android:exported="false"
-            android:screenOrientation="landscape"/>
+            android:screenOrientation="landscape" />
         <activity
             android:name=".watcher.ui.TimeSettingActivity"
             android:exported="false"
-            android:screenOrientation="landscape"/>
+            android:screenOrientation="landscape" />
         <activity
             android:name=".watcher.ui.LightSettingActivity"
             android:exported="false"
-            android:screenOrientation="landscape"/>
+            android:screenOrientation="landscape" />
         <activity
             android:name=".watcher.ui.SensorThresholdSetActivity"
             android:exported="false"
-            android:screenOrientation="landscape"/>
+            android:screenOrientation="landscape" />
 
         <activity
             android:name=".MainActivity"
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/LightSettingActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/LightSettingActivity.kt
index 0832c38..da3e0d7 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/LightSettingActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/LightSettingActivity.kt
@@ -1,14 +1,16 @@
 package com.yinuo.safetywatcher.watcher.ui
 
+import android.provider.Settings
 import android.view.View
+import android.widget.SeekBar
+import android.widget.SeekBar.OnSeekBarChangeListener
 import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.ActivityLightSettingBinding
-import com.yinuo.safetywatcher.databinding.ActivitySensorBinding
 import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity
 
 class LightSettingActivity : NoOptionsActivity() {
 
-    private val mBingding by lazy {
+    private val mBinding by lazy {
         ActivityLightSettingBinding.inflate(layoutInflater)
     }
 
@@ -17,9 +19,96 @@ class LightSettingActivity : NoOptionsActivity() {
     }
 
     override fun generateContentView(): View {
-        return mBingding.root
+        return mBinding.root
     }
 
     override fun initView() {
+        val initLight = getScreenBrightness()
+        mBinding.sbLight.progress = initLight
+        mBinding.sbLight.setOnSeekBarChangeListener(object : OnSeekBarChangeListener {
+            override fun onProgressChanged(p0: SeekBar?, p1: Int, p2: Boolean) {
+                setWindowBrightness(p1)
+            }
+
+            override fun onStartTrackingTouch(p0: SeekBar?) {
+            }
+
+            override fun onStopTrackingTouch(p0: SeekBar?) {
+            }
+        })
+
+        mBinding.tvCancel.setOnClickListener {
+            setWindowBrightness(initLight)
+        }
+        mBinding.tvConfirm.setOnClickListener {
+            setScreenBrightness(mBinding.sbLight.progress)
+        }
+    }
+
+
+    /**
+     * 获取系统屏幕亮度(0-255)
+     */
+    private fun getScreenBrightness(): Int {
+        try {
+            return Settings.System.getInt(this.contentResolver, Settings.System.SCREEN_BRIGHTNESS)
+        } catch (e: Settings.SettingNotFoundException) {
+            e.printStackTrace()
+        }
+        return 0
+    }
+
+    /**
+     * 设置当前应用屏幕亮度，只当前有效
+     */
+    private fun setWindowBrightness(brightness: Int) {
+        val window = window
+        val lp = window.attributes
+        lp.screenBrightness = brightness / 255.0f
+        window.attributes = lp
+    }
+
+
+    /**
+     * 设置系统屏幕亮度，影响所有页面和app
+     * 注意：这种方式是需要手动权限的（android.permission.WRITE_SETTINGS）
+     */
+    private fun setScreenBrightness(brightness: Int) {
+        try {
+            //先检测调节模式
+            setScreenManualMode()
+            //再设置
+            Settings.System.putInt(
+                this.contentResolver,
+                Settings.System.SCREEN_BRIGHTNESS,
+                brightness
+            )
+        } catch (e: Settings.SettingNotFoundException) {
+            e.printStackTrace()
+        }
+    }
+
+
+    /**
+     * 设置系统亮度调节模式(SCREEN_BRIGHTNESS_MODE)
+     * SCREEN_BRIGHTNESS_MODE_MANUAL 手动调节
+     * SCREEN_BRIGHTNESS_MODE_AUTOMATIC 自动调节
+     */
+    private fun setScreenManualMode() {
+        try {
+            //获取当前系统亮度调节模式
+            val mode =
+                Settings.System.getInt(this.contentResolver, Settings.System.SCREEN_BRIGHTNESS_MODE)
+            //如果是自动，则改为手动
+            if (mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
+                Settings.System.putInt(
+                    this.contentResolver,
+                    Settings.System.SCREEN_BRIGHTNESS_MODE,
+                    Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL
+                )
+            }
+        } catch (e: Settings.SettingNotFoundException) {
+            e.printStackTrace()
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cancel_btn_bg.xml b/app/src/main/res/drawable/cancel_btn_bg.xml
new file mode 100644
index 0000000..e05a7c2
--- /dev/null
+++ b/app/src/main/res/drawable/cancel_btn_bg.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/_2A4284_30" />
+    <corners
+        android:bottomRightRadius="0dp"
+        android:bottomLeftRadius="@dimen/_20dp"
+        android:topLeftRadius="0dp"
+        android:topRightRadius="0dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/confirm_btn_bg.xml b/app/src/main/res/drawable/confirm_btn_bg.xml
new file mode 100644
index 0000000..3caee33
--- /dev/null
+++ b/app/src/main/res/drawable/confirm_btn_bg.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/_2A4284" />
+    <corners
+        android:bottomRightRadius="@dimen/_20dp"
+        android:bottomLeftRadius="0dp"
+        android:topLeftRadius="0dp"
+        android:topRightRadius="0dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/light_seekbar_progress_drawable.xml b/app/src/main/res/drawable/light_seekbar_progress_drawable.xml
new file mode 100644
index 0000000..8107ddc
--- /dev/null
+++ b/app/src/main/res/drawable/light_seekbar_progress_drawable.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!--定义seekbar滑动条的底色-->
+    <item android:id="@android:id/background">
+        <shape>
+            <corners android:radius="@dimen/_20dp" />
+            <gradient
+                android:angle="270"
+                android:centerColor="@color/_505971"
+                android:centerY="0.75"
+                android:endColor="@color/_505971"
+                android:startColor="@color/_505971" />
+        </shape>
+    </item>
+    <!--定义seekbar滑动条进度颜色-->
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <corners android:radius="@dimen/_20dp" />
+                <solid android:color="@color/white" />
+            </shape>
+        </clip>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/layout/activity_light_setting.xml b/app/src/main/res/layout/activity_light_setting.xml
index d829e29..cc3ae92 100644
--- a/app/src/main/res/layout/activity_light_setting.xml
+++ b/app/src/main/res/layout/activity_light_setting.xml
@@ -1,7 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
 
+    <RelativeLayout
+        android:layout_width="@dimen/_960dp"
+        android:layout_height="@dimen/_511dp"
+        android:layout_marginTop="@dimen/_201dp"
+        android:background="@drawable/warn_setting_btn_bg">
+
+        <SeekBar
+            android:id="@+id/sb_light"
+            style="@style/LightSeekbarStyle"
+            android:layout_width="@dimen/_630dp"
+            android:layout_height="@dimen/_100dp"
+            android:layout_marginStart="@dimen/_140dp"
+            android:layout_marginTop="@dimen/_160dp"
+            android:max="255"
+            android:min="0"
+            android:padding="0dp"
+            android:progress="20" />
+
+        <TextView
+            android:id="@+id/tv_light"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="@dimen/_185dp"
+            android:layout_marginEnd="@dimen/_132dp"
+            android:text="55%"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_36dp" />
+
+        <TextView
+            android:id="@+id/tv_cancel"
+            android:layout_width="@dimen/_480dp"
+            android:layout_height="@dimen/_81dp"
+            android:layout_alignParentBottom="true"
+            android:background="@drawable/cancel_btn_bg"
+            android:gravity="center"
+            android:text="@string/cancel"
+            android:textColor="@color/white_30"
+            android:textSize="@dimen/_36dp" />
+
+        <TextView
+            android:id="@+id/tv_confirm"
+            android:layout_width="@dimen/_480dp"
+            android:layout_height="@dimen/_81dp"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true"
+            android:background="@drawable/confirm_btn_bg"
+            android:gravity="center"
+            android:text="@string/confirm"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_36dp" />
+    </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_light.png b/app/src/main/res/mipmap-hdpi/ic_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..5abffcc67b94d71ca0e6cfcd1927c1588dfded69
GIT binary patch
literal 5421
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
XYQ8}6v3JAi00000NkvXXu0mjfe)xtV

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e550f20..ae94474 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,6 +6,7 @@
 
     <color name="white">#ffffff</color>
     <color name="white_20">#33ffffff</color>
+    <color name="white_30">#4Cffffff</color>
     <color name="colorTheme">#1ED5CA</color>
     <color name="black_overlay">#66000000</color>
 
@@ -14,7 +15,9 @@
     <color name="_242f4d_30">#4C242F4D</color>
     <color name="_303852">#303852</color>
     <color name="_2A4284">#2A4284</color>
+    <color name="_2A4284_30">#4C2A4284</color>
     <color name="_842A2A">#842A2A</color>
+    <color name="_505971">#505971</color>
 
     <color name="color_ok">#01E41C</color>
     <color name="color_offline">#999999</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 7f368d1..6e17cda 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -46,4 +46,11 @@
     <dimen name="_20dp">20px</dimen>
     <dimen name="_17dp">17px</dimen>
     <dimen name="_300dp">300px</dimen>
+    <dimen name="_960dp">960px</dimen>
+    <dimen name="_511dp">511px</dimen>
+    <dimen name="_201dp">201px</dimen>
+    <dimen name="_140dp">140px</dimen>
+    <dimen name="_630dp">630px</dimen>
+    <dimen name="_81dp">81px</dimen>
+    <dimen name="_480dp">480px</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 26489ee..63e3689 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,6 +34,8 @@
     <string name="sensor_name_txt">传感器名称</string>
     <string name="sensor_step_txt">传感器量程</string>
     <string name="sensor_type_txt">传感器种类</string>
+    <string name="cancel">取消</string>
+    <string name="confirm">确认</string>
 
     <string-array name="excel_column">
         <item>时间</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 66c4e6e..70e8928 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -27,7 +27,7 @@
     </style>
 
     <!--自定义seekbarstyle-->
-    <style name="CustomSeekbarStyle" >
+    <style name="CustomSeekbarStyle">
         <item name="android:maxHeight">4dp</item>
         <item name="android:indeterminateOnly">false</item>
         <item name="android:indeterminateDrawable">@color/colorAccent</item>
@@ -35,4 +35,15 @@
         <item name="android:minHeight">10dp</item>
         <item name="android:thumb">@drawable/new_thumb</item>
     </style>
+
+
+    <!--自定义seekbarstyle-->
+    <style name="LightSeekbarStyle">
+        <item name="android:minHeight">@dimen/_100dp</item>
+        <item name="android:maxHeight">@dimen/_100dp</item>
+        <item name="android:indeterminateOnly">false</item>
+        <item name="android:indeterminateDrawable">@color/colorAccent</item>
+        <item name="android:progressDrawable">@drawable/light_seekbar_progress_drawable</item>
+        <item name="android:thumb">@null</item>
+    </style>
 </resources>