From 8750a9b945641e93c41729bfa340c5e418f1bac6 Mon Sep 17 00:00:00 2001 From: mlch911 Date: Mon, 2 May 2022 21:55:32 +0800 Subject: [PATCH] Update --- ios/Podfile.lock | 6 ++ lib/widget/my_superplayer.dart | 2 +- pubspec.yaml | 122 +-------------------------------- 3 files changed, 10 insertions(+), 120 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e069ba9..5fbfb6c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -14,6 +14,8 @@ PODS: - AFNetworking/Serialization (4.0.1) - AFNetworking/UIKit (4.0.1): - AFNetworking/NSURLSession + - android_power_manager (0.0.1): + - Flutter - app_installer (0.5.0): - Flutter - audioplayers (0.0.1): @@ -83,6 +85,7 @@ PODS: - Flutter DEPENDENCIES: + - android_power_manager (from `.symlinks/plugins/android_power_manager/ios`) - app_installer (from `.symlinks/plugins/app_installer/ios`) - audioplayers (from `.symlinks/plugins/audioplayers/ios`) - camera (from `.symlinks/plugins/camera/ios`) @@ -119,6 +122,8 @@ SPEC REPOS: - TXLiteAVSDK_Professional EXTERNAL SOURCES: + android_power_manager: + :path: ".symlinks/plugins/android_power_manager/ios" app_installer: :path: ".symlinks/plugins/app_installer/ios" audioplayers: @@ -172,6 +177,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce + android_power_manager: c35cabf2188eaf836e8b4f2f4bad9aaa876d2f93 app_installer: 6c31be407728fb6d67cce038fd8547e563e6982c audioplayers: 53f0f30789b10ab2009771c6c79def00980945e4 BaiduMapKit: 40a4382633859bd569d40da9f9a2e98a277dd28b diff --git a/lib/widget/my_superplayer.dart b/lib/widget/my_superplayer.dart index f59b7e4..3fcd426 100644 --- a/lib/widget/my_superplayer.dart +++ b/lib/widget/my_superplayer.dart @@ -207,7 +207,7 @@ class _SuperPlayerPageState extends State with SuperPlayerListe child: Stack( children: [ _playState <= 2 ? getMoreWidget(strokeWidth: 3.0) : SizedBox.shrink(), - _useIJKPlayer ? FijkView(player: _ijkPlayer) : SuperPlayerView(controller: _playerController) + _useIJKPlayer ? FijkView(player: _ijkPlayer, color: Colors.black) : SuperPlayerView(controller: _playerController) ], ), ), diff --git a/pubspec.yaml b/pubspec.yaml index d562954..387d71a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -21,52 +21,6 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -# 版本名称: 1.2.7 版本号:1 -# R:\FlutterProject\FlutterProject33\hyzp_ybqx\lib\components\commonFun.dart -# String dateAppCompile = '2021.05.18'; //1.2.7 -# String dateAppCompile = '2021.05.15'; //1.3.1 -# 版本号保存在该文件中：r:\FlutterProject\FlutterProject33\hyzp_ybqx\pubspec.yaml -# version: 1.3.1+20210508 +号前面是版本号，+号后面是时间（yyyymmdd 小版本号） 对应 hyzp_ybqx-Commit802-Branch.031 -# version: 1.3.0+20210526 -# version: 1.3.1+20210527 -# version: 1.3.2+20210528 -# version: 1.3.4+20210529 -# version: 1.3.5+20210530 -# version: 1.3.6+20210601 -# version: 1.3.7+20210604 -# version: 1.3.10+20210604 -# version: 1.3.11+20210729 -# 关键是在通过接口 App.Car_Upload.Apk 上传新版本 apk 时，ver参数的版本号必须为1.3.12，而不能为1.3.12+20210729 -# 否则老版本1.3.10+20210604无法更新。新版本1.3.12+20210729已经解决该问题 -# version: 1.3.12+20210729 -# version: 1.3.13+20211026 -# version: 1.4.1+20211226 -# version: 1.4.2+20211227 -# version: 1.4.4+20211230 -# version: 1.4.6+20211231 -# version: 1.4.7+20220101 -# version: 1.4.9+20220103 -# version: 1.4.10+20220104 -# version: 1.4.11+20220106 -#version: 1.4.12+20220107 -# version: 1.4.13+20220121 -# 用下划线编译报错： -# Error on line 53, column 10 of pubspec.yaml: Invalid version number: Could not parse "1.4.14_20220124". -# version: 1.4.14 # 为规范起见，从该版本起取消后面的 +20220124 -#version: 1.4.14+20220124 # 無法獲取flutter编译时间，只有通过这种方式获取，所以还是保留后面的 +20220124。 -# 上传软件时可以不加后面的 +20220124，否则二维码扫码后无法直接下载 -#version: 1.4.15+20220124 -#version: 1.4.16+20220126 -#version: 1.4.17+20220227 -#version: 1.4.18+20220302 -#version: 1.4.19+20220303 -#version: 1.4.20+20220306 -#version: 1.4.21+20220319 -#version: 1.4.22+20220320 -#version: 1.4.23+20220408 -#version: 1.4.26+20220426 -#version: 1.4.27+20220426 -#version: 1.4.28+20220426 version: 1.4.29+20220502 environment: @@ -106,18 +60,6 @@ dependencies: encrypt: ^4.1.0 device_info: ^1.0.0 - # 解决 wechat_assets_picker: ^3.0.0+1 直接依赖冲突报错，可以不用目录依赖方式-OK - #path_provider: ^0.4.1 - - # wechat_assets_picker: ^3.0.0+1 # 直接依赖有冲突报错，所以采用目录依赖方式。 - # 但是为了便于修改，还是直接采用目录依赖方式简单得多 - # wechat_assets_picker: - # path: ./lib/wechat_assets_picker-3.0.0+1/ - # wechat_assets_picker: - # path: ./lib/my_wechat_assets_picker-3.0.0+1/ - # wechat_assets_picker: - # path: ./lib/my_wechat_assets_picker-4.1.0+1/ - url_launcher: ^5.7.0 get_it: ^5.0.1 image_picker: ^0.6.7+22 @@ -128,60 +70,32 @@ dependencies: keyboard_avoider: ^0.1.2 scroll_to_index: ^1.0.6 flutter_drag_scale: - #git: https://github.com/LiuC520/flutter_drag_scale.git git: https://github.com/mjl0602/flutter_drag_scale.git - # flutter_bmfmap: ^1.0.2 - # 准备使用自定义 flutter_bmfmap: ^1.0.2，以适应IOS版加载文本标识 - # 为 BMFMarker 类增加参数 BitmapDescriptor bitmapDescriptor flutter_bmfmap: path: ./lib/Modules/hyzp_yibin_bmfmap/lib/my_flutter_bmfmap-1.0.2 flutter_bmfutils: ^1.0.2 http: ^0.12.2 - #charts_flutter: ^0.9.0 fl_chart: ^0.12.3 flutter_datetime_picker: ^1.5.0 linked_scroll_controller: ^0.1.2 - #flutter_common_exports: ^0.1.0 - - #pinch_zoom_image_last: ^0.3.2 //不好用 - #extended_image: ^2.0.0 #版本冲突 - #Because extended_image >=2.0.0 depends on extended_image_library ^1.0.1 and hyzp_ybqx depends on extended_image_library ^0.2.3, extended_image >=2.0.0 is forbidden. - #So, because hyzp_ybqx depends on extended_image ^2.0.0, version solving failed. - #Running "flutter pub get" in hyzp_ybqx... - #pub get failed (1; So, because hyzp_ybqx depends on extended_image ^2.0.0, version solving failed.) - - # 经多次测试，是插件x5_webview与flutter_downloader冲突 - #x5_webview: ^0.2.4 - # x5_webview: - # path: ./lib/my_x5_webview/ - - flutterptcontrol: path: ./lib/my_flutterPtControl sprintf: ^5.0.0 - ## 处理自动更新 - # permission_handler: ^5.0.0+hotfix.4 - # package_info: ^0.4.1 - # path_provider: ^1.6.11 open_file: ^3.0.3 # 打开文件 - # 经多次测试，是插件x5_webview与flutter_downloader冲突 + flutter_downloader: ^1.5.2 # 下载文件 package_info: ^0.4.3+2 # 检测版本号 progress_dialog: ^1.2.0 # 显示进度对话框 - # app_installer: ^1.1.0 # Flutter 2.12，修复 Android 11 上允许权限后应用重启的问题 + app_installer: ^0.5.0 # Flutter 2.1，修复 Android 11 上允许权限后应用重启的问题，https://pub.dev/packages/app_installer - # install_plugin: ^2.0.1 # 不行，https://pub.dev/packages/install_plugin - - #flutter_app_badger and flutter_app_icon_badge Not working on android devices of Samsung Galaxy S7 and Samsung Galaxy S10 - #flutter_app_badger: ^1.1.2 # 桌面App图标红点 - #flutter_app_icon_badge: ^1.0.1 # 替代 flutter_app_badger，无效 + badges: ^1.0.3 # App中的图标红点 flutter_echarts: ^1.5.0 @@ -212,42 +126,12 @@ flutter: # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - assets: - assets/files_icons/ - assets/fun_icons/ - assets/images/ - assets/audio/ - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/assets-and-images/#resolution-aware. - - # For details regarding adding assets from package dependencies, see - # https://flutter.dev/assets-and-images/#from-packages - - # To add custom fonts to your application, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts from package dependencies, - # see https://flutter.dev/custom-fonts/#from-packages fonts: - family: myfont fonts: