xt / Flutter-ReserveApp · Commits

Go to a project

Commit 93533c269708f13daa5c1137dc04be0f035e5039

Authored by wdn127929
1 parent ee5628a0
build: skipped

通知

Inline Side-by-side
Showing 10 changed files with 118 additions and 57 deletions
... ... @@ -12,14 +12,14 @@ if (flutterRoot == null) {
}
def flutterVersionCode = "394"
def flutterVersionCode = "397"
if (flutterVersionCode == null) {
flutterVersionCode = '394'
flutterVersionCode = '397'
}
def flutterVersionName = "3.9.4"
def flutterVersionName = "3.9.7"
if (flutterVersionName == null) {
flutterVersionName = '3.9.4'
flutterVersionName = '3.9.7'
}
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
... ...
... ... @@ -107,6 +107,9 @@ class NewUnmessage extends Object {
@JsonKey(name: 'nick_name')
String nickName;
@JsonKey(name: 'table_class_name')
String tableClassName;
NewUnmessage(
this.id,
this.uid,
... ... @@ -127,7 +130,8 @@ class NewUnmessage extends Object {
this.status,
this.room_info,
this.uname,
this.nickName);
this.nickName,
this.tableClassName);
String get rnameStr {
if (rname == null || rname == '') return "";
... ...
... ... @@ -62,6 +62,7 @@ NewUnmessage _$NewUnmessageFromJson(Map<String, dynamic> json) {
json['room_info'] as dynamic,
json['uname'] as String,
json['nick_name'] as String,
json['table_class_name'] as String,
);
}
... ... @@ -86,5 +87,6 @@ Map<String, dynamic> _$NewUnmessageToJson(NewUnmessage instance) =>
'status': instance.status,
'room_info': instance.room_info,
'uname': instance.uname,
'nick_name':instance.nickName
'nick_name': instance.nickName,
'table_class_name':instance.tableClassName
};
... ...
... ... @@ -319,11 +319,12 @@ class _MapChoicePointPageState extends State<MapChoicePointPage> {
// print(await reGeocodeList.toFutureString());
address = reGeocodeList.formatAddress;
await AmapLocation.instance.updatePrivacyShow(true);
await AmapLocation.instance.updatePrivacyAgree(true);
final poiList = await AmapSearch.instance.searchKeyword(
address.toString(),
city: "西安",
final poiList = await AmapSearch.instance.searchAround(
latLng,
city: "",
);
poiModel = new PoiModel("当前位置", address, latLng);
... ... @@ -335,10 +336,14 @@ class _MapChoicePointPageState extends State<MapChoicePointPage> {
String provinceName = await poi.provinceName;
String address = await poi.address;
LatLng latLng = await poi.latLng;
String bussniss = poi.businessArea;
list.add(new PoiModel(
title.toString(),
provinceName.toString() + cityName.toString() + address.toString(),
provinceName.toString() +
cityName.toString() +
address.toString() +
bussniss.toString(),
latLng));
}
... ... @@ -352,7 +357,7 @@ class _MapChoicePointPageState extends State<MapChoicePointPage> {
await AmapLocation.instance.updatePrivacyAgree(true);
final poiList = await AmapSearch.instance.searchKeyword(
text,
city: "西安",
city: "",
);
list.clear();
... ...
... ... @@ -62,7 +62,7 @@ class MessageDialogItemF extends StatelessWidget {
titleText = "发票\n申请";
subTitleTextFir = '桌位信息';
subTitleTextSec = '申请时间';
} else if (message.message_type == "店内消息") {
} else if (message.message_type == "15") {
titleText = "店内\n消息";
bgcolor = MyColours.color_5F7292;
btnname = 'store_info_go';
... ... @@ -435,7 +435,9 @@ class MessageDialogItemF extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"请确认 ${DateUtil.formatDate(DateTime.parse(message.ddate.replaceAll('/', '-')), format: DateFormats.y_mo_d)} ${message.dsoltStr} \n客人是否会如约到店！",
"请确认 ${DateUtil.formatDate(DateTime.parse(message.ddate.replaceAll('/', '-')), format: DateFormats.y_mo_d)} ${message.dsoltStr} \n${message.tableClassName ?? ''}${message.tableClassName == null ? '' : ' '}客人是否如约到店",
maxLines: 3,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: isTreated
? MyColours.color_BFC4D4
... ...
... ... @@ -472,11 +472,14 @@ class MessageItemF extends StatelessWidget {
))
: SizedBox(),
message.message_type == "15"
? Column(
? Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"请确认 ${DateUtil.formatDate(DateTime.parse(message.ddate.replaceAll('/', '-')), format: DateFormats.y_mo_d)} ${message.dsoltStr} \n客人是否会如约到店！",
"请确认 ${DateUtil.formatDate(DateTime.parse(message.ddate.replaceAll('/', '-')), format: DateFormats.y_mo_d)} ${message.dsoltStr} \n${message.tableClassName ?? ''}${message.tableClassName == null ? '' : ' '}客人是否如约到店",
maxLines: 3,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: isTreated
? MyColours.color_BFC4D4
... ... @@ -493,8 +496,9 @@ class MessageItemF extends StatelessWidget {
fontSize: ScreenUtil().setSp(24)),
),
],
)
: SizedBox()
))
: SizedBox(),
HEmptyView(32)
],
),
),
... ...
... ... @@ -42,7 +42,7 @@ class _RoomTypeCreatePageState extends State<RoomTypeCreatePage> {
bool swichState = true;
StoreDetailModel detailModel;
int selectIndex = 0;
String selectNum = '0';
String selectNum = '不通知';
String tableListStr = '';
@override
... ... @@ -71,8 +71,10 @@ class _RoomTypeCreatePageState extends State<RoomTypeCreatePage> {
sunModel.status == '1' ? swichState = true : swichState = false;
tableListSel = sunModel.tableid != null ? sunModel.tableid : '';
selectNum = sunModel.surplus ?? '0';
List<String> numList = [];
selectNum = sunModel.surplus == null || sunModel.surplus == ''
? '不通知'
: sunModel.surplus;
List<String> numList = ['不通知'];
tableListStr = tableListSel;
for (int i = 0; i < tableListSel.split(',').length; i++) {
numList.add('$i');
... ... @@ -108,7 +110,11 @@ class _RoomTypeCreatePageState extends State<RoomTypeCreatePage> {
if ((userModel.user.role_name == '管理员' ||
userModel.user.role_name == '店长') &&
tableListSel.split(',').length > 0) {
params['surplus'] = selectNum;
if (selectNum == '不通知') {
params['surplus'] = null;
} else {
params['surplus'] = selectNum;
}
}
bool success =
... ... @@ -460,10 +466,13 @@ class _RoomTypeCreatePageState extends State<RoomTypeCreatePage> {
vertical: ScreenUtil().setWidth(40),
),
child: _select(
'核实通知', '当剩余 $selectNum 间时',
'核实通知',
selectNum == '不通知'
? '不通知'
: '当剩余 $selectNum 间时',
textColor: MyColours.color_000000,
ontap: () async {
List<String> numList = [];
List<String> numList = ['不通知'];
for (int i = 0;
i <
tableListSel
... ...
... ... @@ -91,9 +91,13 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
String _getMinuteStrFromPicker(List value) {
if (value[1] == 0) {
return '00';
} else {
} else if (value[1] == 1) {
return '15';
}
if (value[1] == 2) {
return '30';
}
return '45';
}
@override
... ... @@ -792,15 +796,19 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
///从时间选择器中获取分钟数字符串 00 or 30
String _getMinuteStrFromPickerBookTime(List data, List value) {
if (data.length == 1) {
// if (data.length == 1) {
// return '30';
// } else {
if (value[1] == 0) {
return '00';
} else if (value[1] == 1) {
return '15';
} else if (value[1] == 2) {
return '30';
} else {
if (value[1] == 0) {
return '00';
} else {
return '30';
}
return '45';
}
// }
}
Widget _itemBookTime(String start, String end, int tag) {
... ... @@ -976,13 +984,21 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
if (tag == 0) {
//早市
morning.end = time;
setState(() {
Utils.compareDateTime(time, morning.start,
(needChange) {
if (needChange) {
morning.start = time;
}
});
Utils.compareDateTime(noon.start, time,
(needChange) {
if (needChange) {
noon.start = time;
}
});
Utils.compareDateTime(noon.end, time, (needChange) {
if (needChange) {
noon.end = time;
... ... @@ -994,6 +1010,7 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
night.start = time;
}
});
Utils.compareDateTime(night.end, time,
(needChange) {
if (needChange) {
... ... @@ -1005,6 +1022,12 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
//午市
noon.end = time;
setState(() {
Utils.compareDateTime(noon.end, noon.start,
(needChange) {
if (needChange) {
noon.start = noon.end;
}
});
Utils.compareDateTime(night.start, time,
(needChange) {
if (needChange) {
... ... @@ -1021,6 +1044,14 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
} else if (tag == 2) {
//晚市
night.end = time;
setState(() {
Utils.compareDateTime(night.end, night.start,
(needChange) {
if (needChange) {
night.start = night.end;
}
});
});
}
});
print(value);
... ...
... ... @@ -1382,7 +1382,7 @@ class Utils {
static getPickerData(String lastTime, List dateData) {
String hour = Utils.getHourFromhourAndMinute(lastTime);
String minute = Utils.getMinuteFromhourAndMinute(lastTime);
if (minute == '30') {
if (minute == '45') {
hour = '${int.parse(hour) + 1}';
}
List tempList = List();
... ... @@ -1391,7 +1391,7 @@ class Utils {
if (tempList.length == 0) {
tempList = [
{
'晚上23时': [30]
'晚上23时': [45]
}
];
}
... ...
... ... @@ -7,76 +7,76 @@ typedef SetTimeCallback = void Function(List value);
class SetTimeWidget {
static List dateData = [
{
'深夜00时': [00, 30]
'深夜00时': [00, 15, 30, 45]
},
{
'深夜01时': [00, 30]
'深夜01时': [00, 15, 30, 45]
},
{
'深夜02时': [00, 30]
'深夜02时': [00, 15, 30, 45]
},
{
'深夜03时': [00, 30]
'深夜03时': [00, 15, 30, 45]
},
{
'深夜04时': [00, 30]
'深夜04时': [00, 15, 30, 45]
},
{
'深夜05时': [00, 30]
'深夜05时': [00, 15, 30, 45]
},
{
'早上06时': [00, 30]
'早上06时': [00, 15, 30, 45]
},
{
'早上07时': [00, 30]
'早上07时': [00, 15, 30, 45]
},
{
'早上08时': [00, 30]
'早上08时': [00, 15, 30, 45]
},
{
'早上09时': [00, 30]
'早上09时': [00, 15, 30, 45]
},
{
'中午10时': [00, 30]
'中午10时': [00, 15, 30, 45]
},
{
'中午11时': [00, 30]
'中午11时': [00, 15, 30, 45]
},
{
'中午12时': [00, 30]
'中午12时': [00, 15, 30, 45]
},
{
'中午13时': [00, 30]
'中午13时': [00, 15, 30, 45]
},
{
'中午14时': [00, 30]
'中午14时': [00, 15, 30, 45]
},
{
'下午15时': [00, 30]
'下午15时': [00, 15, 30, 45]
},
{
'下午16时': [00, 30]
'下午16时': [00, 15, 30, 45]
},
{
'下午17时': [00, 30]
'下午17时': [00, 15, 30, 45]
},
{
'下午18时': [00, 30]
'下午18时': [00, 15, 30, 45]
},
{
'晚上19时': [00, 30]
'晚上19时': [00, 15, 30, 45]
},
{
'晚上20时': [00, 30]
'晚上20时': [00, 15, 30, 45]
},
{
'晚上21时': [00, 30]
'晚上21时': [00, 15, 30, 45]
},
{
'晚上22时': [00, 30]
'晚上22时': [00, 15, 30, 45]
},
{
'晚上23时': [00, 30]
'晚上23时': [00, 15, 30, 45]
}
];
showTimeSelector(
... ... @@ -109,7 +109,11 @@ class SetTimeWidget {
String minute = Utils.getMinuteFromhourAndMinute(hourAndMinute);
if (minute == '00') {
return 0;
} else if (minute == '15') {
return 1;
} else if (minute == '30') {
return 2;
}
return 1;
return 3;
}
}
... ...