desc:导出告警数据

app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt

@@ -123,6 +123,26 @@ object TestUtils {
         commonDialog?.dismiss()
     }
 
+
+
+    fun testExportWarnExcel(context: Context, datas: MutableList<Warning>, loadingDialog: CommonDialog?) {
+        val allData = mutableListOf<List<SimpleCellValue>>()
+        datas.forEach {
+            val row = mutableListOf<SimpleCellValue>()
+            row.add(SimpleCellValue(DateUtils.formatHistoryTime(it.startTime) ?: ""))
+            row.add(SimpleCellValue(it.gasName))
+            row.add(SimpleCellValue(it.gasValue.toString()))
+            row.add(SimpleCellValue(it.unit))
+            allData.add(row)
+        }
+        val excelPath = ExcelUtils.writeStringListToExcel(allData, context)
+//        val dataPath = LztekUtil.getLztek()?.usbStoragePath + "/"
+//        // 直接copy到机身
+//        val command = arrayOf("remount","cp -r $excelPath $dataPath")
+//        execCommand(command, true, true)
+        loadingDialog?.dismiss()
+    }
+
     // ShellUtils execCommand()方法
     fun execCommand(
         commands: Array<String>,

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt

@@ -140,22 +140,6 @@ class QueryDataActivity : BaseActivity() {
                 it.gasName
             }
             val gasNewMap = HashMap<String, MutableList<Gas>>()
-//            // 多气体，分开创建list，存储之后。 再分步
-//            val gasTypeDao = DBUtils.gasTypeDao()
-//            val gasTypes = gasTypeDao.getAll()
-//            // 每种气体建立一个list
-//            val gasMap = HashMap<String, MutableList<Gas>>()
-//            // 预先创建分步合一之后的list
-//            val gasNewMap = HashMap<String, MutableList<Gas>>()
-//            gasTypes.forEach {
-//                gasMap[it.type] = mutableListOf()
-//                gasNewMap[it.type] = mutableListOf()
-//            }
-//            // 分开各个气体的数据
-//            gasList.forEach {
-//                val list = gasMap[it.gasName]
-//                list?.add(it)
-//            }
             //根据步长分割数据填充新的列表
             gasMap.forEach { (type, list) ->
                 val newMapList = mutableListOf<Gas>()

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt

@@ -7,6 +7,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.common.commonlib.db.DBUtils
 import com.common.commonlib.db.entity.Warning
 import com.yinuo.safetywatcher.R
+import com.yinuo.safetywatcher.TestUtils
 import com.yinuo.safetywatcher.databinding.ActivityWarndataBinding
 import com.yinuo.safetywatcher.watcher.base.BaseActivity
 import com.yinuo.safetywatcher.watcher.constant.DEFAULT_QUERY_TIME_INTERVAL
@@ -24,9 +25,9 @@ class WarnDataActivity : BaseActivity() {
 
     override fun onOptionClick(type: Int, target: View) {
         if (0 == type) {
-
+            queryData()
         } else if (1 == type) {
-
+            doExportData()
         }
     }
 
@@ -115,4 +116,9 @@ class WarnDataActivity : BaseActivity() {
             }
         }
     }
+
+    private fun doExportData() {
+        showLoadingDialog(R.string.export_data_tip)
+        TestUtils.testExportWarnExcel(this, mAdapter._data, loadingDialog)
+    }
 }

app/src/main/java/com/yinuo/safetywatcher/watcher/xls/utils/ExcelUtils.kt

@@ -97,9 +97,8 @@ object ExcelUtils {
         context: Context
     ): String? {
         val fileName = PathUtils.getNowTimeFormat(PathUtils.DATE_TO_STRING_LONG_PATTERN) + ".xls"
-        PathUtils.EXCEL_EXPORT_NAME = fileName
         val filePath =
-            PathUtils.getExternalStoragePath(context) + PathUtils.EXCEL_EXPORT_PATH + PathUtils.EXCEL_EXPORT_NAME
+            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))
 

app/src/main/java/com/yinuo/safetywatcher/watcher/xls/utils/PathUtils.kt

@@ -15,7 +15,6 @@ object PathUtils {
     private const val TAG: String = "BaseUtils"
     const val SHEET_NAME = "表格1"
     const val EXCEL_EXPORT_PATH = "/ExportExcel/"
-    lateinit var EXCEL_EXPORT_NAME: String
     const val DATE_TO_STRING_LONG_PATTERN: String = "yyyy_MM_dd_HH_mm_ss"
 
     fun <T> isListEmpty(list: List<T>?): Boolean {
@@ -26,7 +25,7 @@ object PathUtils {
      * 获取应用中文件存储
      */
     fun getExternalStoragePath(context: Context): String? {
-        return LztekUtil.getLztek()?.usbStoragePath
+//        return LztekUtil.getLztek()?.usbStoragePath
         return context.getExternalFilesDir(null)?.path
     }