From d46cff80e151217de5924136ef53594079137137 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Mon, 7 Aug 2023 09:37:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Podfile.lock | 6 +++--- lib/http/video.dart | 4 ---- lib/models/video/play/url.dart | 4 ++-- lib/pages/video/detail/controller.dart | 3 +++ pubspec.lock | 24 ++++++++++++------------ pubspec.yaml | 12 ++++++------ 6 files changed, 26 insertions(+), 27 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 65ff98a1..aad4a9b0 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -106,9 +106,9 @@ SPEC CHECKSUMS: Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb - media_kit_libs_ios_video: bcbf9a53dd3b60c0fcf92b0903e4706391ad0b65 - media_kit_native_event_loop: 1eac6db2378101404392c80606103b42f7c2c491 - media_kit_video: 8a750aa160f95fd6a5d6b88949c8df4c5cea6b0d + media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1 + media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a + media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7 path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 diff --git a/lib/http/video.dart b/lib/http/video.dart index afdd9ee2..24c0648a 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -113,10 +113,6 @@ class VideoHttp { try { var res = await Request().get(Api.videoUrl, data: data); if (res.data['code'] == 0) { - // List list = []; - // for (var i in res.data['data']['list']) { - // list.add(HotVideoItemModel.fromJson(i)); - // } return { 'status': true, 'data': PlayUrlModel.fromJson(res.data['data']) diff --git a/lib/models/video/play/url.dart b/lib/models/video/play/url.dart index 8944d797..07dd684c 100644 --- a/lib/models/video/play/url.dart +++ b/lib/models/video/play/url.dart @@ -78,7 +78,7 @@ class Dash { List? video; List? audio; Map? dolby; - String? flac; + Map? flac; Dash.fromJson(Map json) { duration = json['duration']; @@ -88,7 +88,7 @@ class Dash { ? json['audio'].map((e) => AudioItem.fromJson(e)).toList() : []; dolby = json['dolby']; - flac = json['flac'] ?? ''; + flac = json['flac'] ?? {}; } } diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/detail/controller.dart index 0f07101c..adbedcba 100644 --- a/lib/pages/video/detail/controller.dart +++ b/lib/pages/video/detail/controller.dart @@ -1,5 +1,6 @@ import 'dart:async'; import 'package:flutter/material.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:hive/hive.dart'; import 'package:pilipala/http/constants.dart'; @@ -181,6 +182,8 @@ class VideoDetailController extends GetxController defaultST: Duration(milliseconds: data.lastPlayTime!), duration: data.timeLength ?? 0, ); + } else { + SmartDialog.showToast(result['msg'].toString()); } return result; } diff --git a/pubspec.lock b/pubspec.lock index 494f2fe1..e60d3c50 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -649,10 +649,10 @@ packages: dependency: "direct main" description: name: media_kit - sha256: "272a9f1dd77ed57b48707fdb0ec0e4a048ef958feccc0d0dd751135fe924b63a" + sha256: eb47c2d51b7c06b319d8c776b47be912c5a4f53af7ab4814927a52a76442609e url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2+1" media_kit_libs_android_video: dependency: "direct main" description: @@ -665,26 +665,26 @@ packages: dependency: "direct main" description: name: media_kit_libs_ios_video - sha256: c691220334c1828e1fd24db4ebbdfdd6c576f0345bc6cc435b355798d6e4b7ed + sha256: b65d1f22442e6074948f501e7156c310fbf133cd63aa914c84d0d4db1c683ee0 url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.1.1" media_kit_libs_linux: dependency: "direct main" description: name: media_kit_libs_linux - sha256: "21acc71cbae3518b3aeef9023a6a3a3decb579a40153764333814987ccd61040" + sha256: "838b9e8041d376873cc938872c75812989d0feb247ad93afd8dbc92bf052680a" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.1.0" media_kit_libs_macos_video: dependency: "direct main" description: name: media_kit_libs_macos_video - sha256: "28ad624666cd20ed78f96a26917dddf6f286ea4bab21620676cc59ba62f3d3e5" + sha256: dcabf2731b6b7dee143c18617fd32a063146303e7388f87dd4e974e03c9c795a url: "https://pub.dev" source: hosted - version: "1.0.6" + version: "1.1.1" media_kit_libs_windows_video: dependency: "direct main" description: @@ -697,18 +697,18 @@ packages: dependency: "direct main" description: name: media_kit_native_event_loop - sha256: "5351f0c28124b5358756515d8619abad182cdefe967468d7fb5b274737cc2f59" + sha256: e37ce6fb5fa71b8cf513c6a6cd591367743a342a385e7da621a047dd8ef6f4a4 url: "https://pub.dev" source: hosted - version: "1.0.6" + version: "1.0.7" media_kit_video: dependency: "direct main" description: name: media_kit_video - sha256: "3ac0403d67710dfb2bf6aabfa6caff1b163e70fb7e1a88423bc1be569b4df6b3" + sha256: "4b627683ef9e7f5cd049fd01be4b5deb5f31effc878503f108c81b19fd745040" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" meta: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 5d97d0e4..0046e890 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -91,14 +91,14 @@ dependencies: crypto: ^3.0.3 # 视频播放器 - media_kit: ^1.1.1 # Primary package. - media_kit_video: ^1.1.1 # For video rendering. - media_kit_native_event_loop: ^1.0.6 # Support for higher number of concurrent instances & better performance. + media_kit: ^1.1.2+1 # Primary package. + media_kit_video: ^1.1.2 # For video rendering. + media_kit_native_event_loop: ^1.0.7 # Support for higher number of concurrent instances & better performance. media_kit_libs_android_video: ^1.3.0 # Android package for video native libraries. - media_kit_libs_ios_video: ^1.0.5 # iOS package for video native libraries. - media_kit_libs_macos_video: ^1.0.6 # macOS package for video native libraries. + media_kit_libs_ios_video: ^1.1.1 # iOS package for video native libraries. + media_kit_libs_macos_video: ^1.1.1 # macOS package for video native libraries. media_kit_libs_windows_video: ^1.0.5 # Windows package for video native libraries. - media_kit_libs_linux: ^1.0.2 + media_kit_libs_linux: ^1.1.0 # 音量、亮度、屏幕控制 volume_controller: ^2.0.7