Merge pull request #12 from molihuan/dev

Upgrade Permission Dependency

README.md

@@ -22,6 +22,7 @@
 ## 特性
 
 - [x] 合并(导出)B站缓存(有声音视频，无声音视频，仅音频)
+- [x] 番剧、电影合并(导出)
 - [x] 支持安卓 5.0 ~ 13（理论上）
 - [x] 视频挂载弹幕播放
 - [ ] 更新本地弹幕
@@ -37,12 +38,6 @@
 ##### [Github地址](https://github.com/molihuan/BilibiliCacheVideoMerge)
 ##### [Gitee地址](https://gitee.com/molihuan/BilibiliCacheVideoMergeAndroid)
 
-
-
-## 下载链接：[跳转](https://github.com/molihuan/BilibiliCacheVideoMerge/tree/master/app/release)
-
-
-
 ## 演示：(如果github显示不了请转到国内Gitee:[传送门](https://gitee.com/molihuan/BilibiliCacheVideoMergeAndroid))
 
 ### gif演示:
@@ -63,54 +58,72 @@
 
 ![hlb6.md.jpg](https://z4a.net/images/2023/01/28/hlb6.md.jpg)
 
-![hlb7.md.jpg](https://z4a.net/images/2023/01/28/hlb7.md.jpg)
-
+## 软件下载:
 
+Gitee([https://gitee.com/molihuan/BilibiliCacheVideoMergeAndroid/tree/master/app/release](https://gitee.com/molihuan/BilibiliCacheVideoMergeAndroid/tree/master/app/release))
 
-## 软件协议
+Github(https://github.com/molihuan/BilibiliCacheVideoMerge/tree/master/app/release)
 
-### [查看](./app/src/main/assets/statement.md)
+网盘分流：https://wwa.lanzouo.com/b016uhb5g      密码：MLH
 
 ## 软件更新
 
 - 优先级 1 (最快):交流群群文件
+
 - 优先级 2 (次之):网盘链接：
-安卓版：https://wwa.lanzouo.com/b016uhb5g
-密码:MLH
-电脑版：https://wwa.lanzouo.com/b016vmouf
-密码:MLH
-- 优先级 3 :Github(https://github.com/molihuan/BilibiliCacheVideoMerge/tree/master/app/release)
+  安卓版：https://wwa.lanzouo.com/b016uhb5g
+  密码：MLH
+  电脑版：https://wwa.lanzouo.com/b016vmouf
+  密码：MLH
+
+- 优先级 3 :
+
+  Github(https://github.com/molihuan/BilibiliCacheVideoMerge/tree/master/app/release)
+
+  Gitee([https://gitee.com/molihuan/BilibiliCacheVideoMergeAndroid/tree/master/app/release](https://gitee.com/molihuan/BilibiliCacheVideoMergeAndroid/tree/master/app/release))
+
 - 优先级 4 :软件内
 
 ## 问题反馈
 
-请使用模板反馈问题，这样可以帮助开发者快速定位和解决问题，谢谢配合，爱你萌萌哒~^o^~
+##### 请使用模板反馈问题，这样可以帮助开发者快速定位和解决问题，否则一律不处理，谢谢配合，爱你萌萌哒~^o^~
 
-##### 反馈模板:
+#### 反馈模板:
 
-类别：(必填，0、优化建议。1、打开软件就闪退。2、无论什么视频合并都失败或闪退。3、合并个别视频失败或闪退。4、主页空白无法加载哔哩哔哩缓存视频。5、其他问题)
+##### 类别：(必填，选择)
 
-设备信息：(必填，软件内左测菜单栏中点击设备信息即可复制，不会泄漏设备特殊信息，无法进入软件按下列大概填写即可：
-Android:9 App版本:1.6.9.2beta
-机型:HUAWEI/VOG-AL10
-设备id:
-2f5e3c3905abc3dc5b757787725d28e43)
+0、优化建议。
 
-描述：(必填，越详细越好)
+1、打开软件就闪退。
 
-怎样触发bug：(选填)
+2、无论什么视频合并都失败或闪退。
 
-视频链接：(选填，如果视频已经下架则把本地缓存文件打包压缩发我邮箱或者直接发群里，具体操作：[https://www.bilibili.com/video/BV1Mx4y1G7by](https://www.bilibili.com/video/BV1Mx4y1G7by))
+3、合并个别视频失败或闪退。
 
+4、主页空白无法加载哔哩哔哩缓存视频。
 
+5、无法授权。
 
-## 软件下载:
+6、其他问题。
+
+##### 设备信息：(必填）
+
+软件内左测菜单栏中点击设备信息即可复制，不会泄漏设备特殊信息，仅仅是一个标识，无法进入软件按下列大概填写即可（例如）：
+Android:9 App版本:1.6.9.2beta
+机型:HUAWEI/VOG-AL10
+设备id:2f5e3c3905abc3dc5b757787725d28e43
+
+##### 描述：(必填，越详细越好)
+
+阿巴阿巴阿巴阿巴xxxxxx.........
+
+##### 怎样触发bug：(选填)
 
-https://github.com/molihuan/BilibiliCacheVideoMerge/tree/master/app/release
+阿巴阿巴阿巴阿巴xxxxxx.........
 
-## 更新日志:
+##### 视频链接：(选填）
 
-https://github.com/molihuan/BilibiliCacheVideoMerge/blob/master/app/src/main/assets/updataLog.html
+如果视频已经下架则把本地缓存文件打包压缩发我邮箱或者直接发群里，具体操作教程：[https://www.bilibili.com/video/BV1Mx4y1G7by](https://www.bilibili.com/video/BV1Mx4y1G7by)
 
 ## 特别鸣谢
 

app/build.gradle

@@ -40,8 +40,8 @@ android {
         applicationId "com.molihua.hlbmerge"
         minSdk 21
         targetSdk 33
-        versionCode 57
-        versionName "1.6.9.7"
+        versionCode 58
+        versionName "1.6.9.8"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -145,7 +145,7 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", includes: ["*.aar", "*.jar"])
     //文件选择器(包含权限请求)
-    implementation 'io.github.molihuan:pathselector:1.1.14'
+    implementation 'io.github.molihuan:pathselector:1.1.16'
     // 腾讯的键值对存储mmkv
     implementation 'com.tencent:mmkv:1.3.1'
     implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
@@ -158,13 +158,14 @@ dependencies {
     implementation 'com.github.ctiao:ndkbitmap-armv7a:0.9.21'
     implementation 'com.github.ctiao:ndkbitmap-x86:0.9.21'
     //XUpdate
-    implementation 'com.github.xuexiangjys:XUpdate:2.1.2'
+    implementation 'com.github.xuexiangjys:XUpdate:2.1.4'
     implementation 'com.github.xuexiangjys.XUpdateAPI:xupdate-easy:1.0.1'
     //XUI
     implementation 'com.github.xuexiangjys:XUI:1.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'com.github.bumptech.glide:glide:4.12.0'
     //XUI
+    implementation 'com.github.bumptech.glide:glide:4.12.0'
+
     //友盟依赖
     implementation 'com.umeng.umsdk:common:9.5.4'// (必选)
     implementation 'com.umeng.umsdk:asms:1.6.3'// 必选

app/release/output-metadata.json

@@ -11,35 +11,35 @@
       "type": "UNIVERSAL",
       "filters": [],
       "attributes": [],
-      "versionCode": 57,
-      "versionName": "1.6.9.7",
+      "versionCode": 58,
+      "versionName": "1.6.9.8",
       "outputFile": "app-all.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "armeabi-v7a"
+          "value": "arm64-v8a"
         }
       ],
       "attributes": [],
-      "versionCode": 57,
-      "versionName": "1.6.9.7",
-      "outputFile": "app-armeabi-v7a.apk"
+      "versionCode": 58,
+      "versionName": "1.6.9.8",
+      "outputFile": "app-arm64-v8a.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "x86_64"
+          "value": "armeabi-v7a"
         }
       ],
       "attributes": [],
-      "versionCode": 57,
-      "versionName": "1.6.9.7",
-      "outputFile": "app-x86_64.apk"
+      "versionCode": 58,
+      "versionName": "1.6.9.8",
+      "outputFile": "app-armeabi-v7a.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -50,22 +50,22 @@
         }
       ],
       "attributes": [],
-      "versionCode": 57,
-      "versionName": "1.6.9.7",
+      "versionCode": 58,
+      "versionName": "1.6.9.8",
       "outputFile": "app-x86.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "arm64-v8a"
+          "value": "x86_64"
         }
       ],
       "attributes": [],
-      "versionCode": 57,
-      "versionName": "1.6.9.7",
-      "outputFile": "app-arm64-v8a.apk"
+      "versionCode": 58,
+      "versionName": "1.6.9.8",
+      "outputFile": "app-x86_64.apk"
     }
   ],
   "elementType": "File"

app/src/main/assets/updataLog.html

@@ -18,6 +18,11 @@ <h3>
         <span>因为权限问题,输出路径不能设置为SD卡,缓存文件路径可以设置为SD卡,即SD卡只能读取不能写入</span>
     </h3>
 
+    <h3><span>1.6.9.8版本(新)</span></h3>
+    <h4><span>更新日期：2023年9月19日</span></h4>
+    <p><span>----升级权限请求依赖</span></p>
+    <p><span>----细节优化</span></p>
+
     <h3><span>1.6.9.7版本(新)</span></h3>
     <h4><span>更新日期：2023年9月17日</span></h4>
     <p><span>----修复软件更新问题</span></p>

app/src/main/java/com/molihua/hlbmerge/activity/impl/AboutActivity.java

@@ -2,6 +2,7 @@
 
 import android.content.Intent;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.blankj.molihuan.utilcode.util.AppUtils;
 import com.molihua.hlbmerge.R;
@@ -10,8 +11,7 @@
 import com.molihua.hlbmerge.fragment.impl.BackTitlebarFragment;
 import com.molihua.hlbmerge.utils.FragmentTools;
 import com.molihua.hlbmerge.utils.GeneralTools;
-import com.molihua.hlbmerge.utils.LConstants;
-import com.molihua.hlbmerge.utils.UpdataTools;
+import com.xuexiang.xui.utils.XToastUtils;
 import com.xuexiang.xui.widget.grouplist.XUIGroupListView;
 
 import java.text.SimpleDateFormat;
@@ -26,6 +26,7 @@
  */
 public class AboutActivity extends BaseActivity {
 
+    private TextView mDescribeTextView;
     private TextView mVersionTextView;
     private XUIGroupListView mAboutGroupListView;
     private TextView mCopyrightTextView;
@@ -37,6 +38,7 @@ public int setContentViewID() {
 
     @Override
     public void getComponents() {
+        mDescribeTextView = findViewById(R.id.describe);
         mVersionTextView = findViewById(R.id.version);
         mAboutGroupListView = findViewById(R.id.about_list);
         mCopyrightTextView = findViewById(R.id.copyright);
@@ -53,27 +55,35 @@ public void initView() {
         FragmentTools.fragmentReplace(
                 getSupportFragmentManager(),
                 R.id.titlebar_show_area,
-                new BackTitlebarFragment("关于我们"),
+                new BackTitlebarFragment("关于"),
                 "about_back_titlebar"
         );
 
+        mDescribeTextView.setText("将B站缓存视频合并导出为mp4");
         mVersionTextView.setText(String.format("版本号：%s", AppUtils.getAppVersionName()));
 
         XUIGroupListView.newSection(this)
                 .addItemView(mAboutGroupListView.createItemView("用户协议"), v -> StatementDialog.showStatementDialog(this))
-                .addItemView(mAboutGroupListView.createItemView("视频教程"), v -> {
-                    GeneralTools.jumpBrowser(this, LConstants.URL_BILIBILI_HOMEPAGE);
-                })
-                .addItemView(mAboutGroupListView.createItemView("开源地址"), v -> {
-                    GeneralTools.jumpBrowser(this, LConstants.PROJECT_ADDRESS);
+
+                .addItemView(mAboutGroupListView.createItemView("问题反馈"), v -> {
+                    GeneralTools.jumpProjectIssues(this);
                 })
                 .addItemView(mAboutGroupListView.createItemView("开源许可"), v -> {
                     Intent intent = new Intent(this, HtmlActivity.class);
                     intent.putExtra("url", "file:///android_asset/openSourceLicense.html");
                     intent.putExtra("title", "开源许可");
                     startActivity(intent);
                 })
-                .addItemView(mAboutGroupListView.createItemView("检查更新"), v -> UpdataTools.limitClickCheckUpdata(this))
+                .addItemView(mAboutGroupListView.createItemView(getString(R.string.UPDATE_LOGS)), v -> {
+
+                    Intent intent = new Intent(this, HtmlActivity.class);
+                    intent.putExtra("url", "file:///android_asset/updataLog.html");
+                    intent.putExtra("title", "更新日志");
+                    startActivity(intent);
+                })
+                .addItemView(mAboutGroupListView.createItemView(getString(R.string.SPONSOR)), v -> {
+                    XToastUtils.success("可以给项目一个Star吗？非常感谢，你的支持是我唯一的动力。", Toast.LENGTH_LONG);
+                })
                 .addTo(mAboutGroupListView);
 
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy", Locale.CHINA);

app/src/main/java/com/molihua/hlbmerge/activity/impl/MainActivity.java

@@ -161,15 +161,12 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
             intent = new Intent(this, SettingsActivity.class);
             startActivity(intent);
         } else if (id == R.id.item_teach) {
-            GeneralTools.jumpBrowser(this, LConstants.URL_GITEE_HOMEPAGE);
+            GeneralTools.jumpProjectAddress(this);
         } else if (id == R.id.item_aboutus) {
             intent = new Intent(this, AboutActivity.class);
             startActivity(intent);
         } else if (id == R.id.item_updatalog) {
-            intent = new Intent(this, HtmlActivity.class);
-            intent.putExtra("url", "file:///android_asset/updataLog.html");
-            intent.putExtra("title", "更新日志");
-            startActivity(intent);
+            UpdataTools.limitClickCheckUpdata(this);
         } else if (id == R.id.item_exitapp) {
             MobclickAgent.onKillProcess(this);
             finish();

app/src/main/java/com/molihua/hlbmerge/fragment/impl/MainCompleteFragment.java

@@ -92,6 +92,7 @@ private void openFileChoose() {
 
         pathSelectFragment = PathSelector.build(this, MConstants.BUILD_FRAGMENT)
                 .setRootPath(ConfigData.getOutputFilePath())
+                .setSortType(MConstants.SortRules.SORT_TIME_DESC)
                 .setFrameLayoutId(R.id.main_complete_view)
                 .setShowTitlebarFragment(false)
                 .setAlwaysShowHandleFragment(true)

app/src/main/java/com/molihua/hlbmerge/service/impl/PathCacheFileManager.java

@@ -108,7 +108,7 @@ public List<CacheFile> initChapterFileList(String collectionPath, List<CacheFile
                         .setFlag(BaseCacheFileManager.FLAG_CACHE_FILE_BACK)
                         .setWholeVisibility(View.VISIBLE)
                         .setCollectionPath(collectionPath)
-                        .setChapterName("返回上一级")
+                        .setChapterName("返回上一级(长按多选)")
                         .setBoxVisibility(View.INVISIBLE)
                         .setBoxCheck(false)
                         .setUseUri(false)

app/src/main/java/com/molihua/hlbmerge/service/impl/UriCacheFileManager.java

@@ -116,7 +116,7 @@ public List<CacheFile> initChapterFileList(String collectionPath, List<CacheFile
                         .setFlag(BaseCacheFileManager.FLAG_CACHE_FILE_BACK)
                         .setWholeVisibility(View.VISIBLE)
                         .setCollectionPath(collectionPath)
-                        .setChapterName("返回上一级")
+                        .setChapterName("返回上一级(长按多选)")
                         .setBoxVisibility(View.INVISIBLE)
                         .setBoxCheck(false)
                         .setUseUri(true)