xt / Flutter-ReserveApp · Commits

Go to a project

Commit afc9a34588c2826b4d838641c9db0fd2839739f0

Authored by wdn127929
1 parent 8cb67fc6
build: skipped

宴会看板OK

Inline Side-by-side
Showing 3 changed files with 37 additions and 24 deletions
... ... @@ -12,14 +12,14 @@ if (flutterRoot == null) {
}
def flutterVersionCode = "402"
def flutterVersionCode = "403"
if (flutterVersionCode == null) {
flutterVersionCode = '402'
flutterVersionCode = '403'
}
def flutterVersionName = "4.0.2"
def flutterVersionName = "4.0.3"
if (flutterVersionName == null) {
flutterVersionName = '4.0.2'
flutterVersionName = '4.0.3'
}
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
... ...
... ... @@ -31,6 +31,14 @@ class FeastBoardSunModel {
String className;
String nickName;
String account;
String talbeStr;
String get talbeStrShow {
if (talbeStr.endsWith('、')) {
return talbeStr.substring(0, talbeStr.length - 1);
}
return talbeStr;
}
FeastBoardSunModel(
{this.rname,
... ... @@ -38,7 +46,8 @@ class FeastBoardSunModel {
this.rid,
this.className,
this.nickName,
this.account});
this.account,
this.talbeStr});
FeastBoardSunModel.fromJson(Map<String, dynamic> json) {
rname = json['rname'];
... ... @@ -47,6 +56,7 @@ class FeastBoardSunModel {
className = json['class_name'];
nickName = json['nick_name'];
account = json['account'];
talbeStr = json['talbeStr'];
}
Map<String, dynamic> toJson() {
... ... @@ -57,6 +67,7 @@ class FeastBoardSunModel {
data['class_name'] = this.className;
data['nick_name'] = this.nickName;
data['account'] = this.account;
data['talbeStr'] = this.talbeStr;
return data;
}
}
... ...
... ... @@ -95,28 +95,30 @@ class _FeastBoardItemState extends State<FeastBoardItem> {
child: Row(
mainAxisSize: MainAxisSize.min,
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(
'${boardSunModel.className}-${boardSunModel.rname}-桌子名称顿号隔开',
'${boardSunModel.className}-${boardSunModel.rname}-${boardSunModel.talbeStrShow}',
overflow: TextOverflow.ellipsis,
softWrap: true,
maxLines: 1,
style: TextStyle(
fontSize: font(14),
... ...