Merge branch 'new_dev' of https://github.com/deepcloud2048/deep_voice into new_dev

lib/modules/meeting/controllers/meeting_record_controller.dart

@@ -138,7 +138,7 @@ class MeetingRecordController extends GetxController
     switch (audioType.value) {
       case 0:
         fileName.value = "现场录音";
-        _audioSourceType = false;
+        _audioSourceType = true;
         break;
       case 1:
         fileName.value = "音、视频录音";
@@ -271,7 +271,7 @@ class MeetingRecordController extends GetxController
   void _startHardwareServices() {
     switch (audioType.value) {
       case 0:
-        // _bleManager.openEncoder();
+        _bleManager.openEncoder();
         break;
       case 1:
         _bleManager.openDecoder();

lib/modules/meeting/views/meeting_details_view.dart

@@ -67,8 +67,9 @@ class MeetingDetailsView extends GetView<MeetingDetailsController> {
               ),
               onPressed: () => Get.back(),
             ),
-      title: Opacity(
+      title: Obx(
-        opacity: controller.isTop.value ? 1.0 : 0.0,
+        () => Opacity(
+          opacity: (1 - (controller.dragOffset.value / 100.w)).clamp(0.0, 1.0),
           child: Container(
             width: 170.w,
             padding: EdgeInsets.symmetric(horizontal: 2.w, vertical: 3.w),
@@ -134,8 +135,10 @@ class MeetingDetailsView extends GetView<MeetingDetailsController> {
                     controller.dragOffset.value = 210.w;
                     controller.isTop.value = false;
                   },
+                  behavior: HitTestBehavior.translucent,
                   child: SizedBox(
                     width: 130.w,
+                    height: 30.w,
                     child: FittedBox(
                       fit: BoxFit.scaleDown,
                       child: AudioFileWaveforms(
@@ -162,6 +165,7 @@ class MeetingDetailsView extends GetView<MeetingDetailsController> {
             ),
           ),
         ),
+      ),
       centerTitle: true,
       actions: [
         if (controller.isSpeakerText.value)
@@ -308,6 +312,7 @@ class MeetingDetailsView extends GetView<MeetingDetailsController> {
             child: TabBarView(
               controller: controller.tabController,
               physics: const NeverScrollableScrollPhysics(),
+              clipBehavior: Clip.none,
               children: [
                 Obx(
                   () => controller.isLoading.value
@@ -373,7 +378,9 @@ class MeetingDetailsView extends GetView<MeetingDetailsController> {
 
   Widget _soundWave(bool isDarkMode) {
     return Obx(
-      () => SizedBox(
+      () => Opacity(
+        opacity: (controller.dragOffset.value / 210.w).clamp(0.0, 1.0),
+        child: SizedBox(
           height: controller.dragOffset.value < 0
               ? 0
               : controller.dragOffset.value > 210.w
@@ -476,7 +483,8 @@ class MeetingDetailsView extends GetView<MeetingDetailsController> {
                           ),
                           GestureDetector(
                             onTap: () {
-                            if (controller.meetingData.value.filepath.isEmpty) {
+                              if (controller
+                                  .meetingData.value.filepath.isEmpty) {
                                 controller.downloadAudio();
                               } else {
                                 if (controller.isPlay.value) {
@@ -545,6 +553,7 @@ class MeetingDetailsView extends GetView<MeetingDetailsController> {
             ],
           ),
         ),
+      ),
     );
   }
 

lib/modules/meeting/views/tabs/summary_tab.dart

@@ -1,8 +1,10 @@
 import 'package:common_utils/common_utils.dart';
+import 'package:fleather/fleather.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
+import 'package:parchment/codecs.dart';
 
 import '../../../../data/services/db/sqflite_api.dart';
 import '../../controllers/meeting_details_controller.dart';
@@ -26,6 +28,10 @@ class _SummaryTabState extends State<SummaryTab> {
   final TextEditingController _addressController = TextEditingController();
   final TextEditingController _personnelController = TextEditingController();
 
+  final FocusNode _focusNode = FocusNode();
+  final GlobalKey<EditorState> _editorKey = GlobalKey();
+  FleatherController? _fleatherController;
+
   @override
   void initState() {
     super.initState();
@@ -39,6 +45,7 @@ class _SummaryTabState extends State<SummaryTab> {
             : '[输入与会人员]');
     _addressController.addListener(_handleAddressChanged);
     _personnelController.addListener(_handlePersonnelChanged);
+    _initController();
   }
 
   void _handleAddressChanged() {
@@ -101,6 +108,12 @@ class _SummaryTabState extends State<SummaryTab> {
     }
   }
 
+  Future<void> _initController() async {
+    final markdown = const ParchmentMarkdownCodec()
+        .decode(_controller.meetingDetails.value.summary);
+    _fleatherController = FleatherController(document: markdown);
+  }
+
   @override
   void dispose() {
     _addressController.dispose();
@@ -119,6 +132,7 @@ class _SummaryTabState extends State<SummaryTab> {
     );
 
     return Stack(
+      clipBehavior: Clip.none,
       children: [
         SingleChildScrollView(
           padding: EdgeInsets.only(bottom: 80.w),
@@ -352,6 +366,20 @@ class _SummaryTabState extends State<SummaryTab> {
             ),
           ),
         ),
+        Positioned(
+          bottom: 0,
+          left: -12.w,
+          right: -12.w,
+          child: Container(
+            height: 40,
+            color: Colors.white,
+            alignment: Alignment.center,
+            child: FleatherToolbar.basic(
+              controller: _fleatherController!,
+              editorKey: _editorKey,
+            ),
+          ),
+        ),
       ],
     );
   }

pubspec.yaml

@@ -23,10 +23,8 @@ dependencies:
   audio_session: ^0.1.18
   flutter_markdown: ^0.7.7+1
   markdown: ^7.1.1
-  appflowy_editor:
+  fleather: ^1.24.0+1
-    git:
+  parchment: ^1.24.0
-      url: https://github.com/AppFlowy-IO/appflowy-editor.git
-      ref: main
   wifi_iot: ^0.3.19+2
   permission_handler: ^10.4.5
   web_socket_channel: ^2.4.0