From c5152e379f946be9be8f26c52d0e6c00beb0931d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=90=8C?= <494089941@qq.com> Date: Tue, 7 Jun 2022 15:48:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0app=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Podfile.lock | 18 ++++++------------ lib/pages/splash/splash_page.dart | 3 ++- lib/utils/websocket/fire_dialog.dart | 2 ++ lib/widget/dialog/bee_custom_dialog.dart | 9 +++++---- pubspec.lock | 16 ++++++++++++++++ pubspec.yaml | 6 +++--- 6 files changed, 34 insertions(+), 20 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 157c054c..e727127c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -17,8 +17,6 @@ PODS: - device_info_plus (0.0.1): - Flutter - Flutter (1.0.0) - - flutter_local_notifications (0.0.1): - - Flutter - flutter_sound (9.2.2): - Flutter - flutter_sound_core (= 9.2.2) @@ -54,9 +52,9 @@ PODS: - qr_code_scanner (0.2.0): - Flutter - MTBBarcodeScanner - - share (0.0.1): + - r_upgrade (0.0.1): - Flutter - - shared_preferences_ios (0.0.1): + - share (0.0.1): - Flutter - sms_autofill (0.0.1): - Flutter @@ -76,7 +74,6 @@ DEPENDENCIES: - audio_session (from `.symlinks/plugins/audio_session/ios`) - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - Flutter (from `Flutter`) - - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) - flutter_sound (from `.symlinks/plugins/flutter_sound/ios`) - fluwx (from `.symlinks/plugins/fluwx/ios`) - image_picker (from `.symlinks/plugins/image_picker/ios`) @@ -88,8 +85,8 @@ DEPENDENCIES: - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) - permission_handler (from `.symlinks/plugins/permission_handler/ios`) - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) + - r_upgrade (from `.symlinks/plugins/r_upgrade/ios`) - share (from `.symlinks/plugins/share/ios`) - - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`) - sms_autofill (from `.symlinks/plugins/sms_autofill/ios`) - sqflite (from `.symlinks/plugins/sqflite/ios`) - tobias (from `.symlinks/plugins/tobias/ios`) @@ -120,8 +117,6 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/device_info_plus/ios" Flutter: :path: Flutter - flutter_local_notifications: - :path: ".symlinks/plugins/flutter_local_notifications/ios" flutter_sound: :path: ".symlinks/plugins/flutter_sound/ios" fluwx: @@ -144,10 +139,10 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/permission_handler/ios" qr_code_scanner: :path: ".symlinks/plugins/qr_code_scanner/ios" + r_upgrade: + :path: ".symlinks/plugins/r_upgrade/ios" share: :path: ".symlinks/plugins/share/ios" - shared_preferences_ios: - :path: ".symlinks/plugins/shared_preferences_ios/ios" sms_autofill: :path: ".symlinks/plugins/sms_autofill/ios" sqflite: @@ -167,7 +162,6 @@ SPEC CHECKSUMS: audio_session: 4f3e461722055d21515cf3261b64c973c062f345 device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a - flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743 flutter_sound: b4eccdf53c922ad12146ac94fb2a18ceb5855c12 flutter_sound_core: 0e902ec587e9854b4f852f4bad2d625057d9958b fluwx: 02670633ce7509206f62b366e9734e7dda81e100 @@ -184,8 +178,8 @@ SPEC CHECKSUMS: path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e + r_upgrade: 44d715c61914cce3d01ea225abffe894fd51c114 share: 0b2c3e82132f5888bccca3351c504d0003b3b410 - shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad sms_autofill: c461043483362c3f1709ee76eaae6eb570b31686 sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 tobias: 2aded9b83e3663b907360a800d8e3c13284f25c5 diff --git a/lib/pages/splash/splash_page.dart b/lib/pages/splash/splash_page.dart index baa93075..aa42d7c9 100644 --- a/lib/pages/splash/splash_page.dart +++ b/lib/pages/splash/splash_page.dart @@ -1,5 +1,6 @@ import 'dart:io'; +import 'package:aku_app_upgrade/aku_app_upgrade.dart'; import 'package:flutter/material.dart'; import 'package:amap_flutter_location/amap_flutter_location.dart'; @@ -56,7 +57,7 @@ class _SplashPageState extends State { // await Permission.locationWhenInUse.request(); // } //第三方加载 - // await AppUpgrade().checkUpgrade(context); + await AppUpgrade().checkUpgrade(context); MainInitialize.initJPush(); EquatableConfig.stringify = true; AMapFlutterLocation.updatePrivacyShow(true, true); diff --git a/lib/utils/websocket/fire_dialog.dart b/lib/utils/websocket/fire_dialog.dart index fd57b734..e6aef0e9 100644 --- a/lib/utils/websocket/fire_dialog.dart +++ b/lib/utils/websocket/fire_dialog.dart @@ -25,6 +25,8 @@ class FireDialog { if (alarmModel.type == 6) { await await Get.dialog( BeeCustomDialog( + width: 560.w, + height: 300.w, actions: [ MaterialButton( onPressed: () { diff --git a/lib/widget/dialog/bee_custom_dialog.dart b/lib/widget/dialog/bee_custom_dialog.dart index f8583760..6a56caf2 100644 --- a/lib/widget/dialog/bee_custom_dialog.dart +++ b/lib/widget/dialog/bee_custom_dialog.dart @@ -5,17 +5,18 @@ import 'package:flutter/material.dart'; class BeeCustomDialog extends StatelessWidget { final List actions; final Widget content; - + final double? width; + final double? height; const BeeCustomDialog( - {Key? key, required this.actions, required this.content}) + {Key? key, required this.actions, required this.content, this.width, this.height}) : super(key: key); @override Widget build(BuildContext context) { return Center( child: Container( - width: 600.w, - height: 700.w, + width: width?? 600.w, + height:height?? 700.w, clipBehavior: Clip.antiAliasWithSaveLayer, decoration: BoxDecoration( color: Colors.white, diff --git a/pubspec.lock b/pubspec.lock index 1e07b761..1c9433e7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -15,6 +15,15 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.1" + aku_app_upgrade: + dependency: "direct main" + description: + path: "." + ref: HEAD + resolved-ref: "9676d13777c2db074e7f812554eeffaa98458907" + url: "https://git.oa00.com/mengfucius/aku_app_upgrade.git" + source: git + version: "0.0.1" amap_flutter_base: dependency: "direct main" description: @@ -1084,6 +1093,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "4.0.0" + r_upgrade: + dependency: transitive + description: + name: r_upgrade + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.8+2" random_character: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 83fbd24f..43731e5c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: aku_new_community description: A new Flutter project. publish_to: "none" -version: 1.8.12-dev+53 +version: 1.8.14-dev+55 environment: sdk: ">=2.17.0 <3.0.0" @@ -128,8 +128,8 @@ dependencies: #图片扩展 extended_image: ^6.1.0 #app更新 -# aku_app_upgrade: -# path: ../aku_app_upgrade + aku_app_upgrade: + git: https://git.oa00.com/mengfucius/aku_app_upgrade.git dev_dependencies: flutter_test: