消息数

@@ -12,14 +12,14 @@ if (flutterRoot == null) {
 }
 
 
-def flutterVersionCode = "393"
+def flutterVersionCode = "394"
 if (flutterVersionCode == null) {
-    flutterVersionCode = '393'
+    flutterVersionCode = '394'
 }
 
-def flutterVersionName = "3.9.3"
+def flutterVersionName = "3.9.4"
 if (flutterVersionName == null) {
-    flutterVersionName = '3.9.3'
+    flutterVersionName = '3.9.4'
 }
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 50;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -487,7 +487,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 392;
+				CURRENT_PROJECT_VERSION = 393;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
@@ -502,7 +502,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.9.2;
+				MARKETING_VERSION = 3.9.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -633,7 +633,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 392;
+				CURRENT_PROJECT_VERSION = 393;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
@@ -648,7 +648,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.9.2;
+				MARKETING_VERSION = 3.9.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -669,7 +669,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 392;
+				CURRENT_PROJECT_VERSION = 393;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
@@ -684,7 +684,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.9.2;
+				MARKETING_VERSION = 3.9.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";

@@ -420,7 +420,7 @@ class MessageDialogItemF extends StatelessWidget {
                                 : Text(
                                     message.message_type == "11"
                                         ? '取消操作人：顾客在线取消'
-                                        : '取消操作人：${message.nickName}',
+                                        : '取消操作人：${message.nickName ?? ''}',
                                     style: TextStyle(
                                         color: isTreated
                                             ? MyColours.color_BFC4D4

@@ -461,7 +461,7 @@ class MessageItemF extends StatelessWidget {
                                 : Text(
                                     message.message_type == "11"
                                         ? '取消操作人：顾客在线取消'
-                                        : '取消操作人：${message.nickName}',
+                                        : '取消操作人：${message.nickName ?? ''}',
                                     style: TextStyle(
                                         color: isTreated
                                             ? MyColours.color_BFC4D4

@@ -105,7 +105,7 @@ class MessageModel extends ChangeNotifier {
     }
   }
 
-  //获取未处理消息数目
+//获取未处理消息数目
   getNewGetUntreatedMsgNum(BuildContext context, Map<String, String> params,
       {showLoading = true}) async {
     if (showLoading) {
@@ -120,25 +120,50 @@ class MessageModel extends ChangeNotifier {
         .catchError((error) {
       print(error.toString());
       PageState pageStateTemp;
-      if (error is MyError) {
-        switch (error.type) {
-          case 1:
-            pageStateUn = PageState.ConnectivityError;
-            break;
-          case 2:
-            pageStateUn = PageState.ConnectivityTimeOut;
-            break;
-          default:
-            pageStateUn = PageState.ConnectivityError;
-            break;
-        }
-      }
+      // if (error is MyError) {
+      //   switch (error.type) {
+      //     case 1:
+      //       pageStateUn = PageState.ConnectivityError;
+      //       break;
+      //     case 2:
+      //       pageStateUn = PageState.ConnectivityTimeOut;
+      //       break;
+      //     default:
+      //       pageStateUn = PageState.ConnectivityError;
+      //       break;
+      //   }
+      // }
 
-      notifyListeners();
+      // notifyListeners();
     });
     if (baseResp != null && baseResp.code == Constant.status_success) {
-      allUnNum = baseResp.data['count'];
+      int tempnum = 0;
+      String uid = Provider.of<UserModel>(context, listen: false).user.openid;
+      List<NewUnmessage> temp = [];
+      if (params['offset'] == "0") {
+        messages = baseResp.data['list'].map<NewUnmessage>((value) {
+          return NewUnmessage.fromJson(value);
+        }).toList();
+      } else {
+        messages.addAll(baseResp.data['list'].map<NewUnmessage>((value) {
+          return NewUnmessage.fromJson(value);
+        }).toList());
+      }
+      temp.addAll(messages);
+      messages = [];
 
+      temp.forEach((element) {
+        if (element.uid == uid && element.message_type == '16') {
+          tempnum++;
+        } else {
+          messages.add(element);
+        }
+      });
+      if (tempnum > 0) {
+        allUnNum = baseResp.data['count'] - tempnum;
+      } else {
+        allUnNum = baseResp.data['count'];
+      }
       notifyListeners();
     }
   }

@@ -39,8 +39,8 @@ class FTableItemState extends State<FTableItem> {
     t.Table table = widget.table;
 
     String signStr = table.signStr;
-    if (table.sign == '5' && widget.tableMap[table.id].orderInfo != null) {
-      if (widget.tableMap[table.id].orderInfo.status == '3') {
+    if (table.sign == '5' && widget.tableMap[table.id]?.orderInfo != null) {
+      if (widget.tableMap[table.id].orderInfo?.status == '3') {
         signStr = '已买单';
       }
     }