合并

+import 'dart:io';
+
 import 'package:dio/dio.dart';
 import 'package:fluro/fluro.dart';
 import 'package:flutter/material.dart';
@@ -10,6 +12,7 @@ import 'package:one_key/pages/detail/handle_online_page.dart';
 import 'package:one_key/provider/message_dialog_model.dart';
 import 'package:intl/date_symbol_data_local.dart';
 import 'package:one_key/provider/tools.dart';
+import 'package:one_key/utils/navigator_util.dart';
 import 'package:one_key/utils/utils.dart';
 import 'package:provider/provider.dart';
 import 'package:tpns_flutter_plugin/tpns_flutter_plugin.dart';
@@ -64,6 +67,8 @@ class MyApp extends StatefulWidget {
 
 class MyAppState extends State<MyApp> {
 
+  int xgCount=1;//注册信鸽次数，最多5次
+
   @override
   void initState() {
     // TODO: implement initState

@@ -177,6 +177,13 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
             MyAppBar(
               "在线预订详情",
               showBack: true,
+              callback: (){
+                if(widget.fromNotify){
+                  NavigatorUtil.goHomePage(context,initialIndex: 0);
+                }else{
+                  Navigator.of(context).pop();
+                }
+              },
             ),
             Expanded(
               child: DefaultTextStyle(

@@ -391,6 +391,13 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
             MyAppBar(
               "订座详情",
               showBack: true,
+              callback: (){
+                if(widget.fromNotify){
+                  NavigatorUtil.goHomePage(context,initialIndex: 0);
+                }else{
+                  Navigator.of(context).pop();
+                }
+              },
             ),
             Expanded(
               child: DefaultTextStyle(

 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -65,10 +66,12 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
         create: (_) => MyModel(),
         child: MyPage(),
       ));
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (widget.initialIndex == 0) return;
-      _getIntent();
-      Future.delayed(Duration(milliseconds: 300), () {
+    WidgetsBinding.instance.addPostFrameCallback((_){
+      if(widget.initialIndex==0)return;
+      if(Platform.isAndroid){
+        _getIntent();
+      }
+      Future.delayed(Duration(milliseconds: 300),(){
         initPlatformState();
       });
       Future.delayed(Duration(milliseconds: 30000), () {
@@ -159,9 +162,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
       },
       xgPushClickAction: (Map<String, dynamic> msg) async {
         print("flutter xgPushClickAction ${msg['custom']}");
-        if (Platform.isIOS && msg != null && msg['custom'] != null) {
-          Map<String, dynamic> custom = msg['custom'];
-          switch (custom["messageType"].toString()) {
+        if(Platform.isIOS&&msg!=null&&msg['custom']!=null){
+          Map<String,dynamic> custom=jsonDecode(msg['custom'].toString());
+          switch(custom["messageType"].toString()){
             case "10":
               NavigatorUtil.goNotebookDetailPage(
                   context, custom['rid'].toString(),

@@ -250,14 +250,20 @@ class NoteBookPageState extends State<NoteBookPage> {
     if (Utils.isOneDay(day, dateTime)) return; //日期没变
     setState(() {
       DateTime dateNow = DateTime.now();
+      dateText =
+          Utils.addZeroNumber(day.month) + "-" +Utils.addZeroNumber(day.day);
       if (Utils.isOneDay(day, dateNow)) {
-        dateText = Utils.addZeroNumber(dateNow.month) +
-            "-" +
-            Utils.addZeroNumber(dateNow.day) +
+        dateText +=
             "  今天";
-      } else {
-        dateText =
-            Utils.addZeroNumber(day.month) + "-" + Utils.addZeroNumber(day.day);
+      } else if(Utils.isOneDay(day,dateNow.add(Duration(days: 1)))){
+        dateText +=
+        "  明天";
+      }else if(Utils.isOneDay(day,dateNow.add(Duration(days: 2)))){
+        dateText +=
+        "  后天";
+      }else{
+        dateText +=
+        " 周${Utils.formatWeekDayNum(day.weekday)}";
       }
       dateTime = day;
     });

@@ -142,6 +142,20 @@ class DialogUtil {
     messageModel.showMessageDialog=false;
   }
 
+  //解析返回显示的日期
+  static String _parseDateDay(DateTime dateTime){
+    DateTime now=DateTime.now();
+    if(Utils.isOneDay(dateTime,now)){
+      return "今";
+    }else if(Utils.isOneDay(dateTime,now.add(Duration(days: 1)))){
+      return "明";
+    }else if(Utils.isOneDay(dateTime,now.add(Duration(days: 2)))){
+      return "后";
+    }else{
+      return dateTime.day.toString();
+    }
+  }
+
   //显示日历弹框
   static Future<DateTime> showCalendarDialog(BuildContext context,DateTime selectDateTime) {
     CalendarController _calendarController = CalendarController();
@@ -214,6 +228,23 @@ class DialogUtil {
                               ),
                             );
                           },
+                          dayBuilder: (context,date,_){
+                            return Container(
+                              decoration: BoxDecoration(
+                                  shape: BoxShape.circle,
+                              ),
+                              alignment: Alignment.center,
+                              margin: const EdgeInsets.all(6.0),
+                              padding: const EdgeInsets.only(
+                                  bottom: 4.0, left: 8.0, right: 8.0, top: 4.0),
+                              child: Text(
+                                "${_parseDateDay(date)}",
+                                style: TextStyle().copyWith(
+                                    fontSize: ScreenUtil().setSp(32),
+                                    color: MyColours.color_353535),
+                              ),
+                            );
+                          },
                           selectedDayBuilder: (context, date, _) {
                             return Container(
                               decoration: BoxDecoration(
@@ -225,9 +256,7 @@ class DialogUtil {
                               padding: const EdgeInsets.only(
                                   bottom: 4.0, left: 8.0, right: 8.0, top: 4.0),
                               child: Text(
-                                date.day == DateTime
-                                    .now()
-                                    .day ? '今' : date.day.toString(),
+                                "${_parseDateDay(date)}",
                                 style: TextStyle().copyWith(
                                     fontSize: ScreenUtil().setSp(32),
                                     color: MyColours.color_ffffff),

+
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:one_key/res/colors.dart';
 
 class MyAppBar extends StatelessWidget {
-  MyAppBar(this.title, {this.showBack = true,this.backgroundColor=MyColours.color_ffffff,this.fontColor=MyColours.color_131313});
 
+  MyAppBar(this.title, {this.showBack = true,this.backgroundColor=MyColours.color_ffffff,this.fontColor=MyColours.color_131313, this.callback});
+  final VoidCallback callback;//返回回调
   final String title;//标题文字
   final bool showBack;//是否显示返回按钮
   final Color backgroundColor;//背景色
@@ -24,7 +26,11 @@ class MyAppBar extends StatelessWidget {
               left: 0,
               child: showBack?GestureDetector(
                 onTap: () {
-                  Navigator.of(context).pop();
+                  if(this.callback!=null){
+                    this.callback();
+                  }else{
+                    Navigator.of(context).pop();
+                  }
                 },
                 behavior: HitTestBehavior.opaque,
                 child: Padding(