优化加载速度

1:处理空文件夹问题

优化加载速度
1:处理空文件夹问题
吴奎庆
1 parent 23b004d9
Showing 9 changed files with 110 additions and 77 deletions
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/strike/debug/MainActivity.java
app/src/main/res/xml/app_files.xml
app/src/main/res/xml/file_paths.xml
app/src/main/res/xml/network_security_config.xml
config.gradle
lib_media/src/main/java/com/cnlive/media/frame/view/RecordPreviewView.java
lib_media/src/main/java/com/cnlive/media/ui/fragment/RecordPreviewFragment.java
lib_media/src/main/res/layout/fragment_record_preview.xml
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.cnlive.strike.debug">
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.FLASHLIGHT" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
+    <uses-permission android:name="com.sonyericsson.home.permission.BROADCAST_BADGE" />
+    <uses-permission android:name="com.sec.android.provider.badge.permission.READ" />
+    <uses-permission android:name="com.sec.android.provider.badge.permission.WRITE" />
     <application
@@ -20,6 +31,17 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true"
+            tools:replace="android:authorities">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/app_files"
+                tools:replace="android:resource" />
+        </provider>
     </application>
 </manifest>
 \ No newline at end of file
@@ -73,7 +73,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                         .isReturnUri(AndroidQUtil.isAndroidQ())
                         .selectMode(PickerConfig.PICKER_IMAGE_VIDEO)
                         .defaultSelectList(new ArrayList<Media>())
-                        .needCamera(false)
+                        .needCamera(true)
                         .builder()
 //                        .doCrop(1, 1, 900, 900)
                         .start(this, PickerConfig.PICKER_IMAGE, PickerConfig.DEFAULT_RESULT_CODE);
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <paths xmlns:android="http://schemas.android.com/apk/res/android">
+        <external-path
+            name="external_files"
+            path="" />
+        <path>
+            <root-path
+                name="root_path"
+                path="." />
+        </path>
+        <!--    MediaPicker    -->
+        <external-path
+            name="camera_photos"
+            path="" />
+        <!--    环球优物    -->
+        <external-path
+            name="external_storage_root"
+            path="." />
+        <grant-uri-permission
+            android:path="string"
+            android:pathPattern="string"
+            android:pathPrefix="string" />
+    </paths>
+</resources>
 \ No newline at end of file
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <paths>
-        <external-path path="" name="camera_photos" />
-    </paths>
-</resources>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" />
+            <certificates src="user" />
+        </trust-anchors>
+    </base-config>
+    <!--<base-config cleartextTrafficPermitted="true" />-->
+</network-security-config>
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.0.2.7",
+            version: "1.0.2.8",
             //Lib库前缀
             packeg : "com.cnlive.media",
             //Lib库名称
@@ -11,6 +11,9 @@ import android.view.animation.OvershootInterpolator;
 import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.request.RequestOptions;
 import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.media.PickerConfig;
 import com.cnlive.media.media.entity.Media;
