xt / Flutter-ReserveApp · Commits

Go to a project

Commit f9c2381aee60ea9d57437f35d5866ed0dbaa7ded

Authored by wdn127929
1 parent ec2c692f
build: skipped

l

Inline Side-by-side
Showing 5 changed files with 51 additions and 34 deletions
@@ -548,7 +548,7 @@ @@ -548,7 +548,7 @@
548 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 548 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
549 CODE_SIGN_IDENTITY = "Apple Development"; 549 CODE_SIGN_IDENTITY = "Apple Development";
550 CODE_SIGN_STYLE = Automatic; 550 CODE_SIGN_STYLE = Automatic;
551 - CURRENT_PROJECT_VERSION = 52697; 551 + CURRENT_PROJECT_VERSION = 52698;
552 DEVELOPMENT_TEAM = 8J59HM8B82; 552 DEVELOPMENT_TEAM = 8J59HM8B82;
553 ENABLE_BITCODE = NO; 553 ENABLE_BITCODE = NO;
554 FLUTTER_BUILD_MODE = release; 554 FLUTTER_BUILD_MODE = release;
@@ -696,7 +696,7 @@ @@ -696,7 +696,7 @@
696 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 696 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
697 CODE_SIGN_IDENTITY = "Apple Development"; 697 CODE_SIGN_IDENTITY = "Apple Development";
698 CODE_SIGN_STYLE = Automatic; 698 CODE_SIGN_STYLE = Automatic;
699 - CURRENT_PROJECT_VERSION = 52697; 699 + CURRENT_PROJECT_VERSION = 52698;
700 DEVELOPMENT_TEAM = 8J59HM8B82; 700 DEVELOPMENT_TEAM = 8J59HM8B82;
701 ENABLE_BITCODE = NO; 701 ENABLE_BITCODE = NO;
702 FLUTTER_BUILD_MODE = release; 702 FLUTTER_BUILD_MODE = release;
@@ -732,7 +732,7 @@ @@ -732,7 +732,7 @@
732 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 732 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
733 CODE_SIGN_IDENTITY = "Apple Development"; 733 CODE_SIGN_IDENTITY = "Apple Development";
734 CODE_SIGN_STYLE = Automatic; 734 CODE_SIGN_STYLE = Automatic;
735 - CURRENT_PROJECT_VERSION = 52697; 735 + CURRENT_PROJECT_VERSION = 52698;
736 DEVELOPMENT_TEAM = 8J59HM8B82; 736 DEVELOPMENT_TEAM = 8J59HM8B82;
737 ENABLE_BITCODE = NO; 737 ENABLE_BITCODE = NO;
738 FLUTTER_BUILD_MODE = release; 738 FLUTTER_BUILD_MODE = release;
@@ -90,7 +90,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -90,7 +90,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
90 90
91 String cusmanText = ""; 91 String cusmanText = "";
92 92
93 - List<Manager> managers = []; //客户经理 93 + // List<Manager> managers = []; //客户经理
94 94
95 Manager manager = Manager(); 95 Manager manager = Manager();
96 List cancelReasonList = []; 96 List cancelReasonList = [];
@@ -171,7 +171,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -171,7 +171,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
171 }; 171 };
172 await remarkManagerModel.getRemarks(context, params, 172 await remarkManagerModel.getRemarks(context, params,
173 showPageLoading: true); 173 showPageLoading: true);
174 - managers = await detailModel.getManagers(context); 174 + // managers = await detailModel.getManagers(context);
175 //添加listener监听 175 //添加listener监听
176 //对应的TextField失去或者获取焦点都会回调此监听 176 //对应的TextField失去或者获取焦点都会回调此监听
177 _cancelNode.addListener(() { 177 _cancelNode.addListener(() {
@@ -608,17 +608,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -608,17 +608,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
608 } 608 }
609 609
610 //设置当前客户经理 610 //设置当前客户经理
611 - _setCurrManager() {  
612 - manager = managers.firstWhere((manager) => manager.userName == cusmanText,  
613 - orElse: () => Manager());  
614 - if (manager.id == null || manager.id.toString().isEmpty) return;  
615 - Map<String, String> params = {  
616 - "rid": detailEntity.id,  
617 - "cusman_id": manager.id.toString(),  
618 - "cusman": manager.userName  
619 - };  
620 - detailModel.setReserveCusmnan(context, params);  
621 - } 611 + // _setCurrManager() {
  612 + // manager = managers.firstWhere((manager) => manager.userName == cusmanText,
  613 + // orElse: () => Manager());
  614 + // if (manager.id == null || manager.id.toString().isEmpty) return;
  615 + // Map<String, String> params = {
  616 + // "rid": detailEntity.id,
  617 + // "cusman_id": manager.id.toString(),
  618 + // "cusman": manager.userName
  619 + // };
  620 + // detailModel.setReserveCusmnan(context, params);
  621 + // }
622 622
623 ///处理在线预订 623 ///处理在线预订
624 setReserveStatus(String status, 624 setReserveStatus(String status,
@@ -2331,7 +2331,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -2331,7 +2331,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
2331 _initCancel(); 2331 _initCancel();
2332 _getReserveDetail(); 2332 _getReserveDetail();
2333 _getOrderInfo(); 2333 _getOrderInfo();
2334 - managers = await detailModel.getManagers(context); 2334 + // managers = await detailModel.getManagers(context);
2335 }, 2335 },
2336 emptyMsg: "暂时没有预订信息哦", 2336 emptyMsg: "暂时没有预订信息哦",
2337 emptyImg: "empty_search", 2337 emptyImg: "empty_search",
@@ -284,9 +284,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -284,9 +284,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
284 if (widget.initialIndex == 0 || 284 if (widget.initialIndex == 0 ||
285 widget.initialIndex == 1 && needRefreshTemp == false) return; 285 widget.initialIndex == 1 && needRefreshTemp == false) return;
286 _initNotification(); 286 _initNotification();
287 - Future.delayed(Duration(minutes: 5), () { 287 + Future.delayed(Duration(minutes: 3), () {
288 //30000 288 //30000
289 - ContactModel.getInstance().uploadLocalContact(context); 289 + // ContactModel.getInstance().uploadLocalContact(context);
290 UserModel usermodel = Provider.of<UserModel>(context, listen: false); 290 UserModel usermodel = Provider.of<UserModel>(context, listen: false);
291 291
292 if (needUpdate && !usermodel.downLoading) { 292 if (needUpdate && !usermodel.downLoading) {
@@ -280,9 +280,9 @@ class HomePageSimState extends State<HomePageSim> with WidgetsBindingObserver { @@ -280,9 +280,9 @@ class HomePageSimState extends State<HomePageSim> with WidgetsBindingObserver {
280 if (widget.initialIndex == 0 || 280 if (widget.initialIndex == 0 ||
281 widget.initialIndex == 1 && needRefreshTemp == false) return; 281 widget.initialIndex == 1 && needRefreshTemp == false) return;
282 _initNotification(); 282 _initNotification();
283 - Future.delayed(Duration(minutes: 5), () { 283 + Future.delayed(Duration(minutes: 3), () {
284 //30000 284 //30000
285 - ContactModel.getInstance().uploadLocalContact(context); 285 + // ContactModel.getInstance().uploadLocalContact(context);
286 UserModel usermodel = Provider.of<UserModel>(context, listen: false); 286 UserModel usermodel = Provider.of<UserModel>(context, listen: false);
287 287
288 if (needUpdate && !usermodel.downLoading) { 288 if (needUpdate && !usermodel.downLoading) {
  1 +import 'dart:math';
  2 +
1 import 'package:flutter/cupertino.dart'; 3 import 'package:flutter/cupertino.dart';
2 import 'package:flutter/material.dart'; 4 import 'package:flutter/material.dart';
3 import 'package:one_key/res/colors.dart'; 5 import 'package:one_key/res/colors.dart';
@@ -7,6 +9,16 @@ class Loading { @@ -7,6 +9,16 @@ class Loading {
7 9
8 static void showLoading(BuildContext context) { 10 static void showLoading(BuildContext context) {
9 if (!isLoading) { 11 if (!isLoading) {
  12 + // final mediaQuery = MediaQuery.of(context);
  13 + // final size = mediaQuery.size;
  14 + // final double width = min(size.width, 400.0) * 0.763;
  15 + // final double height = 200;
  16 + // final constraint = BoxConstraints(
  17 + // minWidth: width,
  18 + // minHeight: height,
  19 + // maxWidth: size.width,
  20 + // maxHeight: double.infinity);
  21 +
10 isLoading = true; 22 isLoading = true;
11 showGeneralDialog( 23 showGeneralDialog(
12 context: context, 24 context: context,
@@ -17,19 +29,24 @@ class Loading { @@ -17,19 +29,24 @@ class Loading {
17 transitionDuration: const Duration(milliseconds: 150), 29 transitionDuration: const Duration(milliseconds: 150),
18 pageBuilder: (BuildContext context, Animation animation, 30 pageBuilder: (BuildContext context, Animation animation,
19 Animation secondaryAnimation) { 31 Animation secondaryAnimation) {
20 - return Align(  
21 - child: ClipRRect(  
22 - borderRadius: BorderRadius.circular(10),  
23 - child: Container(  
24 - width: 200,  
25 - height: 200,  
26 - color: Colors.transparent,  
27 - child: CupertinoActivityIndicator(  
28 - color: MyColours.color_000000,  
29 - radius: 30,  
30 - ),  
31 - )),  
32 - ); 32 + return
  33 + // Container(
  34 + // constraints: constraint,
  35 + // child:
  36 + Align(
  37 + child: ClipRRect(
  38 + borderRadius: BorderRadius.circular(10),
  39 + child: Container(
  40 + width: 200,
  41 + height: 200,
  42 + color: Colors.transparent,
  43 + child: CupertinoActivityIndicator(
  44 + color: MyColours.color_000000,
  45 + radius: 30,
  46 + ),
  47 + )),
  48 + // )
  49 + );
33 }).then((v) { 50 }).then((v) {
34 isLoading = false; 51 isLoading = false;
35 }); 52 });