Skip to content

Commit

Permalink
Merge tag 'v2.4' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
lzls committed Aug 10, 2024
2 parents d57d6ea + b5188cf commit eb84bd4
Show file tree
Hide file tree
Showing 5 changed files with 174 additions and 127 deletions.
97 changes: 47 additions & 50 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"appName-en": "Videos",
"applicationId": "com.liuzhenlin.videos",
"minSdkVersion": 16,
"targetSdkVersion": 33,
"versionCode": 46,
"versionName": "2.3",
"appLink": "https://gitlab.com/lzls/Videos-Server/-/raw/master/app/Android/Videos_v2.3.apk",
"targetSdkVersion": 34,
"versionCode": 47,
"versionName": "2.4",
"appLink": "https://gitlab.com/lzls/Videos-Server/-/raw/master/app/Android/Videos_v2.4.apk",
"appPartLinks": [
"https://gitlab.com/lzls/Videos-Server/-/raw/master/app/Android/app-release1.apk",
"https://gitlab.com/lzls/Videos-Server/-/raw/master/app/Android/app-release2.apk",
Expand Down Expand Up @@ -41,56 +41,51 @@
"https://gitlab.com/lzls/Videos-Server/-/raw/master/app/Android/app-release30.apk",
"https://gitlab.com/lzls/Videos-Server/-/raw/master/app/Android/app-release31.apk",
"https://gitlab.com/lzls/Videos-Server/-/raw/master/app/Android/app-release32.apk",
"https://gitlab.com/lzls/Videos-Server/-/raw/master/app/Android/app-release33.apk"
"https://gitlab.com/lzls/Videos-Server/-/raw/master/app/Android/app-release33.apk",
"https://gitlab.com/lzls/Videos-Server/-/raw/master/app/Android/app-release34.apk"
],
"appLength": 32154584,
"appSha1": "3479f2b92ff662a86f967106572be904051f6abb",
"appLength": 33432045,
"appSha1": "67abebb28bf836dcc39905c5e87f42f9eee3f13f",
"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. 本地视频播放支持手势缩放",
"10.修复切换的应用语言无法在在线视频页立即生效的问题",
"11.修复系统语言为繁体中文而应用语言为英文的问题",
"12.本地视频播放视图锁定时展示视频标题",
"13.新增启动页弹窗和设置页开关供用户选择是否共享使用情况信息以协助开发者改善当前应用",
"14.启动页面展示应用名称,防止仅弹窗有内容而对用户造成困扰",
"15.修复无法自动为播放的YouTube视频设置偏好画质的问题"
],
"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. Local video playback supports gestural scaling.",
"10.Fix the problem that the switched app language could not immediately take effect on the Online Videos page.",
"11.Fix the bug that the system language was Traditional Chinese while the app language was English.",
"12.Show video title when local video playback view is locked.",
"13.Newly added a pop-up window on the startup page and a switch preference on the settings page for users to choose whether to share usage status info to help developers improve the current application.",
"14.The startup page displays the app name to prevent users from being confused by only pop-up windows with content.",
"15.Fix the issue that the preferred quality could not be automatically set for the played YouTube videos"
],
"beta": {
"versionCode": 67,
"versionName": "2.4-beta04",
"appLink": "https://gitlab.com/lzls/Videos-Server/-/raw/master/app/Android/Videos_v2.4-beta04.apk",
"appLength": 33431488,
"appSha1": "d511662ca00b0152a7fb32a09d50090da48329ff",
"versionCode": 68,
"versionName": "2.4",
"appLink": "https://gitlab.com/lzls/Videos-Server/-/raw/master/app/Android/Videos_v2.4.apk",
"appLength": 33432045,
"appSha1": "67abebb28bf836dcc39905c5e87f42f9eee3f13f",
"updateLogs": [
"1. 应用更新检查:显示检查时的即时状态并添加缺少的错误提示",
"2. 使一些字词句的语义更加清晰",
Expand All @@ -105,7 +100,8 @@
"11.修复系统语言为繁体中文而应用语言为英文的问题",
"12.本地视频播放视图锁定时展示视频标题",
"13.新增启动页弹窗和设置页开关供用户选择是否共享使用情况信息以协助开发者改善当前应用",
"14.启动页面展示应用名称,防止仅弹窗有内容而对用户造成困扰"
"14.启动页面展示应用名称,防止仅弹窗有内容而对用户造成困扰",
"15.修复无法自动为播放的YouTube视频设置偏好画质的问题"
],
"updateLogs-en": [
"1. App update check: display immediate states during check and add missing error prompts.",
Expand All @@ -121,7 +117,8 @@
"11.Fix the bug that the system language was Traditional Chinese while the app language was English.",
"12.Show video title when local video playback view is locked.",
"13.Newly added a pop-up window on the startup page and a switch preference on the settings page for users to choose whether to share usage status info to help developers improve the current application.",
"14.The startup page displays the app name to prevent users from being confused by only pop-up windows with content."
"14.The startup page displays the app name to prevent users from being confused by only pop-up windows with content.",
"15.Fix the issue that the preferred quality could not be automatically set for the played YouTube videos"
]
},
"dev": "beta",
Expand Down
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
defaultConfig {
applicationId gradle.ext.applicationId
minSdkVersion 16
versionCode 46 // 46 -> 47
versionName "2.4-beta04"
versionCode 47
versionName "2.4"

vectorDrawables.useSupportLibrary = true

Expand All @@ -27,8 +27,8 @@ android {
abiFilters 'armeabi-v7a'/*, 'arm64-v8a'*/
}

buildConfigField "int", 'DEV_VERSION_CODE', '67'
buildConfigField "int", 'BETA_VERSION_CODE', '67'
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'
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/assets/updateLogs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -310,4 +310,5 @@
11.修复系统语言为繁体中文而应用语言为英文的问题
12.本地视频播放视图锁定时展示视频标题
13.新增启动页弹窗和设置页开关供用户选择是否共享使用情况信息以协助开发者改善当前应用
14.启动页面展示应用名称,防止仅弹窗有内容而对用户造成困扰
14.启动页面展示应用名称,防止仅弹窗有内容而对用户造成困扰
15.修复无法自动为播放的YouTube视频设置偏好画质的问题
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
<string name="youHaveNotCommitted">You Have Not Committed</string>

<string name="appName_chinese" translatable="false">视频</string>
<string name="version" translatable="false">2.4-beta04</string>
<string name="version" translatable="false">2.4</string>
<string name="copyright" translatable="false">
Copyright © 2017–present 刘振林.\nAll rights reserved.</string>
<string name="projectLink" translatable="false">https://github.com/lzls/Videos</string>
Expand Down
Loading

0 comments on commit eb84bd4

Please sign in to comment.