,,,

wdn127929
1 parent f20bf1f6
Showing 5 changed files with 75 additions and 17 deletions
lib/pages/home/home_page.dart
lib/pages/message/message_item_f.dart
lib/pages/notebook/notebook_page.dart
lib/route/navigator_util.dart
lib/route/route_handles.dart
--- a/lib/pages/home/home_page.dart
View file @8ac3e50
+++ b/lib/pages/home/home_page.dart
View file @8ac3e50
@@ -39,7 +39,9 @@ class HomePage extends StatefulWidget {
   final bool needReresh;
-  HomePage({this.initialIndex = 1, this.needReresh = true});
+  final bool mine;
+
+  HomePage({this.initialIndex = 1, this.needReresh = true, this.mine = false});
   @override
   State<StatefulWidget> createState() {
@@ -98,7 +100,10 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
 //      ))
       ..add(ChangeNotifierProvider<NoteBookModel>(
         create: (_) => NoteBookModel(),
-        child: SafeArea(child: NoteBookPage()),
+        child: SafeArea(
+            child: NoteBookPage(
+          tabIndex: widget.mine ? 1 : 0,
+        )),
       ))
       ..add(ChangeNotifierProvider<TableManagerModel>(
         create: (_) => TableManagerModel(),
@@ -141,8 +146,8 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
         }
       }
       // if (widget.initialIndex == 0 ||
-      if (widget.initialIndex == 1 && needRefreshTemp == false) return;
-
+      // if (widget.initialIndex == 1 && needRefreshTemp == false) return;
+      if (widget.initialIndex == 0) return;
       _getIntent();
       Future.delayed(Duration(milliseconds: 30000), () {
         ContactModel.getInstance().uploadLocalContact(context);
@@ -256,9 +261,14 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
         case "15":
           //店内消息
           NavigatorUtil.goHomePage(context,
-              initialIndex: 1, needRefresh: false);
+              initialIndex: 1, needRefresh: false, mine: true);
+          break;
+        case "16":
+          //经理取消预订
+          NavigatorUtil.goNotebookDetailPage(
+              context, notifyParam['rid'], notifyParam["uid"],
+              mid: notifyParam['mid'], fromNotify: true);
           break;
-
         case "1":
           NavigatorUtil.goHasOrderFoodPage(context,
               rid: notifyParam["rid"], fromNotify: true);
@@ -416,7 +426,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
               break;
             case "15":
               //店内消息
-              NavigatorUtil.goHomePage(context, initialIndex: 1);
+              NavigatorUtil.goHomePage(context, initialIndex: 1, mine: true);
               Map<String, String> params = {
                 "sid": Provider.of<UserModel>(context, listen: false)
                     .user
@@ -428,7 +438,12 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
                   Provider.of<MessageDialogModel>(context, listen: false);
               await messageDialogModel.setMessageStatus(context, params);
               break;
-
+            case "16":
+              //经理取消预订
+              NavigatorUtil.goNotebookDetailPage(
+                  context, custom['rid'].toString(), custom["uid"].toString(),
+                  mid: custom['mid'].toString(), fromNotify: true);
+              break;
             case "1":
               NavigatorUtil.goHasOrderFoodPage(context,
                   rid: custom["rid"], fromNotify: true);
@@ -547,11 +562,12 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
     super.didChangeAppLifecycleState(state);
     switch (state) {
       case AppLifecycleState.resumed: //应用前台可见
-        if (widget.initialIndex == 1 && needRefreshTemp == false) return;
-
-        _clearBadge(() {
-          _getAllUnMessages();
-        });
+        if (widget.initialIndex == 1 && needRefreshTemp == false) {
+        } else {
+          _clearBadge(() {
+            _getAllUnMessages();
+          });
+        }
         break;
       case AppLifecycleState.inactive:
--- a/lib/pages/message/message_item_f.dart
View file @8ac3e50
+++ b/lib/pages/message/message_item_f.dart
View file @8ac3e50
@@ -87,6 +87,9 @@ class MessageItemF extends StatelessWidget {
             } else if (message.message_type == "11") {
               NavigatorUtil.goNotebookDetailPage(
                   context, message.rid.toString(), message.uid);
+            } else if (message.message_type == "16") {
+              NavigatorUtil.goNotebookDetailPage(
+                  context, message.rid.toString(), message.uid);
             } else if (message.message_type == "12") {
               //在线买单消息查看
               NavigatorUtil.goOnlineCheckDetailPage(context,
@@ -119,6 +122,20 @@ class MessageItemF extends StatelessWidget {
               };
               await messageDialogModel.setMessageStatus(context, params);
               bus.emit("refresh_untreated_num"); //刷新未读消息数目
+            } else if (message.message_type == "16") {
+              NavigatorUtil.goNotebookDetailPage(
+                  context, message.rid.toString(), message.uid);
+              bus.emit("remove_untreated_message", message.id);
+
+              Map<String, String> params = {
+                "sid": Provider.of<UserModel>(context, listen: false)
+                    .user
+                    .sellerid,
+                "id": message.id,
+                "status": message.message_type == "1" ? "is_read" : "is_handle"
+              };
+              await messageDialogModel.setMessageStatus(context, params);
+              bus.emit("refresh_untreated_num"); //刷新未读消息数目
             } else if (message.message_type == "1") {
               //提前点餐
               NavigatorUtil.goHasOrderFoodPage(context, rid: message.rid);
@@ -168,7 +185,8 @@ class MessageItemF extends StatelessWidget {
               bus.emit("refresh_untreated_num"); //刷新未读消息数目
             } else if (message.message_type == "15") {
               //店内消息
-              NavigatorUtil.goHomePage(context, initialIndex: 1,needRefresh: false);
+              NavigatorUtil.goHomePage(context,
+                  initialIndex: 1, needRefresh: false, mine: true);
               bus.emit("remove_untreated_message", message.id);
               Map<String, String> params = {
@@ -478,6 +496,23 @@ class MessageItemF extends StatelessWidget {
                       await messageDialogModel.setMessageStatus(
                           context, params);
                       bus.emit("refresh_untreated_num"); //刷新未读消息数目
+                    } else if (message.message_type == "16") {
+                      NavigatorUtil.goNotebookDetailPage(
+                          context, message.rid.toString(), message.uid);
+                      bus.emit("remove_untreated_message", message.id);
+
+                      Map<String, String> params = {
+                        "sid": Provider.of<UserModel>(context, listen: false)
+                            .user
+                            .sellerid,
+                        "id": message.id,
+                        "status": message.message_type == "1"
+                            ? "is_read"
+                            : "is_handle"
+                      };
+                      await messageDialogModel.setMessageStatus(
+                          context, params);
+                      bus.emit("refresh_untreated_num"); //刷新未读消息数目
                     } else if (message.message_type == "1") {
                       //提前点餐
                       NavigatorUtil.goHasOrderFoodPage(context,
@@ -538,7 +573,8 @@ class MessageItemF extends StatelessWidget {
                       bus.emit("refresh_untreated_num"); //刷新未读消息数目
                     } else if (message.message_type == "15") {
                       //店内消息
-                      NavigatorUtil.goHomePage(context, initialIndex: 1,needRefresh: false);
+                      NavigatorUtil.goHomePage(context,
+                          initialIndex: 1, needRefresh: false, mine: true);
                       bus.emit("remove_untreated_message", message.id);
                       Map<String, String> params = {
                         "sid": Provider.of<UserModel>(context, listen: false)
--- a/lib/pages/notebook/notebook_page.dart
View file @8ac3e50
+++ b/lib/pages/notebook/notebook_page.dart
View file @8ac3e50
@@ -21,6 +21,9 @@ import 'package:one_key/widgets/page_exception.dart';
 import 'package:provider/provider.dart';
 class NoteBookPage extends StatefulWidget {
+  final int tabIndex;
+
+  const NoteBookPage({Key key, this.tabIndex = 0}) : super(key: key);
   @override
   State<StatefulWidget> createState() {
     // TODO: implement createState
@@ -47,6 +50,7 @@ class NoteBookPageState extends State<NoteBookPage> {
   void initState() {
     // TODO: implement initState
     super.initState();
+    tabIndex = widget.tabIndex;
     LogUtil.v("notebook_page initState");
     _controller = EasyRefreshController();
--- a/lib/route/navigator_util.dart
View file @8ac3e50
+++ b/lib/route/navigator_util.dart
View file @8ac3e50
@@ -55,9 +55,9 @@ class NavigatorUtil {
   /// 首页
   static void goHomePage(BuildContext context,
-      {int initialIndex = 1, needRefresh = true}) {
+      {int initialIndex = 1, needRefresh = true, mine = false}) {
     _navigateTo(context,
-        "${Routes.home}?initialIndex=$initialIndex&needRefresh=$needRefresh",
+        "${Routes.home}?initialIndex=$initialIndex&needRefresh=$needRefresh&mine=$mine",
         clearStack: true);
   }
--- a/lib/route/route_handles.dart
View file @8ac3e50
+++ b/lib/route/route_handles.dart
View file @8ac3e50
@@ -147,9 +147,11 @@ var homeHandler = new Handler(
     handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
   String initialIndex = params["initialIndex"].first;
   bool needRefresh = FluroConvertUtils.string2bool(params["needRefresh"].first);
+  bool mine = FluroConvertUtils.string2bool(params["mine"].first);
   return HomePage(
     initialIndex: int.parse(initialIndex),
     needReresh: needRefresh,
+    mine: mine,
   );
 });