宴会看板OK

@@ -12,14 +12,14 @@ if (flutterRoot == null) {
 }
 }
 
 
 
 
-def flutterVersionCode = "402"
+def flutterVersionCode = "403"
 if (flutterVersionCode == null) {
 if (flutterVersionCode == null) {
-    flutterVersionCode = '402'
+    flutterVersionCode = '403'
 }
 }
 
 
-def flutterVersionName = "4.0.2"
+def flutterVersionName = "4.0.3"
 if (flutterVersionName == null) {
 if (flutterVersionName == null) {
-    flutterVersionName = '4.0.2'
+    flutterVersionName = '4.0.3'
 }
 }
 apply plugin: 'com.android.application'
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android'

@@ -31,6 +31,14 @@ class FeastBoardSunModel {
   String className;
   String className;
   String nickName;
   String nickName;
   String account;
   String account;
+  String talbeStr;
+
+  String get talbeStrShow {
+    if (talbeStr.endsWith('、')) {
+      return talbeStr.substring(0, talbeStr.length - 1);
+    }
+    return talbeStr;
+  }
 
 
   FeastBoardSunModel(
   FeastBoardSunModel(
       {this.rname,
       {this.rname,
@@ -38,7 +46,8 @@ class FeastBoardSunModel {
       this.rid,
       this.rid,
       this.className,
       this.className,
       this.nickName,
       this.nickName,
-      this.account});
+      this.account,
+      this.talbeStr});
 
 
   FeastBoardSunModel.fromJson(Map<String, dynamic> json) {
   FeastBoardSunModel.fromJson(Map<String, dynamic> json) {
     rname = json['rname'];
     rname = json['rname'];
@@ -47,6 +56,7 @@ class FeastBoardSunModel {
     className = json['class_name'];
     className = json['class_name'];
     nickName = json['nick_name'];
     nickName = json['nick_name'];
     account = json['account'];
     account = json['account'];
+    talbeStr = json['talbeStr'];
   }
   }
 
 
   Map<String, dynamic> toJson() {
   Map<String, dynamic> toJson() {
@@ -57,6 +67,7 @@ class FeastBoardSunModel {
     data['class_name'] = this.className;
     data['class_name'] = this.className;
     data['nick_name'] = this.nickName;
     data['nick_name'] = this.nickName;
     data['account'] = this.account;
     data['account'] = this.account;
+    data['talbeStr'] = this.talbeStr;
     return data;
     return data;
   }
   }
 }
 }

@@ -95,28 +95,30 @@ class _FeastBoardItemState extends State<FeastBoardItem> {
                           child: Row(
                           child: Row(
                               mainAxisSize: MainAxisSize.min,
                               mainAxisSize: MainAxisSize.min,
                               children: <Widget>[
                               children: <Widget>[
-                                Expanded(
-                                    flex: 3,
-                                    child: Container(
-                                      height: h(24),
-                                      // constraints: BoxConstraints.expand(),
-                                      alignment: Alignment.centerLeft,
-                                      margin: index ==
-                                              widget.boardModel.data[title]
-                                                      .length -
-                                                  1
-                                          ? EdgeInsets.zero
-                                          : EdgeInsets.only(bottom: h(16)),
-                                      padding: EdgeInsets.symmetric(
-                                          horizontal: w(4), vertical: w(2)),
-                                      decoration: BoxDecoration(
-                                        color: MyColours.color_438E93,
-                                        borderRadius:
-                                            BorderRadius.circular(w(5)),
+                                Container(
+                                    height: h(24),
+                                    // constraints: BoxConstraints.expand(),
+                                    alignment: Alignment.centerLeft,
+                                    margin: index ==
+                                            widget.boardModel.data[title]
+                                                    .length -
+                                                1
+                                        ? EdgeInsets.zero
+                                        : EdgeInsets.only(bottom: h(16)),
+                                    padding: EdgeInsets.symmetric(
+                                        horizontal: w(4), vertical: w(2)),
+                                    decoration: BoxDecoration(
+                                      color: MyColours.color_438E93,
+                                      borderRadius: BorderRadius.circular(w(5)),
+                                    ),
+                                    child: ConstrainedBox(
+                                      constraints: BoxConstraints(
+                                        maxWidth: w(227),
                                       ),
                                       ),
                                       child: Text(
                                       child: Text(
-                                        '${boardSunModel.className}-${boardSunModel.rname}-桌子名称顿号隔开',
+                                        '${boardSunModel.className}-${boardSunModel.rname}-${boardSunModel.talbeStrShow}',
                                         overflow: TextOverflow.ellipsis,
                                         overflow: TextOverflow.ellipsis,
+                                        softWrap: true,
                                         maxLines: 1,
                                         maxLines: 1,
                                         style: TextStyle(
                                         style: TextStyle(
                                             fontSize: font(14),
                                             fontSize: font(14),