hy/yumi-flutter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: hy:a73e2ff14bd2bfd46b9dbdcfe33b5bf42edce29b
Branches Tags
hy:main
hy:codex/perf-revival-start
hy:bug-fix
hy:develop
hy:feature
hy:test
..
compare: hy:13d0d1ef84d5bfb3acbdff119d6f58e4dc6338c6
Branches Tags
hy:main
hy:codex/perf-revival-start
hy:bug-fix
hy:develop
hy:feature
hy:test

No commits in common. "a73e2ff14bd2bfd46b9dbdcfe33b5bf42edce29b" and "13d0d1ef84d5bfb3acbdff119d6f58e4dc6338c6" have entirely different histories.
a73e2ff14b ... 13d0d1ef84

1 changed files with 71 additions and 82 deletions
Show Stats Expand all files Collapse all files

153
lib/modules/chat/message_chat_page.dart
View File

@ -1250,10 +1250,7 @@ class _MessageItem extends StatelessWidget {
_isDuplicateCpInviteMessageForConversation(customData)) { _isDuplicateCpInviteMessageForConversation(customData)) {
return const SizedBox.shrink(); return const SizedBox.shrink();
} }
final isCpInviteMessage = final cpRelationFormedCard = _cpRelationFormedMessageCard();
customData != null && _isCpInvitePayload(customData);
final cpRelationFormedCard =
isCpInviteMessage ? null : _cpRelationFormedMessageCard();
final cpStatusLineText = _cpStatusLineTextForMessage(); final cpStatusLineText = _cpStatusLineTextForMessage();
return Container( return Container(
margin: EdgeInsets.symmetric(horizontal: 15.w, vertical: 8.w), margin: EdgeInsets.symmetric(horizontal: 15.w, vertical: 8.w),
@ -1307,85 +1304,77 @@ class _MessageItem extends StatelessWidget {
), ),
child: cpRelationFormedCard, child: cpRelationFormedCard,
) )
else if (cpStatusLineText == null || isCpInviteMessage) else if (cpStatusLineText == null)
Padding( Row(
padding: EdgeInsets.only( crossAxisAlignment: CrossAxisAlignment.start,
top: cpStatusLineText == null ? 0 : 10.w, mainAxisSize: MainAxisSize.min,
), textDirection:
child: Row( message.isSelf! ? TextDirection.rtl : TextDirection.ltr,
crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
mainAxisSize: MainAxisSize.min, GestureDetector(
textDirection: behavior: HitTestBehavior.opaque,
message.isSelf! ? TextDirection.rtl : TextDirection.ltr, onTap: () {
children: <Widget>[ if (isSystem) {
GestureDetector( return;
behavior: HitTestBehavior.opaque, }
onTap: () { SCNavigatorUtils.push(
if (isSystem) { context,
return; replace:
} AccountStorage().getCurrentUser()?.userProfile?.id !=
SCNavigatorUtils.push( message.sender,
context, "${SCMainRoute.person}?isMe=${AccountStorage().getCurrentUser()?.userProfile?.id == message.sender}&tageId=${message.sender}",
replace: );
AccountStorage() },
.getCurrentUser() child:
?.userProfile message.sender == "administrator" ||
?.id != message.sender == "customer"
message.sender, ? ExtendedImage.asset(
"${SCMainRoute.person}?isMe=${AccountStorage().getCurrentUser()?.userProfile?.id == message.sender}&tageId=${message.sender}", _strategy.getSCMessageChatPageSystemHeadImage(),
); width: 45.w,
}, shape: BoxShape.circle,
child: fit: BoxFit.cover,
message.sender == "administrator" || )
message.sender == "customer" : netImage(
? ExtendedImage.asset( url:
_strategy.getSCMessageChatPageSystemHeadImage(), message.isSelf!
width: 45.w, ? (me?.userAvatar ?? "")
shape: BoxShape.circle, : (friend?.userAvatar ?? ""),
fit: BoxFit.cover, shape: BoxShape.circle,
) width: width(45),
: netImage( ),
url: ),
message.isSelf! // 他人消息的阴影间隔是10dp
? (me?.userAvatar ?? "") Container(width: 8.w),
: (friend?.userAvatar ?? ""), Row(
shape: BoxShape.circle, textDirection:
width: width(45), message.isSelf! ? TextDirection.rtl : TextDirection.ltr,
), children: <Widget>[
), Container(
// 他人消息的阴影间隔是10dp alignment:
Container(width: 8.w), message.isSelf!
Row( ? AlignmentDirectional.topEnd
textDirection: : AlignmentDirectional.topStart,
message.isSelf! ? TextDirection.rtl : TextDirection.ltr, margin: EdgeInsets.only(top: 4.w),
children: <Widget>[ child: _msg(),
Container( ),
alignment: SizedBox(width: 6.w),
message.isSelf! Visibility(
? AlignmentDirectional.topEnd visible:
: AlignmentDirectional.topStart, message.status ==
margin: EdgeInsets.only(top: 4.w), MessageStatus.V2TIM_MSG_STATUS_SENDING,
child: _msg(), child: CupertinoActivityIndicator(),
), ),
SizedBox(width: 6.w),
Visibility(
visible:
message.status ==
MessageStatus.V2TIM_MSG_STATUS_SENDING,
child: CupertinoActivityIndicator(),
),
Visibility( Visibility(
visible: visible:
message.status == message.status ==
MessageStatus.V2TIM_MSG_STATUS_SEND_FAIL, MessageStatus.V2TIM_MSG_STATUS_SEND_FAIL,
child: Icon(Icons.error, color: Colors.red), child: Icon(Icons.error, color: Colors.red),
), ),
], ],
), ),
Spacer(), Spacer(),
], ],
),
), ),
], ],
), ),