From 1d356d1ad7f8b7e35921d10deb57ea00e970befd Mon Sep 17 00:00:00 2001 From: tanlongsheng <252620078@qq.com> Date: Mon, 31 Mar 2025 17:18:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E5=8A=A9=E6=89=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/views/meeting_details_view.dart | 47 +++++++++++++++---- .../meeting/views/meeting_edit_view.dart | 4 +- 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/lib/modules/meeting/views/meeting_details_view.dart b/lib/modules/meeting/views/meeting_details_view.dart index 712af6131..418e134cb 100644 --- a/lib/modules/meeting/views/meeting_details_view.dart +++ b/lib/modules/meeting/views/meeting_details_view.dart @@ -219,13 +219,44 @@ class MeetingDetailsView extends GetView { ), ], ), - child: Align( - alignment: Alignment.topLeft, - child: SingleChildScrollView( - reverse: true, - child: Text( - controller.dataDetails.value.content, - ), + child: DefaultTabController( + length: 2, + child: Column( + children: [ + SizedBox( + height: 40.w, + child: TabBar( + indicatorSize: TabBarIndicatorSize.tab, + indicatorColor: isDarkMode ? AppColors.primary : Colors.blue, + labelColor: isDarkMode ? AppColors.primary : Colors.blue, + labelStyle: TextStyle( + color: isDarkMode ? Colors.white : Colors.black87, + fontSize: 14.sp, + ), + tabs: const [ + Tab(text: 'AI总结'), + Tab(text: '会议原文'), + ], + ), + ), + 10.verticalSpace, + Expanded( + child: TabBarView( + children: [ + SingleChildScrollView( + child: Text( + controller.dataDetails.value.content, + ), + ), + SingleChildScrollView( + child: Text( + controller.dataDetails.value.content, + ), + ), + ], + ), + ), + ], ), ), ), @@ -235,7 +266,7 @@ class MeetingDetailsView extends GetView { // 底部按钮 Widget _bottomButton(bool isDarkMode) { return Container( - padding: EdgeInsets.only(top: 40.w, bottom: 30.w), + padding: EdgeInsets.only(top: 20.w, bottom: 10.w), alignment: Alignment.center, child: GestureDetector( onTap: () { diff --git a/lib/modules/meeting/views/meeting_edit_view.dart b/lib/modules/meeting/views/meeting_edit_view.dart index 7c65afd10..791a75b85 100644 --- a/lib/modules/meeting/views/meeting_edit_view.dart +++ b/lib/modules/meeting/views/meeting_edit_view.dart @@ -271,9 +271,7 @@ class MeetingEditView extends GetView { fillColor: Colors.transparent, border: InputBorder.none, focusedBorder: InputBorder.none, - contentPadding: EdgeInsets.symmetric( - horizontal: 10.w, - ), + contentPadding: EdgeInsets.zero, ), ), ), From f8ae302ba307be2660dbfc919b9f216e953b0409 Mon Sep 17 00:00:00 2001 From: tanlongsheng <252620078@qq.com> Date: Mon, 31 Mar 2025 17:52:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E5=8A=A9=E6=89=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/views/meeting_details_view.dart | 53 +++++++++++++------ .../meeting/views/meeting_edit_view.dart | 16 ++++++ .../meeting/views/meeting_record_view.dart | 53 +++++++++++++------ 3 files changed, 92 insertions(+), 30 deletions(-) diff --git a/lib/modules/meeting/views/meeting_details_view.dart b/lib/modules/meeting/views/meeting_details_view.dart index 418e134cb..476411f46 100644 --- a/lib/modules/meeting/views/meeting_details_view.dart +++ b/lib/modules/meeting/views/meeting_details_view.dart @@ -56,24 +56,47 @@ class MeetingDetailsView extends GetView { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text( - controller.meetingData.value.title, - style: TextStyle( - color: isDarkMode ? Colors.white : Colors.black87, - fontSize: 17.sp, - ), + Row( + children: [ + Expanded( + child: Text( + controller.meetingData.value.title, + style: TextStyle( + color: isDarkMode ? Colors.white : Colors.black87, + fontSize: 17.sp, + ), + ), + ), + 10.horizontalSpace, + Text( + DateUtil.formatDateMs( + controller.meetingData.value.creationtime, + format: DateFormats.y_mo_d_h_m, + ), + style: TextStyle( + color: isDarkMode ? Colors.grey[400] : Colors.grey[500], + fontSize: 14.sp, + ), + ), + ], ), Padding( padding: EdgeInsets.symmetric(vertical: 5.w), - child: Text( - DateUtil.formatDateMs( - controller.meetingData.value.creationtime, - format: DateFormats.y_mo_d_h_m, - ), - style: TextStyle( - color: isDarkMode ? Colors.grey[400] : Colors.grey[500], - fontSize: 14.sp, - ), + child: Row( + children: [ + Icon( + Icons.location_on, + size: 16.w, + color: isDarkMode ? Colors.grey[400] : Colors.grey[500], + ), + Text( + '深圳市高新技术产业园区W2-A座', + style: TextStyle( + color: isDarkMode ? Colors.grey[400] : Colors.grey[500], + fontSize: 14.sp, + ), + ), + ], ), ), _audioWave(isDarkMode), diff --git a/lib/modules/meeting/views/meeting_edit_view.dart b/lib/modules/meeting/views/meeting_edit_view.dart index 791a75b85..19a9e0f22 100644 --- a/lib/modules/meeting/views/meeting_edit_view.dart +++ b/lib/modules/meeting/views/meeting_edit_view.dart @@ -112,6 +112,22 @@ class MeetingEditView extends GetView { ), ), ), + Row( + children: [ + Icon( + Icons.location_on, + size: 16.w, + color: isDarkMode ? Colors.grey[400] : Colors.grey[500], + ), + Text( + '深圳市高新技术产业园区W2-A座', + style: TextStyle( + color: isDarkMode ? Colors.grey[400] : Colors.grey[500], + fontSize: 14.sp, + ), + ), + ], + ), _audioWave(isDarkMode), _recordContent(isDarkMode), ], diff --git a/lib/modules/meeting/views/meeting_record_view.dart b/lib/modules/meeting/views/meeting_record_view.dart index f3467ce11..ede144d9c 100644 --- a/lib/modules/meeting/views/meeting_record_view.dart +++ b/lib/modules/meeting/views/meeting_record_view.dart @@ -96,25 +96,48 @@ class MeetingRecordView extends GetView { 10.verticalSpace, Padding( padding: EdgeInsets.symmetric(horizontal: 12.w), - child: Text( - controller.title, - style: TextStyle( - color: isDarkMode ? Colors.white : Colors.black87, - fontSize: 17.sp, - ), + child: Row( + children: [ + Expanded( + child: Text( + controller.title, + style: TextStyle( + color: isDarkMode ? Colors.white : Colors.black87, + fontSize: 17.sp, + ), + ), + ), + 10.horizontalSpace, + Text( + DateUtil.formatDateMs( + controller.creationTime, + format: DateFormats.y_mo_d_h_m, + ), + style: TextStyle( + color: isDarkMode ? Colors.grey[400] : Colors.grey[500], + fontSize: 14.sp, + ), + ), + ], ), ), Padding( padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 5.w), - child: Text( - DateUtil.formatDateMs( - controller.creationTime, - format: DateFormats.y_mo_d_h_m, - ), - style: TextStyle( - color: isDarkMode ? Colors.grey[400] : Colors.grey[500], - fontSize: 14.sp, - ), + child: Row( + children: [ + Icon( + Icons.location_on, + size: 16.w, + color: isDarkMode ? Colors.grey[400] : Colors.grey[500], + ), + Text( + '深圳市高新技术产业园区W2-A座', + style: TextStyle( + color: isDarkMode ? Colors.grey[400] : Colors.grey[500], + fontSize: 14.sp, + ), + ), + ], ), ), _recordContent(isDarkMode),