xt / Flutter-ReserveApp · Commits

Go to a project

Commit f6ebd178d313c25f6eca3a23c366279fce4cc1da

Authored by wdn127929
1 parent c0a1d201
build: skipped

变更桌位页面、桌位已被删除提醒

Inline Side-by-side
Showing 3 changed files with 38 additions and 12 deletions
... ... @@ -548,7 +548,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 52690;
CURRENT_PROJECT_VERSION = 52691;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -696,7 +696,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 52690;
CURRENT_PROJECT_VERSION = 52691;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -732,7 +732,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 52690;
CURRENT_PROJECT_VERSION = 52691;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ...
... ... @@ -37,6 +37,8 @@ import 'package:provider/provider.dart';
import 'package:one_key/models/table_list.dart' as t;
import 'dart:convert' as convert;
import 'package:easy_contact_picker/easy_contact_picker.dart';
import '../../app.dart';
import '../../models/tableOuter.dart';
import '../../models/user_history_entity.dart';
import '../../provider/marketing_center_provider.dart';
import '../../utils/call_log_utils.dart';
... ... @@ -45,6 +47,7 @@ import '../../utils/screen_util.dart';
import '../../widgets/special_text/my_extended_text_selection_controls.dart';
import 'package:flutter_picker/flutter_picker.dart' as Picker;
typedef clickCallback = void Function(String value);
class NoteBookChangeFPage extends StatefulWidget {
... ... @@ -537,6 +540,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
}
}
_addNameSuffix(String name, String suffix) {
if (name == _notebookDetailChangeModel.nameController.text &&
_notebookDetailChangeModel.nameController.text.endsWith(suffix)) {
... ...
import 'dart:convert';
import 'package:common_utils/common_utils.dart';
import 'package:flutter/material.dart';
import 'package:one_key/app.dart';
... ... @@ -15,6 +17,9 @@ import 'package:one_key/provider/notebook_detail_model.dart';
import 'package:one_key/provider/user_model.dart';
import 'package:one_key/utils/utils.dart';
import 'package:provider/provider.dart';
import 'package:one_key/models/table.dart' as t;
import '../models/tableOuter.dart';
class NotebookDetailChangeModel with ChangeNotifier {
List dateList = []; //日期选择 月-日 某天
... ... @@ -401,6 +406,20 @@ class NotebookDetailChangeModel with ChangeNotifier {
LogUtil.v(dailyMap);
}
List<t.Table> getSpTableList() {
List<t.Table> tables = [];
String tableList = App.sp.getString('table_list');
if (tableList != null) {
List list = json.decode(tableList);
if (list.length > 0) {
list.forEach((element) {
tables.addAll(TableOuter.fromJson2(element).list);
});
}
}
return tables;
}
/// 根据时间和分钟组装 格式：11:00
_dealTime(int begin, int mm) {
String sb = '';
... ... @@ -493,18 +512,21 @@ class NotebookDetailChangeModel with ChangeNotifier {
List<String> tableIds = []; //所有桌位的id
List<String> tableIdsOld = []; //带过来所有桌位的id
for (var table in oldTableList) {
tableIdsOld.add(table.id);
}
List<t.Table> tableS = getSpTableList(); //缓存的所有桌子
for (t.Table elementT in tableS) {
tableIds.add(elementT.id);
}
for (var table in oldTableList) {
tableIdsOld.add(table.id);
}
for (TableListSunModel item in itemModelList) {
if (item.name == "推荐") {
itemModelList.remove(item);
}
for (var item in item.list) {
tableIds.add(item.id);
for (var table in oldTableList) {
if (item.id == table.id) {
item.selected = true;
if (!tableList.contains(item)) {
... ... @@ -573,7 +595,6 @@ class NotebookDetailChangeModel with ChangeNotifier {
msg += '${item.name},';
}
if (delTablesid.contains(item.id)) {
msgDel += '${item.name},';
}
}
... ... @@ -586,10 +607,10 @@ class NotebookDetailChangeModel with ChangeNotifier {
if (msg != '' && msgDel == '') {
Utils.showToast('${msg}已被占用啦');
}else if(msg == '' && msgDel != '') {
} else if (msg == '' && msgDel != '') {
Utils.showToast('${msgDel}已被删除啦');
}else if(msg != '' && msgDel != '') {
Utils.showToast('${msg}已被占用啦\n'+'${msgDel}已被删除啦');
} else if (msg != '' && msgDel != '') {
Utils.showToast('${msg}已被占用啦\n' + '${msgDel}已被删除啦');
}
}
... ...