跨年处理

@@ -34,7 +34,7 @@ Future<void> main() async {
     Routes.configureRoutes(router);
     App.router = router;
     App.setupLocator();
-    LogUtil.init(isDebug: false, tag: 'ONE_KEY');
+    LogUtil.init(isDebug: true, tag: 'ONE_KEY');
     Provider.debugCheckInvalidValueType = null;
     await initializeDateFormatting();
     SystemChrome.setPreferredOrientations(

@@ -115,7 +115,7 @@ class NotebookDetail {
   String get ddateMd {
     DateTime dateTime =
         DateTime.fromMillisecondsSinceEpoch(int.parse(ddate) * 1000);
-    String md ="${dateTime.year}年"+Utils.addZeroNumber(dateTime.month) +
+    String md ="${dateTime.year}年 "+Utils.addZeroNumber(dateTime.month) +
         "月" +
         Utils.addZeroNumber(dateTime.day) +
         "日";

@@ -114,7 +114,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: _notebookDetailChangeModel.dateList.map((value) {
                 return CustomButton(
-                  dateText: value['title'],
+                  dateText: value['title'].toString().length<=5?value['title'].toString():value['title'].toString().substring(5),
                   fontSize: value['fontSize'],
                   dayText: value['dayText'],
                   isImage: value['isImage'],

@@ -69,7 +69,7 @@ class NoteBookPageState extends State<NoteBookPage> {
   //初始化时间
   _initTime() {
     dateTime = DateTime.now();
-    dateText = Utils.addZeroNumber(dateTime.month) +
+    dateText = "${dateTime.year}年 "+Utils.addZeroNumber(dateTime.month) +
         "月" +
         Utils.addZeroNumber(dateTime.day) +
         "日" +
@@ -142,6 +142,9 @@ class NoteBookPageState extends State<NoteBookPage> {
       "keywords": "",
       "sort": "1"
     };
+    if(tabIndex==1){
+      params["account"]=userModel.user.account;
+    }
     model.getReserveList(context, params);
   }
 
@@ -181,6 +184,9 @@ class NoteBookPageState extends State<NoteBookPage> {
               ? "0" + dateTime.day.toString()
               : dateTime.day.toString())
     };
+    if(tabIndex==1){
+      params["account"]=userModel.user.account;
+    }
     model.getReserveCountDay(context, params);
   }
 
@@ -257,7 +263,7 @@ class NoteBookPageState extends State<NoteBookPage> {
     if (Utils.isOneDay(day, dateTime)) return; //日期没变
     setState(() {
       DateTime dateNow = DateTime.now();
-      dateText = Utils.addZeroNumber(day.month) +
+      dateText = "${day.year}年 "+Utils.addZeroNumber(day.month) +
           "月" +
           Utils.addZeroNumber(day.day) +
           "日";
@@ -288,8 +294,11 @@ class NoteBookPageState extends State<NoteBookPage> {
             padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(20)),
             child: GestureDetector(
                 onTap: () {
+                  if(tabIndex==0)return;
                   setState(() {
                     tabIndex = 0;
+                    _getReserveList();
+                    _reserveCountDay();
                   });
                 },
                 child: Column(
@@ -336,8 +345,11 @@ class NoteBookPageState extends State<NoteBookPage> {
             padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(20)),
             child: GestureDetector(
                 onTap: () {
+                  if(tabIndex==1)return;
                   setState(() {
                     tabIndex = 1;
+                    _getReserveList();
+                    _reserveCountDay();
                   });
                 },
                 child: Column(

@@ -77,11 +77,11 @@ class NotebookDetailChangeModel with ChangeNotifier {
     ddateStr = DateUtil.formatDate(createTime, format: DateFormats.h_m);
     String dateTimeSelect = DateUtil.formatDateMs(
         createTime.millisecondsSinceEpoch,
-        format: 'MM-dd');
+        format: 'yyyy-MM-dd');
     //今天
     DateTime dateTime = DateTime.now();
     int dateTimeMill = dateTime.millisecondsSinceEpoch;
-    String dateText = DateUtil.formatDateMs(dateTimeMill, format: 'MM-dd');
+    String dateText = DateUtil.formatDateMs(dateTimeMill, format: 'yyyy-MM-dd');
     dateList.add({
       'title': dateText,
       'select': dateTimeSelect == dateText ? true : false,
@@ -92,7 +92,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
     //明天
     int tomorrowMill = dateTimeMill + 24 * 60 * 60 * 1000;
     String dateTextTomorrow =
-        DateUtil.formatDateMs(tomorrowMill, format: 'MM-dd');
+        DateUtil.formatDateMs(tomorrowMill, format: 'yyyy-MM-dd');
     dateList.add({
       'title': dateTextTomorrow,
       'select': dateTimeSelect == dateTextTomorrow ? true : false,
@@ -316,16 +316,14 @@ class NotebookDetailChangeModel with ChangeNotifier {
   //初始化早市午市晚市选中时间
   initHourAndMinuteSelect() {
     int timeMillsNow = DateTime.now().millisecondsSinceEpoch;
-    //当前选中 月 日string
-    String mdStr = '';
+    //当前选中 年-月-日
+    String ymyStr="";
     //今天 明天 其他天
     for (var item in dateList) {
       if (item['select'] == true) {
-        mdStr = item['title'];
+        ymyStr = item['title'];
       }
     }
-    String timeNowYear = DateUtil.formatDate(DateTime.now(), format: 'yyyy');
-    String ymyStr = timeNowYear + '-' + mdStr; //年月日
     String timeStr = ymyStr + ' 00:00:00';
     LogUtil.v(timeStr);
     DateTime dateTime = DateUtil.getDateTime(timeStr); //当前年月日
@@ -589,16 +587,14 @@ class NotebookDetailChangeModel with ChangeNotifier {
         sex = item['code'];
       }
     }
-    //当前选中 月 日string
-    String mdStr = '';
+    //当前选中 年-月-日string
+    String ymyStr="";
     //今天 明天 其他天
     for (var item in dateList) {
       if (item['select'] == true) {
-        mdStr = item['title'];
+        ymyStr = item['title'];
       }
     }
-    String timeNowYear = DateUtil.formatDate(DateUtil.getDateTimeByMs(int.parse(detailEntity.ddate)*1000), format: 'yyyy');
-    String ymyStr = timeNowYear + '-' + mdStr; //年月日
     String timeStr = ymyStr + ' ' + ddateStr + ':00';
     // int start = DateUtil.getDateMsByTimeStr(timeStr);
 
@@ -708,16 +704,14 @@ class NotebookDetailChangeModel with ChangeNotifier {
         sex = item['code'];
       }
     }
-    //当前选中 月 日string
-    String mdStr = '';
+    //当前选中 年-月-日string
+    String ymyStr="";
     //今天 明天 其他天
     for (var item in dateList) {
       if (item['select'] == true) {
-        mdStr = item['title'];
+        ymyStr = item['title'];
       }
     }
-    String timeNowYear = DateUtil.formatDate(DateUtil.getDateTimeByMs(int.parse(detailEntity.ddate)*1000), format: 'yyyy');
-    String ymyStr = timeNowYear + '-' + mdStr; //年月日
     String timeStr = ymyStr + ' ' + ddateStr + ':00';
     // int start = DateUtil.getDateMsByTimeStr(timeStr);
 

@@ -51,7 +51,7 @@ class TableManagerModel with ChangeNotifier{
   initTime(BuildContext context) async {
     userModel = Provider.of<UserModel>(context, listen: false);
     dateTime = DateTime.now();
-    dateText = Utils.addZeroNumber(dateTime.month) +
+    dateText = "${dateTime.year}年 "+Utils.addZeroNumber(dateTime.month) +
         "月" +
         Utils.addZeroNumber(dateTime.day) +
         "日" +
@@ -346,7 +346,7 @@ class TableManagerModel with ChangeNotifier{
   createDateText(BuildContext context,DateTime day) {
     if (Utils.isOneDay(day, dateTime)) return; //日期没变
     DateTime dateNow = DateTime.now();
-    dateText = Utils.addZeroNumber(day.month) +
+    dateText = "${day.year}年 "+Utils.addZeroNumber(day.month) +
         "月" +
         Utils.addZeroNumber(day.day) +
         "日";