Merge commit '03119240fe96c3d46c1cc2ed453aa250d78fa67b' into lxm

lib/modules/meeting/views/meeting_details_view.dart

@@ -56,24 +56,47 @@ class MeetingDetailsView extends GetView<MeetingDetailsController> {
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Text(
+          Row(
-            controller.meetingData.value.title,
+            children: [
-            style: TextStyle(
+              Expanded(
-              color: isDarkMode ? Colors.white : Colors.black87,
+                child: Text(
-              fontSize: 17.sp,
+                  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(
+            child: Row(
-              DateUtil.formatDateMs(
+              children: [
-                controller.meetingData.value.creationtime,
+                Icon(
-                format: DateFormats.y_mo_d_h_m,
+                  Icons.location_on,
-              ),
+                  size: 16.w,
-              style: TextStyle(
+                  color: isDarkMode ? Colors.grey[400] : Colors.grey[500],
-                color: isDarkMode ? Colors.grey[400] : Colors.grey[500],
+                ),
-                fontSize: 14.sp,
+                Text(
-              ),
+                  '深圳市高新技术产业园区W2-A座',
+                  style: TextStyle(
+                    color: isDarkMode ? Colors.grey[400] : Colors.grey[500],
+                    fontSize: 14.sp,
+                  ),
+                ),
+              ],
             ),
           ),
           _audioWave(isDarkMode),
@@ -219,13 +242,44 @@ class MeetingDetailsView extends GetView<MeetingDetailsController> {
             ),
           ],
         ),
-        child: Align(
+        child: DefaultTabController(
-          alignment: Alignment.topLeft,
+          length: 2,
-          child: SingleChildScrollView(
+          child: Column(
-            reverse: true,
+            children: [
-            child: Text(
+              SizedBox(
-              controller.dataDetails.value.content,
+                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 +289,7 @@ class MeetingDetailsView extends GetView<MeetingDetailsController> {
   // 底部按钮
   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: () {

lib/modules/meeting/views/meeting_edit_view.dart

@@ -112,6 +112,22 @@ class MeetingEditView extends GetView<MeetingEditController> {
               ),
             ),
           ),
+          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),
         ],
@@ -271,9 +287,7 @@ class MeetingEditView extends GetView<MeetingEditController> {
             fillColor: Colors.transparent,
             border: InputBorder.none,
             focusedBorder: InputBorder.none,
-            contentPadding: EdgeInsets.symmetric(
+            contentPadding: EdgeInsets.zero,
-              horizontal: 10.w,
-            ),
           ),
         ),
       ),

lib/modules/meeting/views/meeting_record_view.dart

@@ -96,25 +96,48 @@ class MeetingRecordView extends GetView<MeetingRecordController> {
         10.verticalSpace,
         Padding(
           padding: EdgeInsets.symmetric(horizontal: 12.w),
-          child: Text(
+          child: Row(
-            controller.title,
+            children: [
-            style: TextStyle(
+              Expanded(
-              color: isDarkMode ? Colors.white : Colors.black87,
+                child: Text(
-              fontSize: 17.sp,
+                  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(
+          child: Row(
-            DateUtil.formatDateMs(
+            children: [
-              controller.creationTime,
+              Icon(
-              format: DateFormats.y_mo_d_h_m,
+                Icons.location_on,
-            ),
+                size: 16.w,
-            style: TextStyle(
+                color: isDarkMode ? Colors.grey[400] : Colors.grey[500],
-              color: isDarkMode ? Colors.grey[400] : Colors.grey[500],
+              ),
-              fontSize: 14.sp,
+              Text(
-            ),
+                '深圳市高新技术产业园区W2-A座',
+                style: TextStyle(
+                  color: isDarkMode ? Colors.grey[400] : Colors.grey[500],
+                  fontSize: 14.sp,
+                ),
+              ),
+            ],
           ),
         ),
         _recordContent(isDarkMode),