Commit d66f0f4f authored by skeyboy's avatar skeyboy

调整登陆页/屏蔽掉tts功能

parent 6c89421a
...@@ -243,8 +243,8 @@ class _DefaultMessageTextState extends State<DefaultMessageText> { ...@@ -243,8 +243,8 @@ class _DefaultMessageTextState extends State<DefaultMessageText> {
return ClipRRect( return ClipRRect(
borderRadius: BorderRadius.circular(5), borderRadius: BorderRadius.circular(5),
child: Container( child: Container(
width: 100, width: 90,
padding: EdgeInsets.only(left: 5, top: 5, right: 5, bottom: 5), padding: EdgeInsets.only(left: 0, top: 5, right: 0, bottom: 5),
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: LinearGradient( gradient: LinearGradient(
colors: [Color(0xFF3d3f54), Color(0xFF333450), Color(0xFF2b2b4d)], colors: [Color(0xFF3d3f54), Color(0xFF333450), Color(0xFF2b2b4d)],
......
...@@ -131,48 +131,63 @@ class MessageRow extends StatelessWidget { ...@@ -131,48 +131,63 @@ class MessageRow extends StatelessWidget {
// messageLength: messageLength, // messageLength: messageLength,
), ),
if (message.text.isNotEmpty) if (message.text.isNotEmpty)
(isOwnMessage (TextContainer(
? TextContainer( index: index,
index: index, messageOptions: messageOptions,
messageOptions: messageOptions, message: message,
message: message, messageLength: messageLength,
messageLength: messageLength, previousMessage: previousMessage,
previousMessage: previousMessage, nextMessage: nextMessage,
nextMessage: nextMessage, isOwnMessage: isOwnMessage,
isOwnMessage: isOwnMessage, isNextSameAuthor: isNextSameAuthor,
isNextSameAuthor: isNextSameAuthor, isPreviousSameAuthor: isPreviousSameAuthor,
isPreviousSameAuthor: isPreviousSameAuthor, isAfterDateSeparator: isAfterDateSeparator,
isAfterDateSeparator: isAfterDateSeparator, isBeforeDateSeparator: isBeforeDateSeparator,
isBeforeDateSeparator: isBeforeDateSeparator, messageTextBuilder:
messageTextBuilder: messageOptions.messageTextBuilder,
messageOptions.messageTextBuilder, )),
) // (isOwnMessage
: Row( // ? TextContainer(
mainAxisAlignment: MainAxisAlignment.spaceBetween, // index: index,
crossAxisAlignment: CrossAxisAlignment.start, // messageOptions: messageOptions,
children: [ // message: message,
Expanded( // messageLength: messageLength,
child: TextContainer( // previousMessage: previousMessage,
index: index, // nextMessage: nextMessage,
messageOptions: messageOptions, // isOwnMessage: isOwnMessage,
message: message, // isNextSameAuthor: isNextSameAuthor,
messageLength: messageLength, // isPreviousSameAuthor: isPreviousSameAuthor,
previousMessage: previousMessage, // isAfterDateSeparator: isAfterDateSeparator,
nextMessage: nextMessage, // isBeforeDateSeparator: isBeforeDateSeparator,
isOwnMessage: isOwnMessage, // messageTextBuilder:
isNextSameAuthor: isNextSameAuthor, // messageOptions.messageTextBuilder,
isPreviousSameAuthor: isPreviousSameAuthor, // )
isAfterDateSeparator: isAfterDateSeparator, // : Row(
isBeforeDateSeparator: isBeforeDateSeparator, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
messageTextBuilder: // crossAxisAlignment: CrossAxisAlignment.start,
messageOptions.messageTextBuilder, // children: [
)), // Expanded(
Padding( // child: TextContainer(
key: ValueKey(message.hashCode), // index: index,
padding: EdgeInsets.only(left: 10, top: 15), // messageOptions: messageOptions,
child: ChartTTSWave(text: message.text, message: message,)), // message: message,
], // messageLength: messageLength,
)), // previousMessage: previousMessage,
// nextMessage: nextMessage,
// isOwnMessage: isOwnMessage,
// isNextSameAuthor: isNextSameAuthor,
// isPreviousSameAuthor: isPreviousSameAuthor,
// isAfterDateSeparator: isAfterDateSeparator,
// isBeforeDateSeparator: isBeforeDateSeparator,
// messageTextBuilder:
// messageOptions.messageTextBuilder,
// )),
// Padding(
// key: ValueKey(message.hashCode),
// padding: EdgeInsets.only(left: 10, top: 15),
// child: ChartTTSWave(text: message.text, message: message,)),
// ],
// )),
if (message.medias != null && if (message.medias != null &&
message.medias!.isNotEmpty && message.medias!.isNotEmpty &&
!messageOptions.textBeforeMedia) !messageOptions.textBeforeMedia)
......
...@@ -124,7 +124,7 @@ class SignInPage extends GetView<SignInController> { ...@@ -124,7 +124,7 @@ class SignInPage extends GetView<SignInController> {
child: Text( child: Text(
textAlign: TextAlign.center, textAlign: TextAlign.center,
'+86', '+86',
style: TextStyle(color: mainColor, fontSize: 11), style: TextStyle(color: mainColor, fontSize: 12),
), ),
), ),
), ),
...@@ -143,7 +143,7 @@ class SignInPage extends GetView<SignInController> { ...@@ -143,7 +143,7 @@ class SignInPage extends GetView<SignInController> {
color: Colors.grey, color: Colors.grey,
fontFamily: "Avenir", fontFamily: "Avenir",
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
fontSize: 11, fontSize: 12,
), ),
maxLines: 1, maxLines: 1,
autocorrect: false, autocorrect: false,
...@@ -189,7 +189,7 @@ class SignInPage extends GetView<SignInController> { ...@@ -189,7 +189,7 @@ class SignInPage extends GetView<SignInController> {
color: Colors.grey, color: Colors.grey,
fontFamily: "Avenir", fontFamily: "Avenir",
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
fontSize: 11, fontSize: 12,
), ),
maxLines: 1, maxLines: 1,
autocorrect: false, autocorrect: false,
...@@ -630,7 +630,7 @@ class SignInPage extends GetView<SignInController> { ...@@ -630,7 +630,7 @@ class SignInPage extends GetView<SignInController> {
child: Center( child: Center(
child: Text( child: Text(
'未注册的手机号验证通过后将自动通过', '未注册的手机号验证通过后将自动通过',
style: TextStyle(fontSize: 10, color: Colors.white70), style: TextStyle(fontSize: 12, color: Colors.white70),
), ),
), ),
), ),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment