Merge tag 'v2.4-beta01' into beta

lzls · Apr 1, 2024 · e26d16c · e26d16c
2 parents 4bed041 + 91b69b5
commit e26d16c
Show file tree

Hide file tree

Showing 67 changed files with 1,713 additions and 2,043 deletions.
diff --git a/app.json b/app.json
@@ -86,50 +86,32 @@
       "18.Support switching language only within this app without it following the system Settings."
     ],
     "beta": {
-      "versionCode": 63,
-      "versionName": "2.3",
-      "appLink": "https://gitlab.com/lzls/Videos-Server/-/raw/master/app/Android/Videos_v2.3.apk",
-      "appLength": 32154584,
-      "appSha1": "3479f2b92ff662a86f967106572be904051f6abb",
+      "versionCode": 64,
+      "versionName": "2.4-beta01",
+      "appLink": "https://gitlab.com/lzls/Videos-Server/-/raw/master/app/Android/Videos_v2.4-beta01.apk",
+      "appLength": 32155064,
+      "appSha1": "2f80cbdeeee6ff689ddab58b7e456e22183ccce2",
       "updateLogs": [
-        "1. 调整深色模式下首页底部标签栏的背景色，使其与页面上的其它内容更加协调",
-        "2. 部分弹窗内容超出一屏时的可滑动区域缩小",
-        "3. 修复在首页发生重建后，应用无法在后台监听到视频文件发生变化的问题",
-        "4. 行为变更：删除视频时将显示等待弹框",
-        "5. 针对安卓11及以上平台，启动页面新增所有文件访问权限许可弹窗",
-        "6. 修复视频文件名存在与后缀相同的部分会在重名时被抹去的问题",
-        "7. 修复搜索页面长按无法被删除或重命名的视频后执行相应操作无效的问题（对不可删除或重命名的视频屏蔽相关操作）",
-        "8. 新增视频文件移动功能",
-        "9. 首页重建时不再自动检测应用更新，更新渠道切换之后将自动进行一次更新检测",
-        "10.修复从在线视频页切回本地视频页面，YouTube短视频仍然在播放的问题",
-        "11.在安卓13及以上平台，应用启动时可能会显示通知权限许可弹窗。如拒绝，应用检测更新及视频后台播放功能将无法正常被使用",
-        "12.修复非YouTube视频在画中画中播放时无法显示进度条的问题",
-        "13.修复视频播放在安卓12及以上版本系统中无法响应耳机线控的问题",
-        "14.更新一些英文模式下显示的文字",
-        "15.修复选择的视频剪辑片段可能在播放到视频文件结束位置时不会再循环播的问题",
-        "16.修复在安卓4.1以下版本系统中，视频剪辑预览的开始位置不正确及屏幕无法为其保持长亮的问题",
-        "17.应用更新弹窗适配英文显示",
-        "18.支持仅应用内切换语言而不跟随系统设置"
+        "1. 应用更新检查：显示检查时的即时状态并添加缺少的错误提示",
+        "2. 使一些字词句的语义更加清晰",
+        "3. 修复YouTube视频的缩略图、标题和作者可能在播放通知上不显示的bug并优化该通知的刷新逻辑",
+        "4. 本地视频播放新增0.25x、0.5x和1.75x速率选项",
+        "5. 修复若干视频文件移动相关的问题",
+        "6. 没有视频文件实际发生移动时不刷新列表",
+        "7. 视频列表重新加载开始和结束时自动关闭视频操作有关的弹窗",
+        "8. 树形分层结构的本地视频列表文件夹",
+        "9. 支持多渠道版本的代码热修复"
       ],
       "updateLogs-en": [
-        "1. Adjust the background color of the tab bar at the bottom of the homepage in dark mode to make it more coordinated with other contents on the screen.",
-        "2. Reduced height of scrollable area for Dialogs whose content exceeds one screen.",
-        "3. Fix the problem that the app couldn't monitor the changes of the video files in the background after the homepage had been recreated.",
-        "4. Behavior change: when a video is being deleted, a waiting Dialog will be displayed.",
-        "5. For Android 11 and above platforms, a Dialog for All Files Access permission has been added to the application launch screen.",
-        "6. Fix the problem that the parts of the video file name that are the same as the suffix would be erased when the video was renamed.",
-        "7. Fix the problem that the corresponding operations performed were invalid after a long press on the video that can not be deleted or renamed on the search page (hiding related operations for videos that can't be deleted or renamed).",
-        "8. Added the function of moving video files.",
-        "9. No longer automatically check for application updates when the homepage is recreated, while switch of the update channel will trigger such check again.",
-        "10.Fix the problem that the YouTube short video was still playing when we switched the page back to Local Videos from Online Videos.",
-        "11.On Android 13 and above platforms, a notification permission Dialog may be displayed when the app is starting. If you refuse, the app update check and the video background playback features will not be able to be normally used.",
-        "12.Fix the problem that the progress bar could not be displayed when non-YouTube video was playing in picture-in-picture.",
-        "13.Fix the problem that video playback could not respond to earphone remote control in Android 12 and above versions.",
-        "14.Update some text displayed in English.",
-        "15.Fix the problem that the playback of the selected video clip may not be repeated when it reached the end of the video file.",
-        "16.Fix the problems that the start position of the video clip preview was incorrect and the screen could not be kept on for it in Android versions below 4.1.",
-        "17.Adapt application update prompt Dialog to English display.",
-        "18.Support switching language only within this app without it following the system Settings."
+        "1. App update check: display immediate states during check and add missing error prompts",
+        "2. Make the semantics of some words and sentences clearer",
+        "3. Fix the bug that the YouTube video thumbnail, title and author might not be displayed on the playback notification and optimize the refresh logic for the notification",
+        "4. Local video playback adds 0.25x, 0.5x and 1.75x speed options",
+        "5. Fixed several issues related to video file move",
+        "6. Not to refresh the list if no video has actually been moved",
+        "7. Automatically close pop-up windows related to video operations at the beginning and the end of video list reloading",
+        "8. Tree structured local video list folders",
+        "9. Support code hot fixes for multi-channel versions"
       ]
     },
     "dev": "beta",

diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         applicationId gradle.ext.applicationId
         minSdkVersion 16
-        versionCode 46
-        versionName "2.3"
+        versionCode 46 // 46 -> 47
+        versionName "2.4-beta01"
 
         vectorDrawables.useSupportLibrary = true
 
@@ -23,8 +23,8 @@ android {
             abiFilters 'armeabi-v7a'/*, 'arm64-v8a'*/
         }
 
-        buildConfigField "int", 'DEV_VERSION_CODE', '63'
-        buildConfigField "int", 'BETA_VERSION_CODE', '63'
+        buildConfigField "int", 'DEV_VERSION_CODE', '64'
+        buildConfigField "int", 'BETA_VERSION_CODE', '64'
         buildConfigField "int", 'TARGET_SDK_VERSION', "$rootProject.ext.targetSdkVersion"
         buildConfigField 'String', 'RELEASE_SIGN_MD5', '"C739175007731374EA0A6CC1C706D5CD"'
     }

diff --git a/app/src/main/assets/updateLogs.txt b/app/src/main/assets/updateLogs.txt
@@ -294,4 +294,15 @@
 15.修复选择的视频剪辑片段可能在播放到视频文件结束位置时不会再循环播的问题
 16.修复在安卓4.1以下版本系统中，视频剪辑预览的开始位置不正确及屏幕无法为其保持长亮的问题
 17.应用更新弹窗适配英文显示
-18.支持仅应用内切换语言而不跟随系统设置
+18.支持仅应用内切换语言而不跟随系统设置
+
+视频v2.4更新：
+1. 应用更新检查：显示检查时的即时状态并添加缺少的错误提示
+2. 使一些字词句的语义更加清晰
+3. 修复YouTube视频的缩略图、标题和作者可能在播放通知上不显示的bug并优化该通知的刷新逻辑
+4. 本地视频播放新增0.25x、0.5x和1.75x速率选项
+5. 修复若干视频文件移动相关的问题
+6. 没有视频文件实际发生移动时不刷新列表
+7. 视频列表重新加载开始和结束时自动关闭视频操作有关的弹窗
+8. 树形分层结构的本地视频列表文件夹
+9. 支持多渠道版本的代码热修复
diff --git a/app/src/main/java/com/liuzhenlin/videos/App.java b/app/src/main/java/com/liuzhenlin/videos/App.java
@@ -46,6 +46,8 @@ public class App extends Application {
 
     private static App sApp;
 
+    private boolean mSophixInitialized;
+
     private volatile int mRealScreenWidth = -1;
     private volatile int mRealScreenHeight = -1;
 
@@ -127,6 +129,14 @@ public static App getInstanceUnsafe() {
         return sApp;
     }
 
+    public boolean isSophixInitialized() {
+        return mSophixInitialized;
+    }
+
+    public void setSophixInitialized(boolean initialized) {
+        mSophixInitialized = initialized;
+    }
+
     @SuppressLint("NewApi")
     public boolean hasAllFilesAccess() {
         boolean sdkBeforeR =

diff --git a/app/src/main/java/com/liuzhenlin/videos/Consts.kt b/app/src/main/java/com/liuzhenlin/videos/Consts.kt
@@ -16,7 +16,6 @@ import com.liuzhenlin.common.Consts
 internal const val PROCESS_NAME_MAIN = Consts.APPLICATION_ID
 internal const val PROCESS_NAME_WEB = Consts.APPLICATION_ID + ":web"
 
-internal const val KEY_DIRECTORY_PATH = "directoryPath"
 internal const val KEY_VIDEODIR = "videodir"
 internal const val KEY_VIDEODIRS = "videodirs"
 internal const val KEY_VIDEO = "video"
@@ -25,6 +24,7 @@ internal const val KEY_VIDEO_TITLE = "videoTitle"
 internal const val KEY_VIDEO_TITLES = "videoTitles"
 internal const val KEY_VIDEO_URIS = "videoURIs"
 internal const val KEY_SELECTION = "index"
+internal const val KEY_MOVED = "moved"
 
 internal const val REQUEST_CODE_PLAY_VIDEO = 1
 internal const val RESULT_CODE_PLAY_VIDEO = 1
@@ -35,8 +35,8 @@ internal const val RESULT_CODE_PLAY_VIDEOS = 2
 internal const val REQUEST_CODE_LOCAL_SEARCHED_VIDEOS_FRAGMENT = 3
 internal const val RESULT_CODE_LOCAL_SEARCHED_VIDEOS_FRAGMENT = 3
 
-internal const val REQUEST_CODE_LOCAL_FOLDED_VIDEOS_FRAGMENT = 4
-internal const val RESULT_CODE_LOCAL_FOLDED_VIDEOS_FRAGMENT = 4
+internal const val REQUEST_CODE_LOCAL_VIDEO_SUBLIST_FRAGMENT = 4
+internal const val RESULT_CODE_LOCAL_VIDEO_SUBLIST_FRAGMENT = 4
 
 internal const val REQUEST_CODE_VIDEO_MOVE_FRAGMENT = 5
 internal const val RESULT_CODE_VIDEO_MOVE_FRAGMENT = 5