From e1542212aad1ddaa14477c0b40adf0ed9f6a9063 Mon Sep 17 00:00:00 2001 From: fuenmao <980740792@qq.com> Date: Tue, 17 Dec 2024 16:31:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=8F=91=E8=A8=80=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=92=8C=E5=B8=83=E5=B1=80=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/pages/metting/meeting_main_view.dart | 132 ++++++++++-------- wgshare/lib/utils/color_util.dart | 2 + 2 files changed, 75 insertions(+), 59 deletions(-) diff --git a/wgshare/lib/pages/metting/meeting_main_view.dart b/wgshare/lib/pages/metting/meeting_main_view.dart index 8722e15..22f2560 100644 --- a/wgshare/lib/pages/metting/meeting_main_view.dart +++ b/wgshare/lib/pages/metting/meeting_main_view.dart @@ -164,22 +164,6 @@ class MeetingMainPageState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.end, children: [ - /// 结束发言 - Visibility( - visible: state.isSpeak.value, - child: GestureDetector( - child: Image.asset( - 'assets/images/meeting_main_hang_up.png', - width: 22.w, - height: 22.h, - ), - onTap: () { - logic.cancelSpeak(); - }, - ), - ), - SizedBox(width: 16.w), - /// 退出会议 GestureDetector( child: Image.asset( @@ -288,52 +272,82 @@ class MeetingMainPageState extends State { ) : Container()), - GestureDetector( - child: Container( - width: 180.w, - height: 40.h, - margin: + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + GestureDetector( + child: Container( + width: 200.w, + height: 40.h, + margin: const EdgeInsets.only(left: 20, bottom: 40), - padding: const EdgeInsets.only(left: 20), - decoration: BoxDecoration( - borderRadius: const BorderRadius.only( - bottomLeft: Radius.circular(56), - topRight: Radius.circular(50), - bottomRight: Radius.circular(50)), - color: ColorUtil.Color_35_35_35_07, - border: Border.all( - width: 1.w, - color: ColorUtil.Color_99_111_158), - ), - child: Row( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Image.asset( - 'assets/images/meeting_main_chat.png', - width: 18.w, - height: 18.h, + padding: const EdgeInsets.only(left: 20), + decoration: BoxDecoration( + borderRadius: const BorderRadius.only( + bottomLeft: Radius.circular(56), + topRight: Radius.circular(50), + bottomRight: Radius.circular(50)), + color: ColorUtil.Color_35_35_35_07, + border: Border.all( + width: 1.w, + color: ColorUtil.Color_99_111_158), ), - SizedBox(width: 6.w), - Text( - '说点什么...', - style: TextStyle( - fontSize: 14.sp, - color: ColorUtil.Color_156_156_156), - ) - ], + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Image.asset( + 'assets/images/meeting_main_chat.png', + width: 18.w, + height: 18.h, + ), + SizedBox(width: 6.w), + Text( + '说点什么...', + style: TextStyle( + fontSize: 14.sp, + color: ColorUtil.Color_156_156_156), + ) + ], + ), + ), + onTap: () { + Get.bottomSheet( + isScrollControlled: true, + chatBottomSheet(context)); + Future.delayed(const Duration(milliseconds: 100), + () { + state.chatController.jumpTo(state + .chatController.position.maxScrollExtent); + }); + }, ), - ), - onTap: () { - Get.bottomSheet( - isScrollControlled: true, - chatBottomSheet(context)); - Future.delayed(const Duration(milliseconds: 100), - () { - state.chatController.jumpTo(state - .chatController.position.maxScrollExtent); - }); - }, + + Visibility( + visible: state.isSpeak.value, + child: GestureDetector( + child: Container( + width: 82.w, + height: 40.h, + margin: const EdgeInsets.only(left: 12, bottom: 40,right: 20), + alignment: Alignment.center, + decoration: const BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(99)), + color: ColorUtil.Color_255_69_69 + ), + child: Text( + '结束发言', + style: TextStyle( + fontSize: 14.sp, + color: ColorUtil.Color_255_255_255), + ), + ), + onTap: () { + logic.cancelSpeak(); + }, + ), + ) + ], ) ], ), diff --git a/wgshare/lib/utils/color_util.dart b/wgshare/lib/utils/color_util.dart index 9bc5baa..68d30c9 100644 --- a/wgshare/lib/utils/color_util.dart +++ b/wgshare/lib/utils/color_util.dart @@ -71,6 +71,8 @@ class ColorUtil { static const Color_16_19_13 = Color.fromRGBO(16, 19, 13, 1); + static const Color_255_69_69 = Color.fromRGBO(255, 69, 69, 1); + /// 十六进制颜色， /// hex, 十六进制值，例如：0xffffff, /// alpha, 透明度 [0.0,1.0]