@@ -53,11 +56,16 @@ public class RecordPreviewView implements MvpView {
         if (mFragment.type == 0) {
             mFragment.binding.ivPre.setVisibility(View.VISIBLE);
-            mFragment.binding.flVideo.setVisibility(View.GONE);
+            mFragment.binding.rlVideo.setVisibility(View.GONE);
             GlideCacheUtil.intoItemImageBitmap(mActivity, mActivity.preBitmap, mFragment.binding.ivPre);
         } else if (mFragment.type == 1) {
             mFragment.binding.ivPre.setVisibility(View.GONE);
-            mFragment.binding.flVideo.setVisibility(View.VISIBLE);
+            mFragment.binding.rlVideo.setVisibility(View.VISIBLE);
+            RequestOptions option = new RequestOptions();
+            option.dontTransform()
+                    .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
+                    .dontAnimate();
+            Glide.with(mFragment).load(mFragment.path).apply(option).into(mFragment.binding.ivVideo);
         }
         ObjectAnimator animator_cancel = ObjectAnimator.ofFloat(mFragment.binding.tbOk, "translationX", 200, 0);
@@ -76,38 +84,8 @@ public class RecordPreviewView implements MvpView {
         PLVideoEditSetting setting = new PLVideoEditSetting();
         setting.setSourceFilepath(mFragment.path);
         setting.setGifPreviewEnabled(false);
-        if (mFragment.mShortVideoEditor == null)
-            mFragment.mShortVideoEditor = new PLShortVideoEditor(mFragment.binding.gvVideo);
-        mFragment.mShortVideoEditor.setVideoEditSetting(setting);
-        mFragment.mShortVideoEditor.setPlaybackLoop(true);
-        mFragment.mShortVideoEditor.setDisplayMode(PLDisplayMode.FULL);
-        mFragment.mShortVideoEditor.startPlayback();
-        mFragment.isPlaying = true;
     }
-    private void initGlSurfaceView() {
-        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) mFragment.binding.flVideo.getLayoutParams();
-        FrameLayout.LayoutParams surfaceLayout = (FrameLayout.LayoutParams) mFragment.binding.gvVideo.getLayoutParams();
-        int outputWidth = mMediaFile.getVideoWidth();
-        int outputHeight = mMediaFile.getVideoHeight();
-        int rotation = mMediaFile.getVideoRotation();
-        if ((rotation == 90 || rotation == 270)) {
-            int temp = outputWidth;
-            outputWidth = outputHeight;
-            outputHeight = temp;
-        }
-
-        surfaceLayout.width = mFragment.mScreenSize.x;
-        surfaceLayout.height = Math.round((float) outputHeight * mFragment.mScreenSize.x / outputWidth);
-        ViewGroup.MarginLayoutParams marginParams = null;
-        if (layoutParams instanceof ViewGroup.MarginLayoutParams) {
-            marginParams = (ViewGroup.MarginLayoutParams) surfaceLayout;
-        } else {
-            marginParams = new ViewGroup.MarginLayoutParams(surfaceLayout);
-        }
-        mFragment.binding.flVideo.setLayoutParams(layoutParams);
-        mFragment.binding.gvVideo.setLayoutParams(marginParams);
-    }
     public void showMessage(String message) {
         if (mFragment == null || TextUtils.isEmpty(message)) return;
 package com.cnlive.media.ui.fragment;
-import android.graphics.Point;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
+import android.provider.MediaStore;
+import android.util.Log;
 import android.view.View;
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.Nullable;
+import androidx.core.content.FileProvider;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
+import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.libs.base.util.DoublePressed;
 import com.cnlive.media.R;
+import com.cnlive.media.databinding.FragmentRecordPreviewBinding;
 import com.cnlive.media.frame.presenter.RecordPreviewPresenter;
 import com.cnlive.media.frame.view.RecordPreviewView;
 import com.cnlive.media.ui.activity.RecordActivity;
-import com.cnlive.media.utils.Utils;
-import com.cnlive.media.databinding.FragmentRecordPreviewBinding;
-import com.qiniu.pili.droid.shortvideo.PLShortVideoEditor;
+import com.cnlive.media.utils.AndroidQUtil;
+
+import java.io.File;
 /**
  * 作 者 : wkq
@@ -32,10 +40,6 @@ public class RecordPreviewFragment extends MvpBindingFragment&lt;RecordPreviewView,
     public int type;
     //路径
     public String path;
-    public PLShortVideoEditor mShortVideoEditor;
-    public Point mScreenSize;
-    //播放状态
-    public boolean isPlaying;
     // 处理 返回事件的监听
     public OnBackPressedCallback callback = new OnBackPressedCallback(true) {
         @Override
@@ -75,7 +79,6 @@ public class RecordPreviewFragment extends MvpBindingFragment&lt;RecordPreviewView,
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         mActivity = (RecordActivity) getActivity();
-        mScreenSize = Utils.getScreenSize(mActivity);
         binding.setOnClick(this);
         if (getMvpView() != null) getMvpView().initView(mActivity);
@@ -84,39 +87,37 @@ public class RecordPreviewFragment extends MvpBindingFragment&lt;RecordPreviewView,
     @Override
     public void onResume() {
         super.onResume();
-        if (type == 1&& getMvpView()!=null){
+        if (type == 1 && getMvpView() != null) {
             getMvpView().initPre();
         }
-        isPlaying = true;
     }
     @Override
     public void onPause() {
         super.onPause();
-        if (mShortVideoEditor != null) mShortVideoEditor.stopPlayback();
-        isPlaying = false;
     }
     @Override
     public void onDestroy() {
         super.onDestroy();
         if (callback != null) callback.remove();
-        if (mShortVideoEditor != null) mShortVideoEditor.stopPlayback();
     }
     @Override
     public void onClick(View v) {
-        if (v.getId() == R.id.gv_video) {
-            if (isPlaying) {
-                if (mShortVideoEditor != null) mShortVideoEditor.pausePlayback();
-                binding.playControlIv.setVisibility(View.VISIBLE);
-                isPlaying = false;
-            }
-        } else if (v.getId() == R.id.play_control_iv) {
-            if (!isPlaying) {
-                if (mShortVideoEditor != null) mShortVideoEditor.resumePlayback();
-                isPlaying = true;
-                binding.playControlIv.setVisibility(View.GONE);
+        if (v.getId() == R.id.play_control_iv) {
+            try {
+                Uri uri = FileProvider.getUriForFile(getActivity(), getActivity().getApplicationContext().getPackageName() + ".fileprovider", new File(path));
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setDataAndType(uri, "video/*");
+                intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                if (getActivity().getPackageManager().queryIntentActivities(intent, 0).isEmpty()) {
+                    getMvpView().showMessage("未检测到播放器");
+                } else {
+                    startActivity(intent);
+                }
+            } catch (Exception e) {
+                Log.e("异常:", e.getMessage());
             }
         } else if (v.getId() == R.id.tb_cancel) {
@@ -24,29 +24,32 @@
             android:visibility="gone" />
-        <FrameLayout
-            android:id="@+id/fl_video"
+        <RelativeLayout
+
+            android:id="@+id/rl_video"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_centerInParent="true"
             android:visibility="gone">
-            <android.opengl.GLSurfaceView
-                android:id="@+id/gv_video"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:onClick="@{onClick}" />
+            <ImageView
+                android:id="@+id/iv_video"
+                android:scaleType="centerCrop"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
             <ImageView
+                android:onClick="@{onClick}"
                 android:id="@+id/play_control_iv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:onClick="@{onClick}"
-                android:src="@drawable/iv_pre_play"
-                android:visibility="gone" />
-        </FrameLayout>
+                android:src="@drawable/iv_pre_play" />
+
+        </RelativeLayout>
         <RelativeLayout