From 4c95dc36ed1fa406938e03d0e95220c1288d4482 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Mon, 12 Jun 2023 15:41:46 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E5=AF=BC=E5=87=BA=E5=88=B0U=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              | 11 ------
 .../watcher/ui/HistoryVideoActivity.kt        | 35 +++++++++++--------
 app/src/main/res/values/strings.xml           |  1 +
 app/src/main/res/xml/file_path.xml            | 22 ------------
 4 files changed, 21 insertions(+), 48 deletions(-)
 delete mode 100644 app/src/main/res/xml/file_path.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 408511f..9305d16 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -112,17 +112,6 @@
             android:exported="false"
             android:theme="@style/FullscreenTheme" />
 
-        <provider
-            android:authorities="com.yinuo.safetywatcher.fileprovider"
-            android:name="androidx.core.content.FileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_path">
-            </meta-data>
-        </provider>
-
         <activity
             android:name=".MainActivity"
             android:exported="false"
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt
index 6e2cf52..62d658b 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt
@@ -2,14 +2,13 @@ package com.yinuo.safetywatcher.watcher.ui
 
 import android.content.Intent
 import android.view.View
-import androidx.core.content.FileProvider
 import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.ActivityHistoryVideoBinding
 import com.yinuo.safetywatcher.player.ProVideoActivity
 import com.yinuo.safetywatcher.watcher.base.BaseActivity
+import com.yinuo.safetywatcher.watcher.utils.LztekUtil
+import com.yinuo.safetywatcher.watcher.utils.showToast
 import com.yinuo.safetywatcher.watcher.view.CommonTopBar
-import com.yinuo.safetywatcher.xls.utils.PathUtils
-import java.io.File
 
 
 class HistoryVideoActivity : BaseActivity() {
@@ -20,19 +19,14 @@ class HistoryVideoActivity : BaseActivity() {
 
     override fun onOptionClick(type: Int, target: View) {
         if (0 == type) {
-            val intent = Intent(Intent.ACTION_VIEW)
-            val path = PathUtils.getExternalStorageDirectory() + "/test2.mp4" //该路径可以自定义
-            val file = File(path)
-            val uri  =
-                FileProvider.getUriForFile(this@HistoryVideoActivity, "com.yinuo.safetywatcher.fileprovider", file)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-            intent.setDataAndType(uri, "video/*")
-            startActivity(intent)
+
         } else if (1 == type) {
-            val intent = Intent(this@HistoryVideoActivity, ProVideoActivity::class.java)
-            val path = PathUtils.getExternalStorageDirectory() + "/test2.mp4"
-            intent.putExtra("videoPath", path)
-            startActivity(intent)
+            val usbStoragePath = LztekUtil.getLztek()?.usbStoragePath
+            if (usbStoragePath.isNullOrEmpty()) {
+                showToast(getString(R.string.no_upan_tip))
+                return
+            }
+            export2Upan()
         }
     }
 
@@ -53,4 +47,15 @@ class HistoryVideoActivity : BaseActivity() {
 
     override fun initView() {
     }
+
+    private fun export2Upan() {
+        // TODO
+    }
+
+    fun gotoPlayVideo(path: String) {
+        val intent = Intent(this@HistoryVideoActivity, ProVideoActivity::class.java)
+        // path = PathUtils.getExternalStorageDirectory() + "/test2.mp4"
+        intent.putExtra("videoPath", path)
+        startActivity(intent)
+    }
 }
\ 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 4f95d20..5d6ce70 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -52,4 +52,5 @@
 
     <string name="over_max_interval_tip">开始时间和结束时间间隔不能超过24小时！请调整</string>
     <string name="error_interval_tip">开始时间必须小于结束时间！请调整</string>
+    <string name="no_upan_tip">请先插入U盘!</string>
 </resources>
diff --git a/app/src/main/res/xml/file_path.xml b/app/src/main/res/xml/file_path.xml
deleted file mode 100644
index 5bbe67f..0000000
--- a/app/src/main/res/xml/file_path.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths>
-    <files-path
-        name="files-path"
-        path="." />
-    <cache-path
-        name="cache-path"
-        path="." />
-    <external-path
-        name="external_storage_root"
-        path="." />
-    <external-files-path
-        name="external_file_path"
-        path="." />
-    <external-cache-path
-        name="external_cache_path"
-        path="." />
-    <!--配置root-path。这样子可以读取到sd卡和一些应用分身的目录，否则微信分身保存的图片，就会导致 java.lang.IllegalArgumentException: Failed to find configured root that contains /storage/emulated/999/tencent/MicroMsg/WeiXin/export1544062754693.jpg-->
-    <root-path
-        name="root-path"
-        path="" />
-</paths>