From 4d5f3eb14afada06ca8469c5eed819134cfa8de8 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 15 Oct 2023 16:49:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E5=8A=A8=E6=80=81ADDITIONAL=5FTYPE?= =?UTF-8?q?=5FRESERVE=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dynamics/widgets/additional_panel.dart | 82 ++++++++++--------- 1 file changed, 45 insertions(+), 37 deletions(-) diff --git a/lib/pages/dynamics/widgets/additional_panel.dart b/lib/pages/dynamics/widgets/additional_panel.dart index f25b913e..248076c5 100644 --- a/lib/pages/dynamics/widgets/additional_panel.dart +++ b/lib/pages/dynamics/widgets/additional_panel.dart @@ -83,45 +83,53 @@ Widget addWidget(item, context, type, {floor = 1}) { ); case 'ADDITIONAL_TYPE_RESERVE': return dynamicProperty[type].state != -1 - ? Padding( - padding: const EdgeInsets.only(top: 8), - child: InkWell( - onTap: () {}, - child: Container( - width: double.infinity, - padding: const EdgeInsets.only( - left: 12, top: 10, right: 12, bottom: 10), - color: bgColor, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - dynamicProperty[type].title, - maxLines: 1, - overflow: TextOverflow.ellipsis, + ? dynamicProperty[type].title != null + ? Padding( + padding: const EdgeInsets.only(top: 8), + child: InkWell( + onTap: () {}, + child: Container( + width: double.infinity, + padding: const EdgeInsets.only( + left: 12, top: 10, right: 12, bottom: 10), + color: bgColor, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + dynamicProperty[type].title, + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + const SizedBox(height: 1), + Text.rich( + TextSpan( + style: TextStyle( + color: Theme.of(context).colorScheme.outline, + fontSize: Theme.of(context) + .textTheme + .labelMedium! + .fontSize), + children: [ + if (dynamicProperty[type].desc1 != null) + TextSpan( + text: + dynamicProperty[type].desc1['text']), + const TextSpan(text: ' '), + if (dynamicProperty[type].desc2 != null) + TextSpan( + text: + dynamicProperty[type].desc2['text']), + ], + ), + ) + ], ), - const SizedBox(height: 1), - Text.rich( - TextSpan( - style: TextStyle( - color: Theme.of(context).colorScheme.outline, - fontSize: Theme.of(context) - .textTheme - .labelMedium! - .fontSize), - children: [ - TextSpan(text: dynamicProperty[type].desc1['text']), - const TextSpan(text: ' '), - TextSpan(text: dynamicProperty[type].desc2['text']), - ], - ), - ) - ], + // TextButton(onPressed: () {}, child: Text('123')) + ), ), - // TextButton(onPressed: () {}, child: Text('123')) - ), - ), - ) + ) + : const SizedBox() : const SizedBox(); case 'ADDITIONAL_TYPE_GOODS': return Padding( From 15947e45da3c1cabfa83ade68c10ad16be6172f5 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 15 Oct 2023 17:02:13 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE?= =?UTF-8?q?=E9=80=9F=E5=BA=A6=E8=B6=85=E8=BF=874.0=E5=B0=B1=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=A3=B0=E9=9F=B3=E4=BA=86=20issues=20#191?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/plugin/pl_player/controller.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart index 184d5789..46936402 100644 --- a/lib/plugin/pl_player/controller.dart +++ b/lib/plugin/pl_player/controller.dart @@ -351,7 +351,8 @@ class PlPlayerController { ); var pp = player.platform as NativePlayer; - + // 解除倍速限制 + await pp.setProperty("af", "scaletempo2=max-speed=8"); // 音轨 if (dataSource.audioSource != '' && dataSource.audioSource != null) { await pp.setProperty( From f25dab2eb8438b3d58c57a023f2e9b10a8e8a1b1 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 15 Oct 2023 20:05:16 +0800 Subject: [PATCH 3/5] =?UTF-8?q?mod:=20=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/utils/utils.dart | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index 4ccd689a..454ef378 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -187,15 +187,21 @@ class Utils { } // 版本对比 - static bool needUpdate(localVersion, remoteVersion) { - List localVersionList = localVersion.split('.'); - List remoteVersionList = remoteVersion.split('v')[1].split('.'); - for (int i = 0; i < localVersionList.length; i++) { - int localVersion = int.parse(localVersionList[i]); - int remoteVersion = int.parse(remoteVersionList[i]); - if (remoteVersion > localVersion) { + static bool needUpdate(String currentVersion, String remoteVersion) { + List current = currentVersion.split('.').map(int.parse).toList(); + List remote = + remoteVersion.split('v')[1].split('.').map(int.parse).toList(); + + int maxLength = + current.length > remote.length ? current.length : remote.length; + + for (int i = 0; i < maxLength; i++) { + int currentValue = i < current.length ? current[i] : 0; + int remoteValue = i < remote.length ? remote[i] : 0; + + if (currentValue < remoteValue) { return true; - } else if (remoteVersion < localVersion) { + } else if (currentValue > remoteValue) { return false; } } From f214c454481a06f48fa31db5758931e25f914c12 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 15 Oct 2023 23:10:07 +0800 Subject: [PATCH 4/5] =?UTF-8?q?v1.0.9=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- change_log/1.0.9.1015.md | 28 ++++++++++++++++++++++++++++ pubspec.yaml | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 change_log/1.0.9.1015.md diff --git a/change_log/1.0.9.1015.md b/change_log/1.0.9.1015.md new file mode 100644 index 00000000..8b71e183 --- /dev/null +++ b/change_log/1.0.9.1015.md @@ -0,0 +1,28 @@ +## 1.0.9 + + +### 新功能 ++ 自定义倍速、默认倍速 ++ 历史记录搜索 ++ 收藏夹搜索 ++ 历史记录多选删除 ++ 视频循环播放 ++ 免登录看1080P ++ 评论区视频链接跳转 ++ up主分组 ++ up主投稿搜索 + +### 修复 ++ 搜索视频标题乱码 ++ 屏幕帧率 ++ 动态页面渲染 + + + +### 优化 ++ 快进手势 ++ 视频简介链接匹配 ++ 视频全屏时安全区域 + +更多更新日志可在Github上查看 +问题反馈、功能建议请查看「关于」页面。 diff --git a/pubspec.yaml b/pubspec.yaml index daed5d17..4fb8df02 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.8 +version: 1.0.9 environment: sdk: ">=2.19.6 <3.0.0" From 3d6c270070d7c835323764a8d03ba3c43c989779 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 15 Oct 2023 23:57:22 +0800 Subject: [PATCH 5/5] fix: request github ua --- lib/utils/utils.dart | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index 454ef378..f571e10d 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -187,21 +187,15 @@ class Utils { } // 版本对比 - static bool needUpdate(String currentVersion, String remoteVersion) { - List current = currentVersion.split('.').map(int.parse).toList(); - List remote = - remoteVersion.split('v')[1].split('.').map(int.parse).toList(); - - int maxLength = - current.length > remote.length ? current.length : remote.length; - - for (int i = 0; i < maxLength; i++) { - int currentValue = i < current.length ? current[i] : 0; - int remoteValue = i < remote.length ? remote[i] : 0; - - if (currentValue < remoteValue) { + static bool needUpdate(localVersion, remoteVersion) { + List localVersionList = localVersion.split('.'); + List remoteVersionList = remoteVersion.split('v')[1].split('.'); + for (int i = 0; i < localVersionList.length; i++) { + int localVersion = int.parse(localVersionList[i]); + int remoteVersion = int.parse(remoteVersionList[i]); + if (remoteVersion > localVersion) { return true; - } else if (currentValue > remoteValue) { + } else if (remoteVersion < localVersion) { return false; } } @@ -212,7 +206,7 @@ class Utils { static Future checkUpdata() async { SmartDialog.dismiss(); var currentInfo = await PackageInfo.fromPlatform(); - var result = await Request().get(Api.latestApp); + var result = await Request().get(Api.latestApp, extra: {'ua': 'mob'}); LatestDataModel data = LatestDataModel.fromJson(result.data); bool isUpdate = Utils.needUpdate(currentInfo.version, data.tagName!); if (isUpdate) {