diff --git a/.vscode/settings.json b/.vscode/settings.json index 2123232..58fc65e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,11 +1,9 @@ { - "dart.flutterSdkPath": ".fvm/flutter_sdk", - // Remove .fvm files from search - "search.exclude": { - "**/.fvm": true - }, - // Remove from file watching - "files.watcherExclude": { - "**/.fvm": true - } - } \ No newline at end of file + "dart.flutterSdkPath": ".fvm/versions/1.22.6", + "search.exclude": { + "**/.fvm": true + }, + "files.watcherExclude": { + "**/.fvm": true + } +} \ No newline at end of file diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e673450..90f0787 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -64,8 +64,12 @@ PODS: - FMDB (2.7.5): - FMDB/standard (= 2.7.5) - FMDB/standard (2.7.5) + - geolocator (6.2.0): + - Flutter - image_picker (0.0.1): - Flutter + - map_launcher (0.0.1): + - Flutter - Masonry (1.1.0) - open_file (0.0.1): - Flutter @@ -107,7 +111,9 @@ DEPENDENCIES: - flutter_drag_scale (from `.symlinks/plugins/flutter_drag_scale/ios`) - flutter_superplayer (from `.symlinks/plugins/flutter_superplayer/ios`) - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) + - geolocator (from `.symlinks/plugins/geolocator/ios`) - image_picker (from `.symlinks/plugins/image_picker/ios`) + - map_launcher (from `.symlinks/plugins/map_launcher/ios`) - open_file (from `.symlinks/plugins/open_file/ios`) - package_info (from `.symlinks/plugins/package_info/ios`) - path_provider (from `.symlinks/plugins/path_provider/ios`) @@ -162,8 +168,12 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/flutter_superplayer/ios" fluttertoast: :path: ".symlinks/plugins/fluttertoast/ios" + geolocator: + :path: ".symlinks/plugins/geolocator/ios" image_picker: :path: ".symlinks/plugins/image_picker/ios" + map_launcher: + :path: ".symlinks/plugins/map_launcher/ios" open_file: :path: ".symlinks/plugins/open_file/ios" package_info: @@ -182,40 +192,42 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/webview_flutter/ios" SPEC CHECKSUMS: - AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce - android_power_manager: c35cabf2188eaf836e8b4f2f4bad9aaa876d2f93 - app_installer: 6c31be407728fb6d67cce038fd8547e563e6982c - audioplayers: 53f0f30789b10ab2009771c6c79def00980945e4 + AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58 + android_power_manager: f4c55446e089d4e7efce3c4f7f9e6e2d59bf7dff + app_installer: 3de16a106f56b77eca43eece1ed723202b22dc52 + audioplayers: 2de44c6cb9d765742830def08bf60d8f6e859ae7 BaiduMapKit: 40a4382633859bd569d40da9f9a2e98a277dd28b BIJKPlayer: 4c5d66e5cb99ae5bade6f22a4fcc031722a81c64 - camera: a0ca5080336f7af47b88436e5e26da3dee5568f0 - city_pickers: b0370f4c35c201723b5b7fcce10ec29b59d5bc35 - device_info: d7d233b645a32c40dfdc212de5cf646ca482f175 - disable_screenshots: 3f3a1881efa341fcdad395fb2b25e11a9a7bce0b - fijkplayer: 0d3793a2822d030ef5bba77f904bff1f7a91a115 + camera: 299a04dd889d65397e64c94545796e60aabb11ab + city_pickers: 411a41e68eab0fa2f078317a9971cd454f4c9da4 + device_info: 52e8c0c9c61def8d0a92bf175f5f500abbea04bc + disable_screenshots: 20150b02b804ce1f3f10e3b1e6f088e3134eee90 + fijkplayer: 5db7b07d644d06584c3629f20f697909c7ec9eff Flutter: 0e3d915762c693b495b44d77113d4970485de6ec - flutter_background_service: a4644870cc76287aaa6147b47107e52680b79c90 - flutter_bmfbase: 8ac2c94f3f110daec8e499dc13f8a983b0c8ee40 - flutter_bmfmap: 57030919b16b5353649fbea77b6143129f7a4ff1 - flutter_bmfutils: 41b6af33c5e7d5d5f841ef9087fbd271c05b1961 - flutter_downloader: 058b9c41564a90500f67f3e432e3524613a7fd83 - flutter_drag_scale: 545fd546a1e968bd965883f0511b1c47f049f37d - flutter_superplayer: d776c28859e3e6c17821ab7973c1fd374f4f546f - fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b + flutter_background_service: cd346960455b6e2315353addac6bedc5a298346c + flutter_bmfbase: 4e95fc35604042ba54f91c5bbaeacb4a4f853164 + flutter_bmfmap: 13f91b61ddc184c4fbfc12f3d75977aa64248e25 + flutter_bmfutils: 4a3aec04ee00cf35d11e33027c485a7f7e9140d0 + flutter_downloader: d7c6d679fbc9a65d9094db7d9d562ee7a155f22e + flutter_drag_scale: 8db5da666c6fda0621291339c31dc45562312860 + flutter_superplayer: b46df51c000f4ae28da52ba8e07d3bf094500327 + fluttertoast: df9ba425182e58aa231106c563bffa08c0253471 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a - image_picker: 9c3312491f862b28d21ecd8fdf0ee14e601b3f09 + geolocator: 4a05413b63345608ddfa46a9b2a584bc244d6c55 + image_picker: 1c50c15f268eac05df9884b7a57b157a7e5d7fb5 + map_launcher: b429f5dc548985f011d7c840f269cd2ee3b5d45e Masonry: 678fab65091a9290e40e2832a55e7ab731aad201 - open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d - package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 - path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c - permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 + open_file: 898f23092cb034fda4ae3b268d782fe25d525e6b + package_info: cce50adca9873c79f931618469d2114b91d71189 + path_provider: 961ce7cdf0cba062c2f6ac640bcd96d310ec8645 + permission_handler: a6eb0c0a10e733fc3e1dcea4e2d426beb7c91064 SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d - shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d - sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 + shared_preferences: 47eaded4d5dc0bb45e04e66ce0b93ce876aff8a1 + sqflite: 954affaf2567c73cda074440299a625e3b2cbf8a TXLiteAVSDK_Professional: 645670c9d1bbabb88e8dff998fb097a22fe71208 - url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef - webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96 + url_launcher: 57d0ad20ca4ccf92256bb343ea186dbcf76fc042 + webview_flutter: 2035f13e34d76c8126e9bb6b893a0c050b2999b8 PODFILE CHECKSUM: 568d83cfac207bd024fffa34866403436cf8f991 -COCOAPODS: 1.11.3 +COCOAPODS: 1.15.2 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 01c6530..fb46be2 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -387,7 +387,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 20220416; + CURRENT_PROJECT_VERSION = 20250527; DEVELOPMENT_TEAM = 64SK828CZ2; ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64"; @@ -405,7 +405,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 1.4.25; + MARKETING_VERSION = 1.6.5; PRODUCT_BUNDLE_IDENTIFIER = tech.mluoc.hyzpYbqx; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -533,7 +533,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 20220416; + CURRENT_PROJECT_VERSION = 20250527; DEVELOPMENT_TEAM = 64SK828CZ2; ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64"; @@ -551,7 +551,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 1.4.25; + MARKETING_VERSION = 1.6.5; PRODUCT_BUNDLE_IDENTIFIER = tech.mluoc.hyzpYbqx; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -572,7 +572,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 20220416; + CURRENT_PROJECT_VERSION = 20250527; DEVELOPMENT_TEAM = 64SK828CZ2; ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64"; @@ -590,7 +590,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 1.4.25; + MARKETING_VERSION = 1.6.5; PRODUCT_BUNDLE_IDENTIFIER = tech.mluoc.hyzpYbqx; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/lib/my_fijkPanel_fix/my_panel3.dart b/lib/my_fijkPanel_fix/my_panel3.dart index c4225a3..d5f3389 100644 --- a/lib/my_fijkPanel_fix/my_panel3.dart +++ b/lib/my_fijkPanel_fix/my_panel3.dart @@ -3,6 +3,7 @@ import 'dart:core'; import 'dart:math'; import 'dart:ui'; import 'dart:typed_data'; +import 'dart:io' show Platform; import 'package:fijkplayer/fijkplayer.dart'; import 'package:flutter/cupertino.dart'; @@ -15,7 +16,7 @@ import '../components/commonFun.dart'; import 'package:provider/provider.dart'; import '../provider/player_ratio.dart'; import 'my_slider.dart'; -import '../my_extended_image/common/image_picker/_image_picker_io.dart'; +// import '../my_extended_image/common/image_picker/_image_picker_io.dart'; import '../services/Storage.dart'; // class MyFijkPanelWidgetBuilder extends StatefulWidget { @@ -51,7 +52,7 @@ FijkPanelWidgetBuilder fijkPanel2Builder3( texPos: texturePos, fill: fill, doubleTap: doubleTap, - snapShot: snapShot, + snapShot: Platform.isIOS ? false : snapShot, hideDuration: duration, ); }; @@ -494,13 +495,13 @@ class MyFijkPanelWidgetBuilderState extends State }); FijkLog.d("get snapshot succeed"); - //Uint8List fileData; - String fileFath; - ImageSaver.save('extended_image_cropped_image.jpg', v).then((value) { - fileFath = value; - // var fileFath = await ImagePickerSaver.saveFile(fileData: fileData); - print('my save fileFath : $fileFath'); - }); + // //Uint8List fileData; + // String fileFath; + // ImageSaver.save('extended_image_cropped_image.jpg', v).then((value) { + // fileFath = value; + // // var fileFath = await ImagePickerSaver.saveFile(fileData: fileData); + // print('my save fileFath : $fileFath'); + // }); }).catchError((e) { FijkLog.d("get snapshot failed"); }); diff --git a/lib/my_flutter_bmfmap-1.0.2/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/lib/my_flutter_bmfmap-1.0.2/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java new file mode 100644 index 0000000..cabd18f --- /dev/null +++ b/lib/my_flutter_bmfmap-1.0.2/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java @@ -0,0 +1,27 @@ +package io.flutter.plugins; + +import io.flutter.plugin.common.PluginRegistry; +import com.baidu.flutter_bmfbase.FlutterBmfbasePlugin; +import com.baidu.flutter_bmfmap.FlutterBmfmapPlugin; + +/** + * Generated file. Do not edit. + */ +public final class GeneratedPluginRegistrant { + public static void registerWith(PluginRegistry registry) { + if (alreadyRegisteredWith(registry)) { + return; + } + FlutterBmfbasePlugin.registerWith(registry.registrarFor("com.baidu.flutter_bmfbase.FlutterBmfbasePlugin")); + FlutterBmfmapPlugin.registerWith(registry.registrarFor("com.baidu.flutter_bmfmap.FlutterBmfmapPlugin")); + } + + private static boolean alreadyRegisteredWith(PluginRegistry registry) { + final String key = GeneratedPluginRegistrant.class.getCanonicalName(); + if (registry.hasPlugin(key)) { + return true; + } + registry.registrarFor(key); + return false; + } +} diff --git a/lib/my_flutter_bmfmap-1.0.2/ios/Flutter/Generated.xcconfig b/lib/my_flutter_bmfmap-1.0.2/ios/Flutter/Generated.xcconfig new file mode 100644 index 0000000..19498a7 --- /dev/null +++ b/lib/my_flutter_bmfmap-1.0.2/ios/Flutter/Generated.xcconfig @@ -0,0 +1,14 @@ +// This is a generated file; do not edit or check into version control. +FLUTTER_ROOT=/Users/mlch911/fvm/versions/1.22.6 +FLUTTER_APPLICATION_PATH=/Users/mlch911/Documents/Programming/flutter/hyzp_ybqx/lib/my_flutter_bmfmap-1.0.2 +FLUTTER_TARGET=lib/main.dart +FLUTTER_BUILD_DIR=build +SYMROOT=${SOURCE_ROOT}/../build/ios +OTHER_LDFLAGS=$(inherited) -framework Flutter +FLUTTER_FRAMEWORK_DIR=/Users/mlch911/fvm/versions/1.22.6/bin/cache/artifacts/engine/ios +FLUTTER_BUILD_NAME=1.0.2 +FLUTTER_BUILD_NUMBER=1.0.2 +DART_OBFUSCATION=false +TRACK_WIDGET_CREATION=false +TREE_SHAKE_ICONS=false +PACKAGE_CONFIG=.packages diff --git a/lib/my_flutter_bmfmap-1.0.2/ios/Flutter/flutter_export_environment.sh b/lib/my_flutter_bmfmap-1.0.2/ios/Flutter/flutter_export_environment.sh new file mode 100755 index 0000000..fcb883c --- /dev/null +++ b/lib/my_flutter_bmfmap-1.0.2/ios/Flutter/flutter_export_environment.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# This is a generated file; do not edit or check into version control. +export "FLUTTER_ROOT=/Users/mlch911/fvm/versions/1.22.6" +export "FLUTTER_APPLICATION_PATH=/Users/mlch911/Documents/Programming/flutter/hyzp_ybqx/lib/my_flutter_bmfmap-1.0.2" +export "FLUTTER_TARGET=lib/main.dart" +export "FLUTTER_BUILD_DIR=build" +export "SYMROOT=${SOURCE_ROOT}/../build/ios" +export "OTHER_LDFLAGS=$(inherited) -framework Flutter" +export "FLUTTER_FRAMEWORK_DIR=/Users/mlch911/fvm/versions/1.22.6/bin/cache/artifacts/engine/ios" +export "FLUTTER_BUILD_NAME=1.0.2" +export "FLUTTER_BUILD_NUMBER=1.0.2" +export "DART_OBFUSCATION=false" +export "TRACK_WIDGET_CREATION=false" +export "TREE_SHAKE_ICONS=false" +export "PACKAGE_CONFIG=.packages" diff --git a/lib/my_flutter_bmfmap-1.0.2/ios/Runner/GeneratedPluginRegistrant.h b/lib/my_flutter_bmfmap-1.0.2/ios/Runner/GeneratedPluginRegistrant.h new file mode 100644 index 0000000..ed9a5c6 --- /dev/null +++ b/lib/my_flutter_bmfmap-1.0.2/ios/Runner/GeneratedPluginRegistrant.h @@ -0,0 +1,17 @@ +// +// Generated file. Do not edit. +// + +#ifndef GeneratedPluginRegistrant_h +#define GeneratedPluginRegistrant_h + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface GeneratedPluginRegistrant : NSObject ++ (void)registerWithRegistry:(NSObject*)registry; +@end + +NS_ASSUME_NONNULL_END +#endif /* GeneratedPluginRegistrant_h */ diff --git a/lib/my_flutter_bmfmap-1.0.2/ios/Runner/GeneratedPluginRegistrant.m b/lib/my_flutter_bmfmap-1.0.2/ios/Runner/GeneratedPluginRegistrant.m new file mode 100644 index 0000000..cde3142 --- /dev/null +++ b/lib/my_flutter_bmfmap-1.0.2/ios/Runner/GeneratedPluginRegistrant.m @@ -0,0 +1,26 @@ +// +// Generated file. Do not edit. +// + +#import "GeneratedPluginRegistrant.h" + +#if __has_include() +#import +#else +@import flutter_bmfbase; +#endif + +#if __has_include() +#import +#else +@import flutter_bmfmap; +#endif + +@implementation GeneratedPluginRegistrant + ++ (void)registerWithRegistry:(NSObject*)registry { + [FlutterBmfbasePlugin registerWithRegistrar:[registry registrarForPlugin:@"FlutterBmfbasePlugin"]]; + [FlutterBmfmapPlugin registerWithRegistrar:[registry registrarForPlugin:@"FlutterBmfmapPlugin"]]; +} + +@end diff --git a/lib/my_flutter_drag_scale/example/android/local.properties b/lib/my_flutter_drag_scale/example/android/local.properties index 5acce31..9bdd0bd 100644 --- a/lib/my_flutter_drag_scale/example/android/local.properties +++ b/lib/my_flutter_drag_scale/example/android/local.properties @@ -1,2 +1,2 @@ -sdk.dir=S:\\Android\\Android-SDK-Windows -flutter.sdk=R:\\Flutter\\FlutterSDK\\1.22.6 \ No newline at end of file +sdk.dir=/Users/mlch911/Library/Android/sdk +flutter.sdk=/Users/mlch911/fvm/versions/1.22.6 \ No newline at end of file diff --git a/lib/my_flutter_drag_scale/example/ios/Flutter/Generated.xcconfig b/lib/my_flutter_drag_scale/example/ios/Flutter/Generated.xcconfig new file mode 100644 index 0000000..3c731f3 --- /dev/null +++ b/lib/my_flutter_drag_scale/example/ios/Flutter/Generated.xcconfig @@ -0,0 +1,14 @@ +// This is a generated file; do not edit or check into version control. +FLUTTER_ROOT=/Users/mlch911/fvm/versions/1.22.6 +FLUTTER_APPLICATION_PATH=/Users/mlch911/Documents/Programming/flutter/hyzp_ybqx/lib/my_flutter_drag_scale/example +FLUTTER_TARGET=lib/main.dart +FLUTTER_BUILD_DIR=build +SYMROOT=${SOURCE_ROOT}/../build/ios +OTHER_LDFLAGS=$(inherited) -framework Flutter +FLUTTER_FRAMEWORK_DIR=/Users/mlch911/fvm/versions/1.22.6/bin/cache/artifacts/engine/ios +FLUTTER_BUILD_NAME=1.0.0 +FLUTTER_BUILD_NUMBER=1 +DART_OBFUSCATION=false +TRACK_WIDGET_CREATION=false +TREE_SHAKE_ICONS=false +PACKAGE_CONFIG=.packages diff --git a/lib/my_flutter_drag_scale/example/ios/Flutter/flutter_export_environment.sh b/lib/my_flutter_drag_scale/example/ios/Flutter/flutter_export_environment.sh new file mode 100755 index 0000000..8b2ce90 --- /dev/null +++ b/lib/my_flutter_drag_scale/example/ios/Flutter/flutter_export_environment.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# This is a generated file; do not edit or check into version control. +export "FLUTTER_ROOT=/Users/mlch911/fvm/versions/1.22.6" +export "FLUTTER_APPLICATION_PATH=/Users/mlch911/Documents/Programming/flutter/hyzp_ybqx/lib/my_flutter_drag_scale/example" +export "FLUTTER_TARGET=lib/main.dart" +export "FLUTTER_BUILD_DIR=build" +export "SYMROOT=${SOURCE_ROOT}/../build/ios" +export "OTHER_LDFLAGS=$(inherited) -framework Flutter" +export "FLUTTER_FRAMEWORK_DIR=/Users/mlch911/fvm/versions/1.22.6/bin/cache/artifacts/engine/ios" +export "FLUTTER_BUILD_NAME=1.0.0" +export "FLUTTER_BUILD_NUMBER=1" +export "DART_OBFUSCATION=false" +export "TRACK_WIDGET_CREATION=false" +export "TREE_SHAKE_ICONS=false" +export "PACKAGE_CONFIG=.packages" diff --git a/lib/my_flutter_superplayer/example/pubspec.lock b/lib/my_flutter_superplayer/example/pubspec.lock index 66b686b..f9e9da8 100644 --- a/lib/my_flutter_superplayer/example/pubspec.lock +++ b/lib/my_flutter_superplayer/example/pubspec.lock @@ -5,56 +5,56 @@ packages: dependency: transitive description: name: async - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.5.0-nullsafety.1" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.0-nullsafety.1" characters: dependency: transitive description: name: characters - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.0-nullsafety.3" charcode: dependency: transitive description: name: charcode - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.2.0-nullsafety.1" clock: dependency: transitive description: name: clock - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.0-nullsafety.1" collection: dependency: transitive description: name: collection - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.15.0-nullsafety.3" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.0.0" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.2.0-nullsafety.1" flutter: @@ -78,21 +78,21 @@ packages: dependency: transitive description: name: matcher - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.12.10-nullsafety.1" meta: dependency: transitive description: name: meta - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.3.0-nullsafety.3" path: dependency: transitive description: name: path - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.8.0-nullsafety.1" sky_engine: @@ -104,56 +104,56 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.8.0-nullsafety.2" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.10.0-nullsafety.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.0-nullsafety.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.0-nullsafety.1" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.2.0-nullsafety.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.2.19-nullsafety.2" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.3.0-nullsafety.3" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.0-nullsafety.3" sdks: diff --git a/lib/my_flutter_superplayer/pubspec.lock b/lib/my_flutter_superplayer/pubspec.lock index 500e067..ac15087 100644 --- a/lib/my_flutter_superplayer/pubspec.lock +++ b/lib/my_flutter_superplayer/pubspec.lock @@ -5,49 +5,49 @@ packages: dependency: transitive description: name: async - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.5.0-nullsafety.1" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.0-nullsafety.1" characters: dependency: transitive description: name: characters - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.0-nullsafety.3" charcode: dependency: transitive description: name: charcode - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.2.0-nullsafety.1" clock: dependency: transitive description: name: clock - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.0-nullsafety.1" collection: dependency: transitive description: name: collection - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.15.0-nullsafety.3" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.2.0-nullsafety.1" flutter: @@ -64,21 +64,21 @@ packages: dependency: transitive description: name: matcher - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.12.10-nullsafety.1" meta: dependency: transitive description: name: meta - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.3.0-nullsafety.3" path: dependency: transitive description: name: path - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.8.0-nullsafety.1" sky_engine: @@ -90,56 +90,56 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.8.0-nullsafety.2" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.10.0-nullsafety.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.0-nullsafety.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.0-nullsafety.1" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.2.0-nullsafety.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.2.19-nullsafety.2" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.3.0-nullsafety.3" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.0-nullsafety.3" sdks: diff --git a/lib/widget/my_superplayer.dart b/lib/widget/my_superplayer.dart index 9713dc1..a2c8f29 100644 --- a/lib/widget/my_superplayer.dart +++ b/lib/widget/my_superplayer.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'dart:convert'; import 'dart:ui'; -import 'dart:io'; import 'package:fijkplayer/fijkplayer.dart'; import 'package:flutter/material.dart'; @@ -14,12 +13,13 @@ import 'package:hyzp_ybqx/components/dioFun.dart'; import 'package:hyzp_ybqx/provider/player_ratio.dart'; import 'package:hyzp_ybqx/provider/player_region.dart'; import 'package:provider/provider.dart'; -import 'package:fijkplayer/fijkplayer.dart'; import '../components/commonFun.dart'; import '../services/Storage.dart'; import '../my_fijkPanel_fix/my_panel3.dart'; +const _kControlViewTypes = [kControlViewTypeDefault, kControlViewTypeWithout]; + class SuperPlayerPage extends StatefulWidget { SuperPlayerPage( {@required this.url, @@ -62,10 +62,6 @@ class _SuperPlayerPageState extends State setSphericalCameraDio(id: widget.id, dwip: widget.dwip, cmdCode: 1); _playerController.release(); // 必须显示释放视频播放资源，否则即使退出视频播放页面后台还在获取视频流 super.dispose(); - _ijkPlayer.release(); - _playerController.resetPlayer(); - _playerController.release(); - SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); } @override @@ -119,7 +115,6 @@ class _SuperPlayerPageState extends State // await _playerController.setOption(FijkOption.hostCategory, "request-screen-on", 1); // await _playerController.setOption(FijkOption.hostCategory, "request-audio-focus", 1); } - } await _playerController.setDataSource(widget.url, autoPlay: true).catchError((e) { print("setDataSource error: $e"); @@ -154,7 +149,15 @@ class _SuperPlayerPageState extends State // } SuperPlayerModel get testSuperPlayerModel { - return SuperPlayerModel(url: widget.url); + // int appId = 1252463788; + // String fileId = "5285890781763144364"; + + SuperPlayerModel superPlayerModel = SuperPlayerModel( + url: widget.url, + // appId: appId, + // videoId: SuperPlayerVideoId(fileId: fileId), + ); + return superPlayerModel; } // Platform messages are asynchronous, so we initialize in an async method. @@ -214,6 +217,7 @@ class _SuperPlayerPageState extends State double _outerRadius = 270; double _innerRadius = _outerRadius / 2; + //double barHeight = bFullScreen ? 0 : MediaQueryData.fromWindow(window).padding.top; return Scaffold( appBar: bFullScreen ? null @@ -224,9 +228,13 @@ class _SuperPlayerPageState extends State automaticallyImplyLeading: false, centerTitle: true, titleSpacing: 0.0, + //设置title的左边距 flexibleSpace: Container( + //SizedBox(height: ScreenUtil().statusBarHeight), //显示顶部状态栏 + // SizedBox(height: ScreenUtil().setHeight(10)), //显示顶部状态栏 padding: EdgeInsets.only(top: ScreenUtil().statusBarHeight), //留出顶部状态栏高度 child: Container( + //height: ScreenUtil().setHeight(173), decoration: BoxDecoration( gradient: LinearGradient( begin: Alignment.centerLeft, @@ -237,6 +245,12 @@ class _SuperPlayerPageState extends State ], ), ), + // decoration: BoxDecoration( + // gradient: LinearGradient(colors: [ + // Color(0xFF0018EB), + // Color(0xFF01C1D9), + // ], begin: Alignment.bottomCenter, end: Alignment.topCenter), + // ), ), ), title: Padding( @@ -249,7 +263,7 @@ class _SuperPlayerPageState extends State iconData: Icons.chevron_left_outlined, onPress: () { getingDwVideo = false; - pop(); + Navigator.pop(context); }, ), Expanded( @@ -266,12 +280,16 @@ class _SuperPlayerPageState extends State ), body: WillPopScope( child: Container( + // height: ScreenUtil().screenHeight - + // ScreenUtil().statusBarHeight - + // ScreenUtil().bottomBarHeight, color: Color.fromRGBO(224, 224, 224, 1), child: Column( children: [ //第2行组件，视频播放区 Center( child: Container( + //padding: EdgeInsets.only(top: barHeight), alignment: Alignment(0, -1), width: MediaQuery.of(context).size.width, height: MediaQuery.of(context).size.width * (9 / 16), @@ -315,6 +333,7 @@ class _SuperPlayerPageState extends State children: [ SizedBox(width: ScreenUtil().setWidth(btn_left)), getRoundButton( + //(bPlaying) ? '暂停' : '播放', text: playerRegionProvide.playerText, icon: playerRegionProvide.playerIcon, diameter: 130, @@ -467,27 +486,41 @@ class _SuperPlayerPageState extends State } }, ), + // child: GridView.custom( + // // padding: EdgeInsets.only( + // // left: ScreenUtil().setWidth(35), right: ScreenUtil().setWidth(35)), + // gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( + // crossAxisCount: btnCount3, + // mainAxisSpacing: 0, + // crossAxisSpacing: 1, + // childAspectRatio: ratio3, + // ), + // childrenDelegate: SliverChildBuilderDelegate((context, position) { + // return getItemContainer(listData[position]); + // }, childCount: btnCount3)), ), + //SizedBox(height: ScreenUtil().setHeight(49)), + //Divider(color: Colors.blue), + //第4行组件，分隔栏 + // Container( + // //height: 11, + // height: ScreenUtil().setHeight(28), + // color: Color.fromRGBO(224, 224, 224, 1), + // ), ], ), ), onWillPop: () { + Playing = false; + getingDwVideo = false; // 云台控制代码：1：停止动作、3：启动雨刷、11：焦距变大、12：焦距变小 setSphericalCameraDio(id: widget.id, dwip: widget.dwip, cmdCode: 1); - pop(); + Navigator.pop(context); //关闭弹框，播放输入视频地址 }, ), ); } - pop() async { - Playing = false; - getingDwVideo = false; - _ijkPlayer.removeListener(() {}); - await _playerController.removeListener(this); - Navigator.pop(context); - } - @override void onClickFloatCloseBtn() { _addLog('onClickFloatCloseBtn', {}); @@ -496,14 +529,13 @@ class _SuperPlayerPageState extends State @override void onClickSmallReturnBtn() { _addLog('onClickSmallReturnBtn', {}); - pop(); + Navigator.maybePop(context); } @override void onFullScreenChange(bool isFullScreen) { _addLog('onFullScreenChange', {'isFullScreen': isFullScreen}); - if (bFullScreen == isFullScreen) return; - bFullScreen = isFullScreen; + bFullScreen = !bFullScreen; setState(() {}); } @@ -542,12 +574,6 @@ class _SuperPlayerPageState extends State _addLog('onStartFloatWindowPlay', {}); } - void _fijkValueListener() { - FijkValue value = _ijkPlayer.value; - onPlayStateChange(value.state == FijkState.started ? 1 : 2); - onFullScreenChange(value.fullScreen); -} - //生成圆形按钮部件，基于图标 Widget getRoundButton( {double diameter = 144, @@ -606,7 +632,13 @@ class _SuperPlayerPageState extends State child: Image.asset(image_path, fit: BoxFit.fitWidth, width: ScreenUtil().setWidth(imageSize), + //height: ScreenUtil().setWidth(iconSize), color: Color.fromRGBO(52, 157, 237, 1)), + // child: Icon( + // icon, + // size: ScreenUtil().setWidth(iconSize), + // color: Color.fromRGBO(52, 157, 237, 1), + // ), decoration: BoxDecoration( color: color_bkg, borderRadius: BorderRadius.all(Radius.circular(200)),