xt / Flutter-ReserveApp · Commits

Go to a project

Commit 702104e24673dd331a57d41cae1fb89ad431f238

Authored by 蓋亞光
1 parent 14244104
build: skipped

跨年处理

Inline Side-by-side
Showing 6 changed files with 31 additions and 25 deletions
@@ -34,7 +34,7 @@ Future<void> main() async { @@ -34,7 +34,7 @@ Future<void> main() async {
34 Routes.configureRoutes(router); 34 Routes.configureRoutes(router);
35 App.router = router; 35 App.router = router;
36 App.setupLocator(); 36 App.setupLocator();
37 - LogUtil.init(isDebug: false, tag: 'ONE_KEY'); 37 + LogUtil.init(isDebug: true, tag: 'ONE_KEY');
38 Provider.debugCheckInvalidValueType = null; 38 Provider.debugCheckInvalidValueType = null;
39 await initializeDateFormatting(); 39 await initializeDateFormatting();
40 SystemChrome.setPreferredOrientations( 40 SystemChrome.setPreferredOrientations(
@@ -115,7 +115,7 @@ class NotebookDetail { @@ -115,7 +115,7 @@ class NotebookDetail {
115 String get ddateMd { 115 String get ddateMd {
116 DateTime dateTime = 116 DateTime dateTime =
117 DateTime.fromMillisecondsSinceEpoch(int.parse(ddate) * 1000); 117 DateTime.fromMillisecondsSinceEpoch(int.parse(ddate) * 1000);
118 - String md ="${dateTime.year}年"+Utils.addZeroNumber(dateTime.month) + 118 + String md ="${dateTime.year}年 "+Utils.addZeroNumber(dateTime.month) +
119 "月" + 119 "月" +
120 Utils.addZeroNumber(dateTime.day) + 120 Utils.addZeroNumber(dateTime.day) +
121 "日"; 121 "日";
@@ -114,7 +114,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -114,7 +114,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
114 mainAxisAlignment: MainAxisAlignment.spaceBetween, 114 mainAxisAlignment: MainAxisAlignment.spaceBetween,
115 children: _notebookDetailChangeModel.dateList.map((value) { 115 children: _notebookDetailChangeModel.dateList.map((value) {
116 return CustomButton( 116 return CustomButton(
117 - dateText: value['title'], 117 + dateText: value['title'].toString().length<=5?value['title'].toString():value['title'].toString().substring(5),
118 fontSize: value['fontSize'], 118 fontSize: value['fontSize'],
119 dayText: value['dayText'], 119 dayText: value['dayText'],
120 isImage: value['isImage'], 120 isImage: value['isImage'],
@@ -69,7 +69,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -69,7 +69,7 @@ class NoteBookPageState extends State<NoteBookPage> {
69 //初始化时间 69 //初始化时间
70 _initTime() { 70 _initTime() {
71 dateTime = DateTime.now(); 71 dateTime = DateTime.now();
72 - dateText = Utils.addZeroNumber(dateTime.month) + 72 + dateText = "${dateTime.year}年 "+Utils.addZeroNumber(dateTime.month) +
73 "月" + 73 "月" +
74 Utils.addZeroNumber(dateTime.day) + 74 Utils.addZeroNumber(dateTime.day) +
75 "日" + 75 "日" +
@@ -142,6 +142,9 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -142,6 +142,9 @@ class NoteBookPageState extends State<NoteBookPage> {
142 "keywords": "", 142 "keywords": "",
143 "sort": "1" 143 "sort": "1"
144 }; 144 };
  145 + if(tabIndex==1){
  146 + params["account"]=userModel.user.account;
  147 + }
145 model.getReserveList(context, params); 148 model.getReserveList(context, params);
146 } 149 }
147 150
@@ -181,6 +184,9 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -181,6 +184,9 @@ class NoteBookPageState extends State<NoteBookPage> {
181 ? "0" + dateTime.day.toString() 184 ? "0" + dateTime.day.toString()
182 : dateTime.day.toString()) 185 : dateTime.day.toString())
183 }; 186 };
  187 + if(tabIndex==1){
  188 + params["account"]=userModel.user.account;
  189 + }
184 model.getReserveCountDay(context, params); 190 model.getReserveCountDay(context, params);
185 } 191 }
186 192
@@ -257,7 +263,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -257,7 +263,7 @@ class NoteBookPageState extends State<NoteBookPage> {
257 if (Utils.isOneDay(day, dateTime)) return; //日期没变 263 if (Utils.isOneDay(day, dateTime)) return; //日期没变
258 setState(() { 264 setState(() {
259 DateTime dateNow = DateTime.now(); 265 DateTime dateNow = DateTime.now();
260 - dateText = Utils.addZeroNumber(day.month) + 266 + dateText = "${day.year}年 "+Utils.addZeroNumber(day.month) +
261 "月" + 267 "月" +
262 Utils.addZeroNumber(day.day) + 268 Utils.addZeroNumber(day.day) +
263 "日"; 269 "日";
@@ -288,8 +294,11 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -288,8 +294,11 @@ class NoteBookPageState extends State<NoteBookPage> {
288 padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(20)), 294 padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(20)),
289 child: GestureDetector( 295 child: GestureDetector(
290 onTap: () { 296 onTap: () {
  297 + if(tabIndex==0)return;
291 setState(() { 298 setState(() {
292 tabIndex = 0; 299 tabIndex = 0;
  300 + _getReserveList();
  301 + _reserveCountDay();
293 }); 302 });
294 }, 303 },
295 child: Column( 304 child: Column(
@@ -336,8 +345,11 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -336,8 +345,11 @@ class NoteBookPageState extends State<NoteBookPage> {
336 padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(20)), 345 padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(20)),
337 child: GestureDetector( 346 child: GestureDetector(
338 onTap: () { 347 onTap: () {
  348 + if(tabIndex==1)return;
339 setState(() { 349 setState(() {
340 tabIndex = 1; 350 tabIndex = 1;
  351 + _getReserveList();
  352 + _reserveCountDay();
341 }); 353 });
342 }, 354 },
343 child: Column( 355 child: Column(
@@ -77,11 +77,11 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -77,11 +77,11 @@ class NotebookDetailChangeModel with ChangeNotifier {
77 ddateStr = DateUtil.formatDate(createTime, format: DateFormats.h_m); 77 ddateStr = DateUtil.formatDate(createTime, format: DateFormats.h_m);
78 String dateTimeSelect = DateUtil.formatDateMs( 78 String dateTimeSelect = DateUtil.formatDateMs(
79 createTime.millisecondsSinceEpoch, 79 createTime.millisecondsSinceEpoch,
80 - format: 'MM-dd'); 80 + format: 'yyyy-MM-dd');
81 //今天 81 //今天
82 DateTime dateTime = DateTime.now(); 82 DateTime dateTime = DateTime.now();
83 int dateTimeMill = dateTime.millisecondsSinceEpoch; 83 int dateTimeMill = dateTime.millisecondsSinceEpoch;
84 - String dateText = DateUtil.formatDateMs(dateTimeMill, format: 'MM-dd'); 84 + String dateText = DateUtil.formatDateMs(dateTimeMill, format: 'yyyy-MM-dd');
85 dateList.add({ 85 dateList.add({
86 'title': dateText, 86 'title': dateText,
87 'select': dateTimeSelect == dateText ? true : false, 87 'select': dateTimeSelect == dateText ? true : false,
@@ -92,7 +92,7 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -92,7 +92,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
92 //明天 92 //明天
93 int tomorrowMill = dateTimeMill + 24 * 60 * 60 * 1000; 93 int tomorrowMill = dateTimeMill + 24 * 60 * 60 * 1000;
94 String dateTextTomorrow = 94 String dateTextTomorrow =
95 - DateUtil.formatDateMs(tomorrowMill, format: 'MM-dd'); 95 + DateUtil.formatDateMs(tomorrowMill, format: 'yyyy-MM-dd');
96 dateList.add({ 96 dateList.add({
97 'title': dateTextTomorrow, 97 'title': dateTextTomorrow,
98 'select': dateTimeSelect == dateTextTomorrow ? true : false, 98 'select': dateTimeSelect == dateTextTomorrow ? true : false,
@@ -316,16 +316,14 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -316,16 +316,14 @@ class NotebookDetailChangeModel with ChangeNotifier {
316 //初始化早市午市晚市选中时间 316 //初始化早市午市晚市选中时间
317 initHourAndMinuteSelect() { 317 initHourAndMinuteSelect() {
318 int timeMillsNow = DateTime.now().millisecondsSinceEpoch; 318 int timeMillsNow = DateTime.now().millisecondsSinceEpoch;
319 - //当前选中 月 日string  
320 - String mdStr = ''; 319 + //当前选中 年-月-日
  320 + String ymyStr="";
321 //今天 明天 其他天 321 //今天 明天 其他天
322 for (var item in dateList) { 322 for (var item in dateList) {
323 if (item['select'] == true) { 323 if (item['select'] == true) {
324 - mdStr = item['title']; 324 + ymyStr = item['title'];
325 } 325 }
326 } 326 }
327 - String timeNowYear = DateUtil.formatDate(DateTime.now(), format: 'yyyy');  
328 - String ymyStr = timeNowYear + '-' + mdStr; //年月日  
329 String timeStr = ymyStr + ' 00:00:00'; 327 String timeStr = ymyStr + ' 00:00:00';
330 LogUtil.v(timeStr); 328 LogUtil.v(timeStr);
331 DateTime dateTime = DateUtil.getDateTime(timeStr); //当前年月日 329 DateTime dateTime = DateUtil.getDateTime(timeStr); //当前年月日
@@ -589,16 +587,14 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -589,16 +587,14 @@ class NotebookDetailChangeModel with ChangeNotifier {
589 sex = item['code']; 587 sex = item['code'];
590 } 588 }
591 } 589 }
592 - //当前选中 月 日string  
593 - String mdStr = ''; 590 + //当前选中 年-月-日string
  591 + String ymyStr="";
594 //今天 明天 其他天 592 //今天 明天 其他天
595 for (var item in dateList) { 593 for (var item in dateList) {
596 if (item['select'] == true) { 594 if (item['select'] == true) {
597 - mdStr = item['title']; 595 + ymyStr = item['title'];
598 } 596 }
599 } 597 }
600 - String timeNowYear = DateUtil.formatDate(DateUtil.getDateTimeByMs(int.parse(detailEntity.ddate)*1000), format: 'yyyy');  
601 - String ymyStr = timeNowYear + '-' + mdStr; //年月日  
602 String timeStr = ymyStr + ' ' + ddateStr + ':00'; 598 String timeStr = ymyStr + ' ' + ddateStr + ':00';
603 // int start = DateUtil.getDateMsByTimeStr(timeStr); 599 // int start = DateUtil.getDateMsByTimeStr(timeStr);
604 600
@@ -708,16 +704,14 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -708,16 +704,14 @@ class NotebookDetailChangeModel with ChangeNotifier {
708 sex = item['code']; 704 sex = item['code'];
709 } 705 }
710 } 706 }
711 - //当前选中 月 日string  
712 - String mdStr = ''; 707 + //当前选中 年-月-日string
  708 + String ymyStr="";
713 //今天 明天 其他天 709 //今天 明天 其他天
714 for (var item in dateList) { 710 for (var item in dateList) {
715 if (item['select'] == true) { 711 if (item['select'] == true) {
716 - mdStr = item['title']; 712 + ymyStr = item['title'];
717 } 713 }
718 } 714 }
719 - String timeNowYear = DateUtil.formatDate(DateUtil.getDateTimeByMs(int.parse(detailEntity.ddate)*1000), format: 'yyyy');  
720 - String ymyStr = timeNowYear + '-' + mdStr; //年月日  
721 String timeStr = ymyStr + ' ' + ddateStr + ':00'; 715 String timeStr = ymyStr + ' ' + ddateStr + ':00';
722 // int start = DateUtil.getDateMsByTimeStr(timeStr); 716 // int start = DateUtil.getDateMsByTimeStr(timeStr);
723 717
@@ -51,7 +51,7 @@ class TableManagerModel with ChangeNotifier{ @@ -51,7 +51,7 @@ class TableManagerModel with ChangeNotifier{
51 initTime(BuildContext context) async { 51 initTime(BuildContext context) async {
52 userModel = Provider.of<UserModel>(context, listen: false); 52 userModel = Provider.of<UserModel>(context, listen: false);
53 dateTime = DateTime.now(); 53 dateTime = DateTime.now();
54 - dateText = Utils.addZeroNumber(dateTime.month) + 54 + dateText = "${dateTime.year}年 "+Utils.addZeroNumber(dateTime.month) +
55 "月" + 55 "月" +
56 Utils.addZeroNumber(dateTime.day) + 56 Utils.addZeroNumber(dateTime.day) +
57 "日" + 57 "日" +
@@ -346,7 +346,7 @@ class TableManagerModel with ChangeNotifier{ @@ -346,7 +346,7 @@ class TableManagerModel with ChangeNotifier{
346 createDateText(BuildContext context,DateTime day) { 346 createDateText(BuildContext context,DateTime day) {
347 if (Utils.isOneDay(day, dateTime)) return; //日期没变 347 if (Utils.isOneDay(day, dateTime)) return; //日期没变
348 DateTime dateNow = DateTime.now(); 348 DateTime dateNow = DateTime.now();
349 - dateText = Utils.addZeroNumber(day.month) + 349 + dateText = "${day.year}年 "+Utils.addZeroNumber(day.month) +
350 "月" + 350 "月" +
351 Utils.addZeroNumber(day.day) + 351 Utils.addZeroNumber(day.day) +
352 "日"; 352 "日";