xt / Flutter-ReserveApp · Commits

Go to a project

Commit 53ccade117c09852191e3b63099dd93b467ab21d

Authored by gaiyaguang
1 parent 1b973773

bug修复

Inline Side-by-side
Showing 10 changed files with 65 additions and 48 deletions
... ... @@ -80,8 +80,10 @@ android {
buildTypes {
release {
minifyEnabled false
proguardFiles 'proguard-rules.pro'
minifyEnabled true
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.release
}
debug{
... ...
-keep public class * extends android.app.Service
-keep public class * extends android.content.BroadcastReceiver
-keep class com.tencent.android.tpush.** {*;}
-keep class com.tencent.tpns.baseapi.** {*;}
-keep class com.tencent.tpns.mqttchannel.** {*;}
-keep class com.tencent.tpns.dataacquisition.** {*;}
-keep class com.tencent.bigdata.baseapi.** {*;}
-keep class com.tencent.bigdata.mqttchannel.** {*;}
#-ignorewarning
-keepattributes *Annotation*
-keepattributes Exceptions
... ...
import 'package:fluro/fluro.dart';
import 'package:flutter/material.dart';
import 'package:flutter/material.dart' hide Router;
import 'package:get_it/get_it.dart';
import 'package:shared_preferences/shared_preferences.dart';
... ...
import 'dart:io';
import 'package:common_utils/common_utils.dart';
import 'package:dio/dio.dart';
import 'package:fluro/fluro.dart';
import 'package:flutter/material.dart';
import 'package:flutter/material.dart' hide Router;
import 'package:flutter_bugly/flutter_bugly.dart';
import 'package:flutter_easyrefresh/ball_pulse_footer.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart';
... ...
... ... @@ -72,9 +72,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
// TODO: implement initState
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) async {
_initCancel();
_getReserveDetail();
managers = await detailModel.getManagers(context);
_initCancel();
//添加listener监听
//对应的TextField失去或者获取焦点都会回调此监听
_cancelNode.addListener(() {
... ...
import 'package:fluro/fluro.dart';
import 'package:flutter/material.dart';
import 'package:flutter/material.dart' hide Router;
import 'package:one_key/pages/login/login_page.dart';
import 'route_handles.dart';
... ...
... ... @@ -199,7 +199,7 @@ class DialogUtil {
TableCalendar(
calendarController: _calendarController,
initialSelectedDay: selectDateTime,
onDaySelected: (day, _) {
onDaySelected: (day, events,holidays) {
Navigator.of(dialogContext).pop(day);
},
availableGestures: AvailableGestures.none,
... ...
... ... @@ -94,6 +94,9 @@ class NavigatorUtil {
static void goNoteBookChangePage(
BuildContext context, NotebookDetail detailEntity, String rid,
{replace = false}) {
if(detailEntity.type=="0"){//内部预订
detailEntity.is_set_ddate="1";
}
_navigateTo(context,
"${Routes.change_detail}?detail=${FluroConvertUtils.object2string(detailEntity)}&rid=$rid",
replace: replace);
... ...
import 'package:common_utils/common_utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter/material.dart' hide Router;
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:one_key/res/colors.dart';
... ...
... ... @@ -21,7 +21,7 @@ packages:
name: async
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.4.2"
version: "2.5.0-nullsafety.1"
audioplayers:
dependency: "direct main"
description:
... ... @@ -35,7 +35,7 @@ packages:
name: boolean_selector
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0"
version: "2.1.0-nullsafety.1"
build:
dependency: transitive
description:
... ... @@ -98,21 +98,21 @@ packages:
name: cached_network_image
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.3.2+1"
version: "2.3.3"
characters:
dependency: transitive
description:
name: characters
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.0"
version: "1.1.0-nullsafety.3"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.3"
version: "1.2.0-nullsafety.1"
checked_yaml:
dependency: transitive
description:
... ... @@ -126,21 +126,21 @@ packages:
name: clock
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.1"
version: "1.1.0-nullsafety.1"
code_builder:
dependency: transitive
description:
name: code_builder
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.4.1"
version: "3.5.0"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.14.13"
version: "1.15.0-nullsafety.3"
common_utils:
dependency: "direct main"
description:
... ... @@ -154,7 +154,7 @@ packages:
name: connectivity
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.4.9+3"
version: "0.4.9+5"
connectivity_for_web:
dependency: transitive
description:
... ... @@ -238,7 +238,7 @@ packages:
name: device_info
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.4.2+8"
version: "0.4.2+9"
device_info_platform_interface:
dependency: transitive
description:
... ... @@ -259,7 +259,7 @@ packages:
name: fake_async
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.0"
version: "1.2.0-nullsafety.1"
ffi:
dependency: transitive
description:
... ... @@ -306,21 +306,21 @@ packages:
name: flutter_bugly
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.2.8"
version: "0.2.9"
flutter_cache_manager:
dependency: transitive
description:
name: flutter_cache_manager
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.4.2"
version: "2.0.0"
flutter_easyrefresh:
dependency: "direct main"
description:
name: flutter_easyrefresh
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.5"
version: "2.1.6"
flutter_picker:
dependency: "direct main"
description:
... ... @@ -400,7 +400,7 @@ packages:
name: html
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.14.0+3"
version: "0.14.0+4"
http:
dependency: transitive
description:
... ... @@ -491,14 +491,14 @@ packages:
name: matcher
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.12.8"
version: "0.12.10-nullsafety.1"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.8"
version: "1.3.0-nullsafety.3"
mime:
dependency: transitive
description:
... ... @@ -561,14 +561,14 @@ packages:
name: path
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.7.0"
version: "1.8.0-nullsafety.1"
path_provider:
dependency: "direct main"
description:
name: path_provider
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.6.18"
version: "1.6.22"
path_provider_linux:
dependency: transitive
description:
... ... @@ -603,7 +603,7 @@ packages:
name: pedantic
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.9.0"
version: "1.9.2"
permission_handler:
dependency: "direct main"
description:
... ... @@ -631,7 +631,7 @@ packages:
name: plugin_platform_interface
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.2"
version: "1.0.3"
pool:
dependency: transitive
description:
... ... @@ -673,7 +673,7 @@ packages:
name: quiver
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.3"
version: "2.1.4+1"
rational:
dependency: transitive
description:
... ... @@ -694,7 +694,7 @@ packages:
name: shared_preferences
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.5.12"
version: "0.5.12+2"
shared_preferences_linux:
dependency: transitive
description:
... ... @@ -769,14 +769,14 @@ packages:
name: source_span
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.7.0"
version: "1.8.0-nullsafety.2"
sqflite:
dependency: "direct main"
description:
name: sqflite
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.3.1+1"
version: "1.3.2+1"
sqflite_common:
dependency: transitive
description:
... ... @@ -790,14 +790,14 @@ packages:
name: stack_trace
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.9.5"
version: "1.10.0-nullsafety.1"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0"
version: "2.1.0-nullsafety.1"
stream_transform:
dependency: transitive
description:
... ... @@ -811,7 +811,7 @@ packages:
name: string_scanner
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.5"
version: "1.1.0-nullsafety.1"
synchronized:
dependency: transitive
description:
... ... @@ -825,21 +825,21 @@ packages:
name: table_calendar
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.2.3"
version: "2.3.0"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.0"
version: "1.2.0-nullsafety.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.2.17"
version: "0.2.19-nullsafety.2"
timing:
dependency: transitive
description:
... ... @@ -862,21 +862,21 @@ packages:
name: typed_data
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.2.0"
version: "1.3.0-nullsafety.3"
url_launcher:
dependency: "direct main"
description:
name: url_launcher
url: "https://pub.flutter-io.cn"
source: hosted
version: "5.7.2"
version: "5.7.8"
url_launcher_linux:
dependency: transitive
description:
name: url_launcher_linux
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.0.1+1"
version: "0.0.1+3"
url_launcher_macos:
dependency: transitive
description:
... ... @@ -890,14 +890,14 @@ packages:
name: url_launcher_platform_interface
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.8"
version: "1.0.9"
url_launcher_web:
dependency: transitive
description:
name: url_launcher_web
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.1.4+1"
version: "0.1.5"
url_launcher_windows:
dependency: transitive
description:
... ... @@ -918,7 +918,7 @@ packages:
name: vector_math
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.8"
version: "2.1.0-nullsafety.3"
watcher:
dependency: transitive
description:
... ... @@ -953,7 +953,7 @@ packages:
name: xdg_directories
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.1.0"
version: "0.1.2"
yaml:
dependency: transitive
description:
... ... @@ -962,5 +962,5 @@ packages:
source: hosted
version: "2.2.1"
sdks:
dart: ">=2.9.0 <3.0.0"
flutter: ">=1.20.0 <2.0.0"
dart: ">=2.10.2 <2.11.0"
flutter: ">=1.22.2 <2.0.0"
... ...