xt / Flutter-ReserveApp · Commits

Go to a project

Commit 0089236a72a41afb013aa0f921ee728e085ec7a7

Authored by wdn127929
1 parent 9be58ad4
build: skipped

合并

Inline Side-by-side
Showing 4 changed files with 31 additions and 10 deletions
@@ -11,14 +11,14 @@ if (flutterRoot == null) { @@ -11,14 +11,14 @@ if (flutterRoot == null) {
11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") 11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12 } 12 }
13 13
14 -def flutterVersionCode = "171" 14 +def flutterVersionCode = "170"
15 if (flutterVersionCode == null) { 15 if (flutterVersionCode == null) {
16 - flutterVersionCode = '171' 16 + flutterVersionCode = '170'
17 } 17 }
18 18
19 -def flutterVersionName = "1.7.1" 19 +def flutterVersionName = "1.7.0"
20 if (flutterVersionName == null) { 20 if (flutterVersionName == null) {
21 - flutterVersionName = '1.7.1' 21 + flutterVersionName = '1.7.0'
22 } 22 }
23 23
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
@@ -409,7 +409,7 @@ @@ -409,7 +409,7 @@
409 CODE_SIGN_IDENTITY = "iPhone Developer"; 409 CODE_SIGN_IDENTITY = "iPhone Developer";
410 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 410 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
411 CODE_SIGN_STYLE = Automatic; 411 CODE_SIGN_STYLE = Automatic;
412 - CURRENT_PROJECT_VERSION = 164; 412 + CURRENT_PROJECT_VERSION = 165;
413 DEVELOPMENT_TEAM = 8J59HM8B82; 413 DEVELOPMENT_TEAM = 8J59HM8B82;
414 ENABLE_BITCODE = NO; 414 ENABLE_BITCODE = NO;
415 FRAMEWORK_SEARCH_PATHS = ( 415 FRAMEWORK_SEARCH_PATHS = (
@@ -422,7 +422,7 @@ @@ -422,7 +422,7 @@
422 "$(inherited)", 422 "$(inherited)",
423 "$(PROJECT_DIR)/Flutter", 423 "$(PROJECT_DIR)/Flutter",
424 ); 424 );
425 - MARKETING_VERSION = 1.6.4; 425 + MARKETING_VERSION = 1.7.0;
426 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 426 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
427 PRODUCT_NAME = "一键订"; 427 PRODUCT_NAME = "一键订";
428 PROVISIONING_PROFILE_SPECIFIER = ""; 428 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -551,7 +551,7 @@ @@ -551,7 +551,7 @@
551 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 551 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
552 CODE_SIGN_IDENTITY = "iPhone Developer"; 552 CODE_SIGN_IDENTITY = "iPhone Developer";
553 CODE_SIGN_STYLE = Automatic; 553 CODE_SIGN_STYLE = Automatic;
554 - CURRENT_PROJECT_VERSION = 164; 554 + CURRENT_PROJECT_VERSION = 165;
555 DEVELOPMENT_TEAM = 8J59HM8B82; 555 DEVELOPMENT_TEAM = 8J59HM8B82;
556 ENABLE_BITCODE = NO; 556 ENABLE_BITCODE = NO;
557 FRAMEWORK_SEARCH_PATHS = ( 557 FRAMEWORK_SEARCH_PATHS = (
@@ -564,7 +564,7 @@ @@ -564,7 +564,7 @@
564 "$(inherited)", 564 "$(inherited)",
565 "$(PROJECT_DIR)/Flutter", 565 "$(PROJECT_DIR)/Flutter",
566 ); 566 );
567 - MARKETING_VERSION = 1.6.4; 567 + MARKETING_VERSION = 1.7.0;
568 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 568 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
569 PRODUCT_NAME = "一键订"; 569 PRODUCT_NAME = "一键订";
570 PROVISIONING_PROFILE_SPECIFIER = ""; 570 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -584,7 +584,7 @@ @@ -584,7 +584,7 @@
584 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 584 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
585 CODE_SIGN_IDENTITY = "iPhone Developer"; 585 CODE_SIGN_IDENTITY = "iPhone Developer";
586 CODE_SIGN_STYLE = Automatic; 586 CODE_SIGN_STYLE = Automatic;
587 - CURRENT_PROJECT_VERSION = 164; 587 + CURRENT_PROJECT_VERSION = 165;
588 DEVELOPMENT_TEAM = 8J59HM8B82; 588 DEVELOPMENT_TEAM = 8J59HM8B82;
589 ENABLE_BITCODE = NO; 589 ENABLE_BITCODE = NO;
590 FRAMEWORK_SEARCH_PATHS = ( 590 FRAMEWORK_SEARCH_PATHS = (
@@ -597,7 +597,7 @@ @@ -597,7 +597,7 @@
597 "$(inherited)", 597 "$(inherited)",
598 "$(PROJECT_DIR)/Flutter", 598 "$(PROJECT_DIR)/Flutter",
599 ); 599 );
600 - MARKETING_VERSION = 1.6.4; 600 + MARKETING_VERSION = 1.7.0;
601 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 601 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
602 PRODUCT_NAME = "一键订"; 602 PRODUCT_NAME = "一键订";
603 PROVISIONING_PROFILE_SPECIFIER = ""; 603 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -221,6 +221,24 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -221,6 +221,24 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
221 context, custom['rid'].toString(), 221 context, custom['rid'].toString(),
222 mid: custom['mid'].toString(), fromNotify: true); 222 mid: custom['mid'].toString(), fromNotify: true);
223 break; 223 break;
  224 + case "1":
  225 + NavigatorUtil.goHasOrderFoodPage(context,
  226 + rid: custom["rid"], fromNotify: true);
  227 + // bus.emit("remove_untreated_message_order", notifyParam["rid"]);
  228 +
  229 + Map<String, String> params = {
  230 + "sid": Provider.of<UserModel>(context, listen: false)
  231 + .user
  232 + .sellerid,
  233 + "id": custom['mid'],
  234 + "status": "is_read"
  235 + };
  236 + MessageDialogModel messageDialogModel =
  237 + Provider.of<MessageDialogModel>(context, listen: false);
  238 + await messageDialogModel.setMessageStatus(context, params);
  239 + // bus.emit("refresh_untreated_num"); //刷新未读消息数目
  240 +
  241 + break;
224 } 242 }
225 } 243 }
226 }, 244 },
@@ -40,6 +40,9 @@ class MessageItem extends StatelessWidget { @@ -40,6 +40,9 @@ class MessageItem extends StatelessWidget {
40 context, message.rid.toString()); 40 context, message.rid.toString());
41 } else if (message.message_type == "1") { 41 } else if (message.message_type == "1") {
42 NavigatorUtil.goHasOrderFoodPage(context, rid: message.rid); 42 NavigatorUtil.goHasOrderFoodPage(context, rid: message.rid);
  43 + } else if (message.message_type == "11") {
  44 + NavigatorUtil.goNotebookDetailPage(
  45 + context, message.rid.toString());
43 } 46 }
44 } 47 }
45 }, 48 },