From 2edcc0d027258abe50129d7cdf05d9670e970648 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Wed, 6 Dec 2023 17:23:37 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E4=BA=AE=E5=BA=A6=E6=9C=80=E4=BD=8E16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safetywatcher/watcher/ui/LightSettingActivity.kt      | 8 ++++++--
 .../com/yinuo/safetywatcher/watcher/utils/ExportUtils.kt  | 3 +++
 .../yinuo/safetywatcher/watcher/xls/utils/ExcelUtils.kt   | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

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 40b0190..8bae30c 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
@@ -4,6 +4,7 @@ import android.provider.Settings
 import android.view.View
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
+import com.common.commonlib.utils.LogUtils
 import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.ActivityLightSettingBinding
 import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity
@@ -74,7 +75,9 @@ class LightSettingActivity : NoOptionsActivity() {
     private fun setWindowBrightness(brightness: Int) {
         val window = window
         val lp = window.attributes
-        lp.screenBrightness = brightness / 255.0f
+        val finalLight = if (brightness <= 16) 16 else brightness
+        LogUtils.w("cyy", "finalLight = ${finalLight}")
+        lp.screenBrightness = finalLight / 255.0f
         window.attributes = lp
     }
 
@@ -85,13 +88,14 @@ class LightSettingActivity : NoOptionsActivity() {
      */
     private fun setScreenBrightness(brightness: Int) {
         try {
+            val finalLight = if (brightness <= 16) 16 else brightness
             //先检测调节模式
             setScreenManualMode()
             //再设置
             Settings.System.putInt(
                 this.contentResolver,
                 Settings.System.SCREEN_BRIGHTNESS,
-                brightness
+                finalLight
             )
         } catch (e: Settings.SettingNotFoundException) {
             e.printStackTrace()
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/ExportUtils.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/ExportUtils.kt
index 47675ce..529c2e6 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/ExportUtils.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/ExportUtils.kt
@@ -5,6 +5,7 @@ import android.os.FileUtils
 import com.common.commonlib.db.entity.Gas
 import com.common.commonlib.db.entity.Video
 import com.common.commonlib.db.entity.Warning
+import com.common.commonlib.utils.LogUtils
 import com.yinuo.safetywatcher.watcher.ui.view.CommonDialog
 import com.yinuo.safetywatcher.watcher.xls.SimpleCellValue
 import com.yinuo.safetywatcher.watcher.xls.utils.ExcelUtils
@@ -26,6 +27,7 @@ object ExportUtils {
             row.add(SimpleCellValue(it.unit))
             allData.add(row)
         }
+        LogUtils.w("testExportExcel ori data size = ${datas.size}, cell data size = ${allData.size}")
         val excelPath = ExcelUtils.writeStringListToExcel(allData, usbPath, context)
         commonDialog?.dismiss()
         return excelPath
@@ -47,6 +49,7 @@ object ExportUtils {
             row.add(SimpleCellValue(it.unit))
             allData.add(row)
         }
+        LogUtils.w("testExportWarnExcel ori data size = ${datas.size}, cell data size = ${allData.size}")
         val excelPath = ExcelUtils.writeStringListToExcel(allData, usbPath, context, true)
         loadingDialog?.dismiss()
         return excelPath
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/xls/utils/ExcelUtils.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/xls/utils/ExcelUtils.kt
index 86ad13b..e5ce1fb 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/xls/utils/ExcelUtils.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/xls/utils/ExcelUtils.kt
@@ -126,13 +126,14 @@ object ExcelUtils {
                 }
             }
             writebook.write()
-            Log.i(TAG, "Excelel 写入成功")
+            Log.i(TAG, "Excelel 写入成功 $filePath")
             return filePath
         } catch (e: Exception) {
             Log.e(TAG, "writeStringListToExcel() e==" + e.message)
         } finally {
             writebook?.close()
             inputStream?.close()
+            Log.i(TAG, "Excelel 写入完成")
         }
         return null
     }