合并

@@ -11,14 +11,14 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
-def flutterVersionCode = "171"
+def flutterVersionCode = "170"
 if (flutterVersionCode == null) {
-    flutterVersionCode = '171'
+    flutterVersionCode = '170'
 }
 
-def flutterVersionName = "1.7.1"
+def flutterVersionName = "1.7.0"
 if (flutterVersionName == null) {
-    flutterVersionName = '1.7.1'
+    flutterVersionName = '1.7.0'
 }
 
 apply plugin: 'com.android.application'

@@ -409,7 +409,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 164;
+				CURRENT_PROJECT_VERSION = 165;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -422,7 +422,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.6.4;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = "一键订";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -551,7 +551,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 164;
+				CURRENT_PROJECT_VERSION = 165;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -564,7 +564,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.6.4;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = "一键订";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -584,7 +584,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 164;
+				CURRENT_PROJECT_VERSION = 165;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -597,7 +597,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.6.4;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = "一键订";
 				PROVISIONING_PROFILE_SPECIFIER = "";

@@ -221,6 +221,24 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
                   context, custom['rid'].toString(),
                   mid: custom['mid'].toString(), fromNotify: true);
               break;
+            case "1":
+              NavigatorUtil.goHasOrderFoodPage(context,
+                  rid: custom["rid"], fromNotify: true);
+              // bus.emit("remove_untreated_message_order", notifyParam["rid"]);
+
+              Map<String, String> params = {
+                "sid": Provider.of<UserModel>(context, listen: false)
+                    .user
+                    .sellerid,
+                "id": custom['mid'],
+                "status": "is_read"
+              };
+              MessageDialogModel messageDialogModel =
+                  Provider.of<MessageDialogModel>(context, listen: false);
+              await messageDialogModel.setMessageStatus(context, params);
+              // bus.emit("refresh_untreated_num"); //刷新未读消息数目
+
+              break;
           }
         }
       },

@@ -40,6 +40,9 @@ class MessageItem extends StatelessWidget {
                   context, message.rid.toString());
             } else if (message.message_type == "1") {
               NavigatorUtil.goHasOrderFoodPage(context, rid: message.rid);
+            } else if (message.message_type == "11") {
+              NavigatorUtil.goNotebookDetailPage(
+                  context, message.rid.toString());
             }
           }
         },