Merge tag 'v2.4' into release

lzls · Aug 10, 2024 · 267c43c · 267c43c
2 parents 9c1d172 + b5188cf
commit 267c43c
Show file tree

Hide file tree

Showing 185 changed files with 5,341 additions and 3,104 deletions.
diff --git a/app.json b/app.json
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 47
+        versionName "2.4"
 
         vectorDrawables.useSupportLibrary = true
 
@@ -17,16 +17,21 @@ android {
                 multiDexEnabled true
 //              multiDexKeepProguard file('multidex-config.pro')
             }
+            release {
+                multiDexEnabled true
+                multiDexKeepProguard file('multidex-config.pro')
+            }
         }
 
         ndk {
             abiFilters 'armeabi-v7a'/*, 'arm64-v8a'*/
         }
 
-        buildConfigField "int", 'DEV_VERSION_CODE', '63'
-        buildConfigField "int", 'BETA_VERSION_CODE', '63'
+        buildConfigField "int", 'DEV_VERSION_CODE', '68'
+        buildConfigField "int", 'BETA_VERSION_CODE', '68'
         buildConfigField "int", 'TARGET_SDK_VERSION', "$rootProject.ext.targetSdkVersion"
         buildConfigField 'String', 'RELEASE_SIGN_MD5', '"C739175007731374EA0A6CC1C706D5CD"'
+        buildConfigField 'int', 'SOPHIX_PATCH_NO', '-1'
     }
 
     packagingOptions {
@@ -37,6 +42,7 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.core:core-splashscreen:1.0.1'
 
     implementation project(':common')
@@ -54,7 +60,8 @@ dependencies {
     implementation 'com.sun.mail:android-mail:1.6.7'
     implementation 'com.sun.mail:android-activation:1.6.7'
 
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.11'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android-process:2.14'
 
-    implementation 'com.aliyun.ams:alicloud-android-hotfix:3.3.8'
+    implementation 'com.aliyun.ams:alicloud-android-hotfix:3.4.1'
 }
diff --git a/app/multidex-config.pro b/app/multidex-config.pro
@@ -8,8 +8,8 @@
 
 -keep class com.liuzhenlin.** { *; } # All classes in the com.liuzhenlin package
 
-#-keep class com.google.android.exoplayer2.ext.av1.** { *; }
-#-keep class com.google.android.exoplayer2.ext.vp9.** { *; }
-#-keep class com.google.android.exoplayer2.ext.ffmpeg.** { *; }
+#-keep class androidx.media3.decoder.av1.** { *; }
+#-keep class androidx.media3.decoder.vp9.** { *; }
+#-keep class androidx.media3.decoder.ffmpeg.** { *; }
 
 #-keep class tv.danmaku.ijk.media.player.** { *; }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,13 +15,14 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
 <!--    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />-->
 
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
-    <uses-sdk tools:overrideLibrary="androidx.core.splashscreen" />
+    <uses-sdk tools:overrideLibrary="androidx.core.splashscreen, com.taobao.sophix" />
 
     <application
         android:name=".SophixAppStub"
@@ -107,6 +108,7 @@
 
         <activity
             android:name=".view.activity.SettingsActivity"
+            android:theme="@style/ActivityStyle_Settings"
             android:screenOrientation="portrait"
             android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation|uiMode|locale|layoutDirection"
             android:launchMode="singleTop"
@@ -123,6 +125,10 @@
             android:process=":web"
             tools:replace="android:configChanges, android:taskAffinity" />
 
+        <activity
+            android:name="pub.devrel.easypermissions.AppSettingsDialogHolderActivity2"
+            android:theme="@style/EasyPermissions.Transparent" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
@@ -133,6 +139,8 @@
                 android:resource="@xml/file_paths" />
         </provider>
 
-        <service android:name=".utils.AppUpdateChecker$UpdateAppService" />
+        <service
+            android:name=".utils.AppUpdateChecker$UpdateAppService"
+            android:foregroundServiceType="dataSync" />
     </application>
 </manifest>
diff --git a/app/src/main/assets/updateLogs.txt b/app/src/main/assets/updateLogs.txt
@@ -294,4 +294,21 @@
 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. 本地视频播放支持手势缩放
+10.修复切换的应用语言无法在在线视频页立即生效的问题
+11.修复系统语言为繁体中文而应用语言为英文的问题
+12.本地视频播放视图锁定时展示视频标题
+13.新增启动页弹窗和设置页开关供用户选择是否共享使用情况信息以协助开发者改善当前应用
+14.启动页面展示应用名称，防止仅弹窗有内容而对用户造成困扰
+15.修复无法自动为播放的YouTube视频设置偏好画质的问题
diff --git a/app/src/main/java/com/liuzhenlin/videos/App.java b/app/src/main/java/com/liuzhenlin/videos/App.java
@@ -231,10 +231,8 @@ public void onConfigurationChanged(@NonNull Configuration newConfig) {
         mLocale = newConfig.locale;
 
         if (!Configs.LanguageDiff.areLocaleEqual(locale, newConfig.locale)) {
-            if (LanguageUtils.getDefaultLanguageMode() != LanguageUtils.MODE_LANGUAGE_FOLLOWS_SYSTEM) {
-                LanguageUtils.updateResourcesConfigLocale(
-                        this, LanguageUtils.getDefaultLanguageLocale());
-            }
+            LanguageUtils.updateResourcesConfigLocale(getResourcesNoConfigCheck(),
+                    LanguageUtils.getDefaultLanguageLocale(this));
         }
 
         boolean night = (newConfig.uiMode & Configuration.UI_MODE_NIGHT_MASK)

diff --git a/app/src/main/java/com/liuzhenlin/videos/Configs.kt b/app/src/main/java/com/liuzhenlin/videos/Configs.kt
@@ -6,6 +6,8 @@
 
 package com.liuzhenlin.videos
 
+import android.os.Build
+
 /**
  * @author 刘振林
  */
@@ -16,4 +18,7 @@ internal val DEBUG_APP_UPDATE = BuildConfig.DEBUG && false
 
 internal const val TOLERANCE_VIDEO_DURATION = 100 // ms
 
-internal const val DELAY_SEND_NOTIFICATION_WITH_JUST_STOPPED_FOREGROUND_SERVICE_ID = 200 //ms
+internal const val DELAY_SEND_NOTIFICATION_WITH_JUST_STOPPED_FOREGROUND_SERVICE_ID = 200 //ms
+
+internal inline val isSophixPatchSupported
+    get() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2
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,9 @@ 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 KEY_FROM_APP_DETAILS_SETTING_SCREEN = "fromAppDetailsSettingsScreen"
 
 internal const val REQUEST_CODE_PLAY_VIDEO = 1
 internal const val RESULT_CODE_PLAY_VIDEO = 1
@@ -35,8 +37,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