xt / Flutter-ReserveApp · Commits

Go to a project

Commit 5316c2b8a67d0185066d1858c142d97333c5a2bf

Authored by “gaiyaguang”
1 parent cd5aaf1a
build: skipped

优化

Inline Side-by-side
Showing 2 changed files with 39 additions and 42 deletions
@@ -51,6 +51,7 @@ class _BookTimeSetPageState extends State<BookTimeSetPage> { @@ -51,6 +51,7 @@ class _BookTimeSetPageState extends State<BookTimeSetPage> {
51 }); 51 });
52 } 52 }
53 53
  54 + /// 从接口获取可订时段信息 daily
54 _getDailyTime() async { 55 _getDailyTime() async {
55 SunSellerInfoModel model = await bookSetTimeModel.getManagersInfo(context); 56 SunSellerInfoModel model = await bookSetTimeModel.getManagersInfo(context);
56 setState(() { 57 setState(() {
@@ -189,7 +190,7 @@ class _BookTimeSetPageState extends State<BookTimeSetPage> { @@ -189,7 +190,7 @@ class _BookTimeSetPageState extends State<BookTimeSetPage> {
189 }); 190 });
190 } 191 }
191 192
192 - ///item 193 + ///item 早市，晚市，午时widhet
193 Widget _itemWidget(String title, String startTime, String endTime, int tag) { 194 Widget _itemWidget(String title, String startTime, String endTime, int tag) {
194 return Container( 195 return Container(
195 color: MyColours.color_ffffff, 196 color: MyColours.color_ffffff,
@@ -249,21 +250,11 @@ class _BookTimeSetPageState extends State<BookTimeSetPage> { @@ -249,21 +250,11 @@ class _BookTimeSetPageState extends State<BookTimeSetPage> {
249 SetTimeWidget().showTimeSelector(context, data, startTime, 250 SetTimeWidget().showTimeSelector(context, data, startTime,
250 (value) { 251 (value) {
251 if (value != null) { 252 if (value != null) {
252 - String temp;  
253 - if (data.length == 1) {  
254 - temp = '30';  
255 - } else {  
256 - if (value[1] == 0) {  
257 - temp = '00';  
258 - } else {  
259 - temp = '30';  
260 - }  
261 - }  
262 - 253 + String tempMinute = _getMinuteStrFromPicker(data, value);
263 print(data[value[0]].keys.first); 254 print(data[value[0]].keys.first);
264 String time = Utils.getTimeString( 255 String time = Utils.getTimeString(
265 Utils.getHourFromTitle(data[value[0]].keys.first), 256 Utils.getHourFromTitle(data[value[0]].keys.first),
266 - temp); 257 + tempMinute);
267 setState(() { 258 setState(() {
268 if (tag == 0) { 259 if (tag == 0) {
269 //早市 260 //早市
@@ -362,19 +353,10 @@ class _BookTimeSetPageState extends State<BookTimeSetPage> { @@ -362,19 +353,10 @@ class _BookTimeSetPageState extends State<BookTimeSetPage> {
362 SetTimeWidget().showTimeSelector(context, data, startTime, 353 SetTimeWidget().showTimeSelector(context, data, startTime,
363 (value) { 354 (value) {
364 if (value != null) { 355 if (value != null) {
365 - String temp;  
366 - if (data.length == 1) {  
367 - temp = '30';  
368 - } else {  
369 - if (value[1] == 0) {  
370 - temp = '00';  
371 - } else {  
372 - temp = '30';  
373 - }  
374 - } 356 + String tempMinute = _getMinuteStrFromPicker(data, value);
375 String time = Utils.getTimeString( 357 String time = Utils.getTimeString(
376 Utils.getHourFromTitle(data[value[0]].keys.first), 358 Utils.getHourFromTitle(data[value[0]].keys.first),
377 - temp); 359 + tempMinute);
378 setState(() { 360 setState(() {
379 if (tag == 0) { 361 if (tag == 0) {
380 //早市 362 //早市
@@ -432,6 +414,19 @@ class _BookTimeSetPageState extends State<BookTimeSetPage> { @@ -432,6 +414,19 @@ class _BookTimeSetPageState extends State<BookTimeSetPage> {
432 )); 414 ));
433 } 415 }
434 416
  417 + ///从时间选择器中获取分钟数字符串 00 or 30
  418 + String _getMinuteStrFromPicker(List data, List value) {
  419 + if (data.length == 1) {
  420 + return '30';
  421 + } else {
  422 + if (value[1] == 0) {
  423 + return '00';
  424 + } else {
  425 + return '30';
  426 + }
  427 + }
  428 + }
  429 +
435 ///底部widget 430 ///底部widget
436 /// 431 ///
437 _bottomWidget() { 432 _bottomWidget() {
@@ -539,7 +534,7 @@ class _BookTimeSetPageState extends State<BookTimeSetPage> { @@ -539,7 +534,7 @@ class _BookTimeSetPageState extends State<BookTimeSetPage> {
539 )), 534 )),
540 ), 535 ),
541 onWillPop: () async { 536 onWillPop: () async {
542 - EventBus().emit('changeStatusColor'); 537 + EventBus().emit('changeStatusColor');
543 return true; 538 return true;
544 }); 539 });
545 } 540 }
@@ -46,6 +46,15 @@ class _ReceiveOrdersTimeSetPageState extends State<ReceiveOrdersTimeSetPage> { @@ -46,6 +46,15 @@ class _ReceiveOrdersTimeSetPageState extends State<ReceiveOrdersTimeSetPage> {
46 }); 46 });
47 } 47 }
48 48
  49 + ///从时间选择器中获取分钟数字符串 00 or 30
  50 + String _getMinuteStrFromPicker(List value) {
  51 + if (value[1] == 0) {
  52 + return '00';
  53 + } else {
  54 + return '30';
  55 + }
  56 + }
  57 +
49 @override 58 @override
50 Widget build(BuildContext context) { 59 Widget build(BuildContext context) {
51 bookSetTimeModel = Provider.of<BookSetTimeModel>(context, listen: true); 60 bookSetTimeModel = Provider.of<BookSetTimeModel>(context, listen: true);
@@ -79,16 +88,13 @@ class _ReceiveOrdersTimeSetPageState extends State<ReceiveOrdersTimeSetPage> { @@ -79,16 +88,13 @@ class _ReceiveOrdersTimeSetPageState extends State<ReceiveOrdersTimeSetPage> {
79 SetTimeWidget.dateData, 88 SetTimeWidget.dateData,
80 receiveOrdersTime.start, (value) { 89 receiveOrdersTime.start, (value) {
81 if (value != null) { 90 if (value != null) {
82 - String temp;  
83 - if (value[1] == 0) {  
84 - temp = '00';  
85 - } else {  
86 - temp = '30';  
87 - } 91 + String tempMinute =
  92 + _getMinuteStrFromPicker(value);
  93 +
88 String time = Utils.getTimeString( 94 String time = Utils.getTimeString(
89 Utils.getHourFromTitle(SetTimeWidget 95 Utils.getHourFromTitle(SetTimeWidget
90 .dateData[value[0]].keys.first), 96 .dateData[value[0]].keys.first),
91 - temp); 97 + tempMinute);
92 setState(() { 98 setState(() {
93 receiveOrdersTime.start = time; 99 receiveOrdersTime.start = time;
94 }); 100 });
@@ -110,16 +116,12 @@ class _ReceiveOrdersTimeSetPageState extends State<ReceiveOrdersTimeSetPage> { @@ -110,16 +116,12 @@ class _ReceiveOrdersTimeSetPageState extends State<ReceiveOrdersTimeSetPage> {
110 SetTimeWidget.dateData, 116 SetTimeWidget.dateData,
111 receiveOrdersTime.end, (value) { 117 receiveOrdersTime.end, (value) {
112 if (value != null) { 118 if (value != null) {
113 - String temp;  
114 - if (value[1] == 0) {  
115 - temp = '00';  
116 - } else {  
117 - temp = '30';  
118 - } 119 + String tempMinute =
  120 + _getMinuteStrFromPicker(value);
119 String time = Utils.getTimeString( 121 String time = Utils.getTimeString(
120 Utils.getHourFromTitle(SetTimeWidget 122 Utils.getHourFromTitle(SetTimeWidget
121 .dateData[value[0]].keys.first), 123 .dateData[value[0]].keys.first),
122 - temp); 124 + tempMinute);
123 setState(() { 125 setState(() {
124 receiveOrdersTime.end = time; 126 receiveOrdersTime.end = time;
125 }); 127 });
@@ -163,9 +165,9 @@ class _ReceiveOrdersTimeSetPageState extends State<ReceiveOrdersTimeSetPage> { @@ -163,9 +165,9 @@ class _ReceiveOrdersTimeSetPageState extends State<ReceiveOrdersTimeSetPage> {
163 if (isSuccess) { 165 if (isSuccess) {
164 ///弹出提示框 166 ///弹出提示框
165 /// 167 ///
166 - DialogUtil.openAlertDialog(context, '接单时间已修改',  
167 - '需要重启电话机才能生效', '知道了', 295, fontSize: 30,  
168 - onTap: () { 168 + DialogUtil.openAlertDialog(
  169 + context, '接单时间已修改', '需要重启电话机才能生效', '知道了', 295,
  170 + fontSize: 30, onTap: () {
169 EventBus().emit('changeStatusColor'); 171 EventBus().emit('changeStatusColor');
170 Navigator.of(context).pop(); 172 Navigator.of(context).pop();
171 Navigator.of(context).pop(); 173 Navigator.of(context).pop();