Merge pull request #6 from molihuan/dev

新增FFmpegCommand核心
molihuan · Jan 27, 2023 · 4f33bb5 · 4f33bb5
2 parents a3fa26a + 97b6781
commit 4f33bb5
Show file tree

Hide file tree

Showing 27 changed files with 378 additions and 254 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -39,8 +39,8 @@ android {
         applicationId "com.molihua.hlbmerge"
         minSdk 21
         targetSdk 33
-        versionCode 49
-        versionName "1.6.8"
+        versionCode 51
+        versionName "1.6.9.1beta"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -124,6 +124,8 @@ dependencies {
     implementation 'com.umeng.umsdk:common:9.5.4'// (必选)
     implementation 'com.umeng.umsdk:asms:1.6.3'// 必选
     implementation 'com.umeng.umsdk:apm:1.8.0'// U-APM产品包依赖(必选)
+    //bugly依赖
+    implementation 'com.tencent.bugly:crashreport:latest.release'
 
 
     implementation 'androidx.appcompat:appcompat:1.4.1'

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -26,3 +26,6 @@
 #FFmpegCommand混淆
 -keep class com.coder.ffmpeg.** {*;}
 -dontwarn  com.coder.ffmpeg.**
+#bugly混淆
+-dontwarn com.tencent.bugly.**
+-keep public class com.tencent.bugly.**{*;}
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 49,
-      "versionName": "1.6.8",
+      "versionCode": 51,
+      "versionName": "1.6.9.1beta",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/assets/privacy.html b/app/src/main/assets/privacy.html
@@ -58,6 +58,7 @@
 
 
 
+
     </style>
 </head>
 <body class="second-page">
@@ -89,7 +90,13 @@ <h3>第三方SDK</h3>
                 <p>友盟SDK统计分析，收集个人信息类型：设备信息（IMEI/MAC/Android ID/IDFA/OpenUDID/GUID/IP地址/SIM 卡 IMSI
                     信息等），用于帮助开发者排查崩溃问题,提升APP稳定性</p>
                 <p>
-                    友盟SDK隐私权政策链接：https://www.umeng.com/page/policy
+                    友盟SDK隐私权政策链接：<a href="https://www.umeng.com/page/policy">跳转</a>
+                </p>
+                <p>腾讯BuglySDK</p>
+                <p>腾讯BuglySDK获取了设备品牌、型号、软件系统版本等等相关信息，用于帮助开发者排查崩溃问题,帮助APP提升稳定性</p>
+                <p>
+                    腾讯BuglySDK隐私政策地址：<a
+                        href="https://privacy.qq.com/document/preview/fc748b3d96224fdb825ea79e132c1a56">跳转</a>
                 </p>
                 <h3>隐私问题</h3>
                 <p>如果你对我们的隐私政策或数据处理有任何问题或顾虑，请联系我们（邮箱：1492906929@qq.com）。</p>

diff --git a/app/src/main/assets/statement.txt b/app/src/main/assets/statement.txt
@@ -5,7 +5,7 @@
       【RxFFmpeg开源项目】:感谢microshow提供的ffmpeg开源解决方案。
       【CSDN】:作者从网站上查找了大量的资料，解决了许多的问题。
       【云注入】:感谢云注入曾经提供的网络弹窗技术支持。(现已不用)
-      【Bugly】:感谢腾讯曾经提供的技术服务。(现已不用)
+      【Bugly】:感谢腾讯提供的技术服务。
       【MMKV】:感谢腾讯提供的开源项目。
       【友盟】:感谢友盟提供的技术服务。
       【XUI】【XUpdate】:感谢xuexiangjys提供的开源UI框架、版本更新框架。

diff --git a/app/src/main/assets/updataLog.html b/app/src/main/assets/updataLog.html
@@ -19,6 +19,10 @@ <h2>
     <h3><span>因为权限问题,输出路径不能设置为SD卡,缓存文件路径可以设置为SD卡,即SD卡只能读取不能写入</span></h3>
 
 
+    <h3><span>1.6.9beta版本(新)</span></h3>
+    <h4><span>更新日期：2023年1月26日</span></h4>
+    <p><span>----重新加入腾讯bugly(真香)</span></p>
+
     <h3><span>1.6.8版本(新)</span></h3>
     <h4><span>更新日期：2023年1月24日</span></h4>
     <p><span>----修复视频播放按钮的bug</span></p>

diff --git a/app/src/main/java/com/molihua/hlbmerge/App.java b/app/src/main/java/com/molihua/hlbmerge/App.java
@@ -2,21 +2,14 @@
 
 
 import android.app.Application;
-import android.widget.Toast;
 
 import com.molihua.hlbmerge.dao.ConfigData;
-import com.molihua.hlbmerge.utils.LConstants;
-import com.molihua.hlbmerge.utils.UMTools;
+import com.molihua.hlbmerge.utils.InitTool;
 import com.molihua.hlbmerge.utils.UpdataTools;
 import com.molihuan.pathselector.PathSelector;
 import com.molihuan.pathselector.configs.PathSelectorConfig;
-import com.molihuan.pathselector.utils.Mtools;
 import com.tencent.mmkv.MMKV;
 import com.xuexiang.xui.XUI;
-import com.xuexiang.xupdate.XUpdate;
-import com.xuexiang.xupdate.entity.UpdateError;
-import com.xuexiang.xupdate.listener.OnUpdateFailureListener;
-import com.xuexiang.xupdate.utils.UpdateUtils;
 
 /**
  * @ClassName: App
@@ -31,6 +24,9 @@ public void onCreate() {
         MMKV.initialize(this);
         //配置初始化
         ConfigData.init();
+        //友盟预初始化
+        InitTool.preInit(this, true, false);
+        //ffmpeg核心初始化
         ConfigData.initFFmpegCore();
         //初始化XUI
         XUI.init(this);
@@ -40,45 +36,12 @@ public void onCreate() {
         //取消自动申请权限
         PathSelectorConfig.setAutoGetPermission(false);
         //XUpdate初始化
-        initXUpdate();
-        //友盟预初始化
-        UMTools.setDebug(false);
-        UMTools.setChannel(UMTools.CHANNEL_RELEASE);
-        UMTools.preInit(this);
+        UpdataTools.initXUpdate(this);
+
         //ffmpeg核心debug
         ConfigData.ffmpegCore.setDebug(false);
         super.onCreate();
     }
 
-    private void initXUpdate() {
-        XUpdate.get()
-                .debug(false)
-                .isWifiOnly(true)                                               //默认设置只在wifi下检查版本更新
-                .isGet(true)                                                    //默认设置使用get请求检查版本
-                .isAutoMode(false)                                              //默认设置非自动模式，可根据具体使用配置
-                .param("versionCode", UpdateUtils.getVersionCode(this))         //设置默认公共请求参数
-                .param("appKey", getPackageName())
-                .setOnUpdateFailureListener(new OnUpdateFailureListener() {     //设置版本更新出错的监听
-                    @Override
-                    public void onFailure(UpdateError error) {
-                        switch (error.getCode()) {
-                            case UpdateError.ERROR.CHECK_NO_NEW_VERSION:
-                                Mtools.toast("未发现新版本!");
-                                break;
-                            case UpdateError.ERROR.CHECK_NO_NETWORK:
-                            case UpdateError.ERROR.CHECK_NO_WIFI:
-                                break;
-                            default:
-                                Mtools.toast("更新失败!正在尝试使用备用链接 或 自行进入下载:" + LConstants.PROJECT_ADDRESS, Toast.LENGTH_LONG);
-                                //启用备用检测更新
-                                UpdataTools.checkUpdataByGitlink(getApplicationContext());
-                        }
-
-                    }
-                })
-                .supportSilentInstall(true)                                     //设置是否支持静默安装，默认是true
-        ;
-    }
-
 
 }
diff --git a/app/src/main/java/com/molihua/hlbmerge/activity/AbstractMainActivity.java b/app/src/main/java/com/molihua/hlbmerge/activity/AbstractMainActivity.java
@@ -1,5 +1,10 @@
 package com.molihua.hlbmerge.activity;
 
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.net.Uri;
+
+import androidx.annotation.Nullable;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.viewpager.widget.ViewPager;
 
@@ -13,6 +18,8 @@
 import com.molihua.hlbmerge.interfaces.IMainFileShowFragment;
 import com.molihua.hlbmerge.interfaces.IMainTitlebarFragment;
 import com.molihuan.pathselector.fragment.impl.PathSelectFragment;
+import com.molihuan.pathselector.utils.PermissionsTools;
+import com.molihuan.pathselector.utils.VersionTool;
 
 /**
  * @ClassName: AbstractMainActivity
@@ -46,4 +53,31 @@ public abstract class AbstractMainActivity extends BaseActivity implements IMain
     public abstract PathSelectFragment getCompletePathSelectFragment();
 
     public abstract void refreshCompleteFileList();
+
+
+    @Override
+    @SuppressLint("WrongConstant")
+    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        //保存这个uri目录的访问权限
+        if (VersionTool.isAndroid11()) {
+            if (requestCode == PermissionsTools.PERMISSION_REQUEST_CODE) {
+                if (data != null) {
+                    Uri uri;
+                    if ((uri = data.getData()) != null) {
+                        getContentResolver()
+                                .takePersistableUriPermission(uri,
+                                        data.getFlags() & (Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+                                );
+                    }
+                    //获取数据刷新列表
+                    updateCollectionFileList();
+                    refreshCacheFileList();
+                }
+
+            }
+        }
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+
 }
diff --git a/app/src/main/java/com/molihua/hlbmerge/activity/BaseActivity.java b/app/src/main/java/com/molihua/hlbmerge/activity/BaseActivity.java
@@ -32,7 +32,7 @@ protected void onCreate(Bundle savedInstanceState) {
         initView();
         //设置监听
         setListeners();
-        
+
     }
 
     public abstract @LayoutRes
@@ -49,10 +49,41 @@ public void initView() {
     public void setListeners() {
     }
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+        //Mtools.log(getClass().getSimpleName() + "---------onStart");
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        //Mtools.log(getClass().getSimpleName() + "---------onResume");
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        //Mtools.log(getClass().getSimpleName() + "---------onPause");
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        //Mtools.log(getClass().getSimpleName() + "---------onStop");
+    }
+
+    @Override
+    protected void onRestart() {
+        super.onRestart();
+        //Mtools.log(getClass().getSimpleName() + "---------onRestart");
+    }
+
     @Override
     protected void onDestroy() {
         //友盟保存数据
         MobclickAgent.onKillProcess(this);
+        //Mtools.log(getClass().getSimpleName() + "---------onDestroy");
         super.onDestroy();
     }
 

diff --git a/app/src/main/java/com/molihua/hlbmerge/activity/impl/MainActivity.java b/app/src/main/java/com/molihua/hlbmerge/activity/impl/MainActivity.java
@@ -3,6 +3,7 @@
 import android.content.Intent;
 import android.view.MenuItem;
 import android.view.WindowManager;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -11,9 +12,10 @@
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
 
+import com.blankj.molihuan.utilcode.util.DeviceUtils;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.google.android.material.navigation.NavigationView;
-import com.hjq.permissions.OnPermissionCallback;
+import com.molihua.hlbmerge.BuildConfig;
 import com.molihua.hlbmerge.R;
 import com.molihua.hlbmerge.activity.AbstractMainActivity;
 import com.molihua.hlbmerge.adapter.CacheFileListAdapter;
@@ -31,13 +33,13 @@
 import com.molihua.hlbmerge.service.ICacheFileManager;
 import com.molihua.hlbmerge.utils.FragmentTools;
 import com.molihua.hlbmerge.utils.GeneralTools;
+import com.molihua.hlbmerge.utils.InitTool;
 import com.molihua.hlbmerge.utils.LConstants;
-import com.molihua.hlbmerge.utils.UMTools;
 import com.molihua.hlbmerge.utils.UpdataTools;
+import com.molihua.hlbmerge.utils.UriTool;
 import com.molihuan.pathselector.fragment.impl.PathSelectFragment;
-import com.molihuan.pathselector.utils.FileTools;
 import com.molihuan.pathselector.utils.Mtools;
-import com.molihuan.pathselector.utils.PermissionsTools;
+import com.tencent.bugly.crashreport.CrashReport;
 import com.umeng.analytics.MobclickAgent;
 import com.xuexiang.xui.adapter.FragmentAdapter;
 import com.xuexiang.xui.widget.searchview.MaterialSearchView;
@@ -73,40 +75,15 @@ public void getComponents() {
         drawerLayout = findViewById(R.id.side_container_drawerlayout);
         navigationView = findViewById(R.id.side_navigationview);
         viewPager = findViewById(R.id.main_view_pager);
-
     }
 
 
     @Override
     public void initData() {
         //友盟初始化
-        UMTools.init(this);
+        InitTool.initWithDialog(this, true, false);
         //自动周期检测更新
         UpdataTools.autoCheckUpdata(this);
-        //存储权限的申请
-        PermissionsTools.generalPermissionsOfStorage(this, new OnPermissionCallback() {
-            @Override
-            public void onGranted(@NonNull List<String> permissions, boolean all) {
-                boolean dataUseUri = FileTools.underAndroidDataUseUri(ConfigData.getCacheFilePath());
-                if (!dataUseUri) {
-                    //获取数据刷新列表
-                    updateCollectionFileList();
-                    refreshCacheFileList();
-                }
-            }
-        });
-
-        PermissionsTools.specialPermissionsOfStorageWithDialog(this, true, new OnPermissionCallback() {
-            @Override
-            public void onGranted(@NonNull List<String> permissions, boolean all) {
-                boolean dataUseUri = FileTools.underAndroidDataUseUri(ConfigData.getCacheFilePath());
-                if (!dataUseUri) {
-                    //获取数据刷新列表
-                    updateCollectionFileList();
-                    refreshCacheFileList();
-                }
-            }
-        });
 
         mainTitlebarFragment = new MainTitlebarFragment();
         mainFileShowFragment = new MainFileShowFragment();
@@ -118,6 +95,15 @@ public void onGranted(@NonNull List<String> permissions, boolean all) {
 
     @Override
     public void initView() {
+        //侧边栏手机信息
+        TextView phoneInfoTv = navigationView.getHeaderView(0).findViewById(R.id.phone_info);
+        phoneInfoTv.setText(
+                "Android:" + DeviceUtils.getSDKVersionName() +
+                        "   App版本:" + BuildConfig.VERSION_NAME +
+                        "\n机型:" + DeviceUtils.getManufacturer() + "/" + DeviceUtils.getModel() +
+                        "\n设备id:\n" + CrashReport.getUserId()
+        );
+
 
         //加载主显示区
         FragmentAdapter<Fragment> adapter = new FragmentAdapter<>(getSupportFragmentManager());
@@ -227,6 +213,13 @@ public void handleShowHide(boolean isShow) {
         );
     }
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+        if (ConfigData.isAgreeTerm()) {
+            UriTool.grantedUriPermission(ConfigData.getCacheFilePath(), this);
+        }
+    }
 
     @Override
     public void onPageSelected(int position) {