From a00e234ba481bd34af1396d5666903bc2b09f516 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Thu, 20 Jul 2023 13:33:42 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E5=B0=8F=E4=BF=AE=E6=94=B9=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt    | 4 ++--
 .../safetywatcher/watcher/ui/adapter/SensorAdapter.kt     | 2 +-
 .../yinuo/safetywatcher/watcher/xls/utils/ExcelUtils.kt   | 8 ++++++--
 app/src/main/res/values/arrays.xml                        | 4 ++--
 app/src/main/res/values/strings.xml                       | 2 +-
 .../java/com/yinuo/library/vlc/encoder/MovieEncoder1.java | 7 +++++--
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt b/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt
index 2b7f0b2..644f4ba 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt
@@ -30,7 +30,7 @@ object TestUtils {
 
     fun insertData() {
         TxtOverlay.setShowTip("co2:50%@co:44%")
-        PushHelper.setPushUrl("rtsp://192.168.5.16:554/123")
+        PushHelper.setPushUrl("rtsp://192.168.5.17:554/123")
         GlobalScope.launch() {
             // 插入类型
             val typeDao = DBUtils.gasTypeDao()
@@ -135,7 +135,7 @@ object TestUtils {
             row.add(SimpleCellValue(it.unit))
             allData.add(row)
         }
-        val excelPath = ExcelUtils.writeStringListToExcel(allData, context)
+        val excelPath = ExcelUtils.writeStringListToExcel(allData, context, true)
 //        val dataPath = LztekUtil.getLztek()?.usbStoragePath + "/"
 //        // 直接copy到机身
 //        val command = arrayOf("remount","cp -r $excelPath $dataPath")
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/adapter/SensorAdapter.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/adapter/SensorAdapter.kt
index ec9223d..83fcca3 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/adapter/SensorAdapter.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/adapter/SensorAdapter.kt
@@ -34,7 +34,7 @@ class SensorAdapter :
                 context.startActivity(Intent(context, SensorSettingActivity::class.java))
             }
 
-            binding.sensorName.text = data.nickName ?: "$data.type传感器"
+            binding.sensorName.text = data.nickName ?: "${data.type}传感器"
             val state = data.online
             binding.sensorStatus.text = context.getText(getShowStatus(state))
             binding.sensorStatus.setTextColor(context.getColor(getShowStatusColor(state)))
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 39dc6a7..c539442 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
@@ -94,9 +94,13 @@ object ExcelUtils {
 
     fun writeStringListToExcel(
         allRowsData: List<List<ICellValue>>,
-        context: Context
+        context: Context,
+        isWarnData: Boolean = false
     ): String? {
-        val fileName = PathUtils.getNowTimeFormat(PathUtils.DATE_TO_STRING_LONG_PATTERN) + ".xls"
+        val fileName =
+            if (!isWarnData)
+                "气体浓度_${PathUtils.getNowTimeFormat(PathUtils.DATE_TO_STRING_LONG_PATTERN)}.xls"
+            else "告警数据_${PathUtils.getNowTimeFormat(PathUtils.DATE_TO_STRING_LONG_PATTERN)}.xls"
         val filePath =
             PathUtils.getExternalStoragePath(context) + PathUtils.EXCEL_EXPORT_PATH + fileName
         deleteExistFile(PathUtils.getExternalStoragePath(context) + PathUtils.EXCEL_EXPORT_PATH)
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index b1a2b19..17181f9 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -2,8 +2,8 @@
 <resources>
     <string-array name="excel_column">
         <item>时间</item>
-        <item>属性</item>
-        <item>值</item>
+        <item>名称</item>
+        <item>浓度</item>
         <item>单位</item>
     </string-array>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0b0b62a..98d30de 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,7 +14,7 @@
     <string name="sensor_data">传感器数据详情</string>
     <string name="sensor_setting">传感器设置</string>
     <string name="sensor_threshold_setting">传感器阈值设置</string>
-    <string name="cloud">云平台</string>
+    <string name="cloud">数据同步</string>
     <string name="net_setting">网络参数设置</string>
     <string name="wifi_setting">WIFI设置</string>
     <string name="recovery_setting">恢复出厂设置</string>
diff --git a/library-vlc/src/main/java/com/yinuo/library/vlc/encoder/MovieEncoder1.java b/library-vlc/src/main/java/com/yinuo/library/vlc/encoder/MovieEncoder1.java
index eda6c19..5f2d913 100644
--- a/library-vlc/src/main/java/com/yinuo/library/vlc/encoder/MovieEncoder1.java
+++ b/library-vlc/src/main/java/com/yinuo/library/vlc/encoder/MovieEncoder1.java
@@ -1,6 +1,7 @@
 package com.yinuo.library.vlc.encoder;
 
 import android.content.Context;
+
 import com.yinuo.library.vlc.RGBProgram;
 import com.yinuo.library.vlc.utils.LogUtils;
 
@@ -43,8 +44,10 @@ public class MovieEncoder1 extends BaseMovieEncoder {
             int len = Math.min(mYUVBuffer.capacity(), data.length);
             mYUVBuffer.put(data, 0, len);
         }
-        mHandler.sendMessage(mHandler.obtainMessage(MSG_FRAME_AVAILABLE,
-                (int) (timestamp >> 32), (int) timestamp));
+        if (mHandler != null) {
+            mHandler.sendMessage(mHandler.obtainMessage(MSG_FRAME_AVAILABLE,
+                    (int) (timestamp >> 32), (int) timestamp));
+        }
     }
 
     @Override