From aa3a9f5c18e39d243f74120aa7c0f252d24bf6bc Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Thu, 20 Jul 2023 13:41:57 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E5=AF=BC=E5=87=BAexcel=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yinuo/safetywatcher/watcher/xls/utils/ExcelUtils.kt  | 5 +----
 .../com/yinuo/safetywatcher/watcher/xls/utils/PathUtils.kt   | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

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 c539442..062f72e 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
@@ -102,10 +102,7 @@ object ExcelUtils {
                 "气体浓度_${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)
-        makeDir(File(PathUtils.getExternalStoragePath(context) + PathUtils.EXCEL_EXPORT_PATH))
-
+            PathUtils.getExternalStoragePath(context) + File.separator + fileName
         val columns = context.resources.getStringArray(R.array.excel_column);
         initExcel(columns, filePath, PathUtils.SHEET_NAME) //需要写入权限
 
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/xls/utils/PathUtils.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/xls/utils/PathUtils.kt
index 8c95894..2c01b31 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/xls/utils/PathUtils.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/xls/utils/PathUtils.kt
@@ -14,7 +14,6 @@ import java.util.Locale
 object PathUtils {
     private const val TAG: String = "BaseUtils"
     const val SHEET_NAME = "表格1"
-    const val EXCEL_EXPORT_PATH = "/ExportExcel/"
     const val DATE_TO_STRING_LONG_PATTERN: String = "yyyy_MM_dd_HH_mm_ss"
 
     fun <T> isListEmpty(list: List<T>?): Boolean {