xt / Flutter-ReserveApp · Commits

Go to a project

Commit ee5628a05478a7d77cae39fe7447360625b9b4ab

Authored by wdn127929
1 parent 42529bd8
build: skipped

消息数

Inline Side-by-side
Showing 6 changed files with 56 additions and 31 deletions
@@ -12,14 +12,14 @@ if (flutterRoot == null) { @@ -12,14 +12,14 @@ if (flutterRoot == null) {
12 } 12 }
13 13
14 14
15 -def flutterVersionCode = "393" 15 +def flutterVersionCode = "394"
16 if (flutterVersionCode == null) { 16 if (flutterVersionCode == null) {
17 - flutterVersionCode = '393' 17 + flutterVersionCode = '394'
18 } 18 }
19 19
20 -def flutterVersionName = "3.9.3" 20 +def flutterVersionName = "3.9.4"
21 if (flutterVersionName == null) { 21 if (flutterVersionName == null) {
22 - flutterVersionName = '3.9.3' 22 + flutterVersionName = '3.9.4'
23 } 23 }
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
25 apply plugin: 'kotlin-android' 25 apply plugin: 'kotlin-android'
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 archiveVersion = 1; 3 archiveVersion = 1;
4 classes = { 4 classes = {
5 }; 5 };
6 - objectVersion = 46; 6 + objectVersion = 50;
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
@@ -487,7 +487,7 @@ @@ -487,7 +487,7 @@
487 CODE_SIGN_IDENTITY = "iPhone Developer"; 487 CODE_SIGN_IDENTITY = "iPhone Developer";
488 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 488 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
489 CODE_SIGN_STYLE = Automatic; 489 CODE_SIGN_STYLE = Automatic;
490 - CURRENT_PROJECT_VERSION = 392; 490 + CURRENT_PROJECT_VERSION = 393;
491 DEVELOPMENT_TEAM = 8J59HM8B82; 491 DEVELOPMENT_TEAM = 8J59HM8B82;
492 ENABLE_BITCODE = NO; 492 ENABLE_BITCODE = NO;
493 FLUTTER_BUILD_MODE = release; 493 FLUTTER_BUILD_MODE = release;
@@ -502,7 +502,7 @@ @@ -502,7 +502,7 @@
502 "$(inherited)", 502 "$(inherited)",
503 "$(PROJECT_DIR)/Flutter", 503 "$(PROJECT_DIR)/Flutter",
504 ); 504 );
505 - MARKETING_VERSION = 3.9.2; 505 + MARKETING_VERSION = 3.9.3;
506 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 506 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
507 PRODUCT_NAME = Runner; 507 PRODUCT_NAME = Runner;
508 PROVISIONING_PROFILE_SPECIFIER = ""; 508 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -633,7 +633,7 @@ @@ -633,7 +633,7 @@
633 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 633 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
634 CODE_SIGN_IDENTITY = "iPhone Developer"; 634 CODE_SIGN_IDENTITY = "iPhone Developer";
635 CODE_SIGN_STYLE = Automatic; 635 CODE_SIGN_STYLE = Automatic;
636 - CURRENT_PROJECT_VERSION = 392; 636 + CURRENT_PROJECT_VERSION = 393;
637 DEVELOPMENT_TEAM = 8J59HM8B82; 637 DEVELOPMENT_TEAM = 8J59HM8B82;
638 ENABLE_BITCODE = NO; 638 ENABLE_BITCODE = NO;
639 FLUTTER_BUILD_MODE = release; 639 FLUTTER_BUILD_MODE = release;
@@ -648,7 +648,7 @@ @@ -648,7 +648,7 @@
648 "$(inherited)", 648 "$(inherited)",
649 "$(PROJECT_DIR)/Flutter", 649 "$(PROJECT_DIR)/Flutter",
650 ); 650 );
651 - MARKETING_VERSION = 3.9.2; 651 + MARKETING_VERSION = 3.9.3;
652 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 652 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
653 PRODUCT_NAME = Runner; 653 PRODUCT_NAME = Runner;
654 PROVISIONING_PROFILE_SPECIFIER = ""; 654 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -669,7 +669,7 @@ @@ -669,7 +669,7 @@
669 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 669 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
670 CODE_SIGN_IDENTITY = "iPhone Developer"; 670 CODE_SIGN_IDENTITY = "iPhone Developer";
671 CODE_SIGN_STYLE = Automatic; 671 CODE_SIGN_STYLE = Automatic;
672 - CURRENT_PROJECT_VERSION = 392; 672 + CURRENT_PROJECT_VERSION = 393;
673 DEVELOPMENT_TEAM = 8J59HM8B82; 673 DEVELOPMENT_TEAM = 8J59HM8B82;
674 ENABLE_BITCODE = NO; 674 ENABLE_BITCODE = NO;
675 FLUTTER_BUILD_MODE = release; 675 FLUTTER_BUILD_MODE = release;
@@ -684,7 +684,7 @@ @@ -684,7 +684,7 @@
684 "$(inherited)", 684 "$(inherited)",
685 "$(PROJECT_DIR)/Flutter", 685 "$(PROJECT_DIR)/Flutter",
686 ); 686 );
687 - MARKETING_VERSION = 3.9.2; 687 + MARKETING_VERSION = 3.9.3;
688 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 688 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
689 PRODUCT_NAME = Runner; 689 PRODUCT_NAME = Runner;
690 PROVISIONING_PROFILE_SPECIFIER = ""; 690 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -420,7 +420,7 @@ class MessageDialogItemF extends StatelessWidget { @@ -420,7 +420,7 @@ class MessageDialogItemF extends StatelessWidget {
420 : Text( 420 : Text(
421 message.message_type == "11" 421 message.message_type == "11"
422 ? '取消操作人：顾客在线取消' 422 ? '取消操作人：顾客在线取消'
423 - : '取消操作人：${message.nickName}', 423 + : '取消操作人：${message.nickName ?? ''}',
424 style: TextStyle( 424 style: TextStyle(
425 color: isTreated 425 color: isTreated
426 ? MyColours.color_BFC4D4 426 ? MyColours.color_BFC4D4
@@ -461,7 +461,7 @@ class MessageItemF extends StatelessWidget { @@ -461,7 +461,7 @@ class MessageItemF extends StatelessWidget {
461 : Text( 461 : Text(
462 message.message_type == "11" 462 message.message_type == "11"
463 ? '取消操作人：顾客在线取消' 463 ? '取消操作人：顾客在线取消'
464 - : '取消操作人：${message.nickName}', 464 + : '取消操作人：${message.nickName ?? ''}',
465 style: TextStyle( 465 style: TextStyle(
466 color: isTreated 466 color: isTreated
467 ? MyColours.color_BFC4D4 467 ? MyColours.color_BFC4D4
@@ -105,7 +105,7 @@ class MessageModel extends ChangeNotifier { @@ -105,7 +105,7 @@ class MessageModel extends ChangeNotifier {
105 } 105 }
106 } 106 }
107 107
108 - //获取未处理消息数目 108 +//获取未处理消息数目
109 getNewGetUntreatedMsgNum(BuildContext context, Map<String, String> params, 109 getNewGetUntreatedMsgNum(BuildContext context, Map<String, String> params,
110 {showLoading = true}) async { 110 {showLoading = true}) async {
111 if (showLoading) { 111 if (showLoading) {
@@ -120,25 +120,50 @@ class MessageModel extends ChangeNotifier { @@ -120,25 +120,50 @@ class MessageModel extends ChangeNotifier {
120 .catchError((error) { 120 .catchError((error) {
121 print(error.toString()); 121 print(error.toString());
122 PageState pageStateTemp; 122 PageState pageStateTemp;
123 - if (error is MyError) {  
124 - switch (error.type) {  
125 - case 1:  
126 - pageStateUn = PageState.ConnectivityError;  
127 - break;  
128 - case 2:  
129 - pageStateUn = PageState.ConnectivityTimeOut;  
130 - break;  
131 - default:  
132 - pageStateUn = PageState.ConnectivityError;  
133 - break;  
134 - }  
135 - } 123 + // if (error is MyError) {
  124 + // switch (error.type) {
  125 + // case 1:
  126 + // pageStateUn = PageState.ConnectivityError;
  127 + // break;
  128 + // case 2:
  129 + // pageStateUn = PageState.ConnectivityTimeOut;
  130 + // break;
  131 + // default:
  132 + // pageStateUn = PageState.ConnectivityError;
  133 + // break;
  134 + // }
  135 + // }
136 136
137 - notifyListeners(); 137 + // notifyListeners();
138 }); 138 });
139 if (baseResp != null && baseResp.code == Constant.status_success) { 139 if (baseResp != null && baseResp.code == Constant.status_success) {
140 - allUnNum = baseResp.data['count']; 140 + int tempnum = 0;
  141 + String uid = Provider.of<UserModel>(context, listen: false).user.openid;
  142 + List<NewUnmessage> temp = [];
  143 + if (params['offset'] == "0") {
  144 + messages = baseResp.data['list'].map<NewUnmessage>((value) {
  145 + return NewUnmessage.fromJson(value);
  146 + }).toList();
  147 + } else {
  148 + messages.addAll(baseResp.data['list'].map<NewUnmessage>((value) {
  149 + return NewUnmessage.fromJson(value);
  150 + }).toList());
  151 + }
  152 + temp.addAll(messages);
  153 + messages = [];
141 154
  155 + temp.forEach((element) {
  156 + if (element.uid == uid && element.message_type == '16') {
  157 + tempnum++;
  158 + } else {
  159 + messages.add(element);
  160 + }
  161 + });
  162 + if (tempnum > 0) {
  163 + allUnNum = baseResp.data['count'] - tempnum;
  164 + } else {
  165 + allUnNum = baseResp.data['count'];
  166 + }
142 notifyListeners(); 167 notifyListeners();
143 } 168 }
144 } 169 }
@@ -39,8 +39,8 @@ class FTableItemState extends State<FTableItem> { @@ -39,8 +39,8 @@ class FTableItemState extends State<FTableItem> {
39 t.Table table = widget.table; 39 t.Table table = widget.table;
40 40
41 String signStr = table.signStr; 41 String signStr = table.signStr;
42 - if (table.sign == '5' && widget.tableMap[table.id].orderInfo != null) {  
43 - if (widget.tableMap[table.id].orderInfo.status == '3') { 42 + if (table.sign == '5' && widget.tableMap[table.id]?.orderInfo != null) {
  43 + if (widget.tableMap[table.id].orderInfo?.status == '3') {
44 signStr = '已买单'; 44 signStr = '已买单';
45 } 45 }
46 } 46 }