瀏覽代碼

修复部分上传问题

Pq 2 年之前
父節點
當前提交
85940a9d61

+ 9 - 2
BaseLibrary/src/main/java/com/cooleshow/base/utils/UriUtils.java

@@ -10,6 +10,7 @@ import android.os.Environment;
 import android.os.storage.StorageManager;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
+import android.provider.OpenableColumns;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -228,7 +229,7 @@ public final class UriUtils {
                     contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
                 } else if ("audio".equals(type)) {
                     contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
-                } else if("document".equals(type)){
+                } else if ("document".equals(type)) {
                     contentUri = MediaStore.Files.getContentUri("external");
                 } else {
                     Log.d("UriUtils", uri.toString() + " parse failed. -> 1_2");
@@ -312,7 +313,13 @@ public final class UriUtils {
         InputStream is = null;
         try {
             is = Utils.getApp().getContentResolver().openInputStream(uri);
-            File file = new File(Utils.getApp().getCacheDir(), "" + System.currentTimeMillis());
+            Cursor cursor = Utils.getApp().getContentResolver().query(uri, null, null, null, null);
+            String displayName = "" + System.currentTimeMillis();
+            if (cursor.moveToFirst()) {
+                displayName = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME));
+            }
+            Log.i("UriUtils", "displayName:" + displayName);
+            File file = new File(Utils.getApp().getCacheDir(), displayName);
             UtilsBridge.writeFileFromIS(file.getAbsolutePath(), is);
             return file;
         } catch (FileNotFoundException e) {

+ 1 - 0
teacher/src/main/java/com/cooleshow/teacher/ui/web/HtmlActivity.java

@@ -1184,6 +1184,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
             }
             Log.i("pq", "baseJsonObject:" + baseJsonObject.toString());
             if (result != null) {
+                Log.i("pq", "file select result:" + result);
                 File file = UriUtils.uri2File(result);
                 if (file != null && file.exists()) {
                     if (!isMatchFile(file.getAbsolutePath())) {