Browse Source

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

weicu
liwei1dao 1 year ago
parent
commit
54a3c5eee4
  1. 13
      lib/modules/translation/views/dialogs/translation_mode_selector.dart
  2. 45
      lib/modules/translation/views/translation_view.dart

13
lib/modules/translation/views/dialogs/translation_mode_selector.dart

@ -10,7 +10,7 @@ class TranslationModeSelector {
/// 显示翻译模式选择器 /// 显示翻译模式选择器
static void show(bool isDarkMode) { static void show(bool isDarkMode) {
final controller = Get.find<TranslationController>(); final controller = Get.find<TranslationController>();
Get.bottomSheet( Get.bottomSheet(
BackdropFilter( BackdropFilter(
filter: ImageFilter.blur(sigmaX: 10.0, sigmaY: 10.0), filter: ImageFilter.blur(sigmaX: 10.0, sigmaY: 10.0),
@ -22,7 +22,8 @@ class TranslationModeSelector {
} }
// 构建翻译模式选择器 - 参考会议模块样式 // 构建翻译模式选择器 - 参考会议模块样式
static Widget _buildTranslationModeSelector(TranslationController controller) { static Widget _buildTranslationModeSelector(
TranslationController controller) {
return Builder( return Builder(
builder: (BuildContext context) { builder: (BuildContext context) {
return SafeArea( return SafeArea(
@ -39,7 +40,7 @@ class TranslationModeSelector {
Get.back(); Get.back();
await controller.stopAll(); await controller.stopAll();
await controller.changeTranslationMode('simultaneous'); await controller.changeTranslationMode('simultaneous');
await controller.startRecognition(); //await controller.startRecognition();
}, },
), ),
_buildModeItem( _buildModeItem(
@ -52,7 +53,7 @@ class TranslationModeSelector {
Get.back(); Get.back();
await controller.stopAll(); await controller.stopAll();
await controller.changeTranslationMode('faceToFace'); await controller.changeTranslationMode('faceToFace');
await controller.startRecognition(); //await controller.startRecognition();
}, },
), ),
_buildModeItem( _buildModeItem(
@ -66,7 +67,7 @@ class TranslationModeSelector {
Get.back(); Get.back();
await controller.stopAll(); await controller.stopAll();
await controller.changeTranslationMode('audioVideo'); await controller.changeTranslationMode('audioVideo');
await controller.startRecognition(); //await controller.startRecognition();
} }
: null, : null,
), ),
@ -81,7 +82,7 @@ class TranslationModeSelector {
Get.back(); Get.back();
await controller.stopAll(); await controller.stopAll();
await controller.changeTranslationMode('call'); await controller.changeTranslationMode('call');
await controller.startRecognition(); //await controller.startRecognition();
} }
: null, : null,
), ),

45
lib/modules/translation/views/translation_view.dart

@ -343,30 +343,32 @@ class TranslationView extends GetView<TranslationController> {
} }
Widget _buildBody(bool isDarkMode) { Widget _buildBody(bool isDarkMode) {
return GestureDetector( return
onPanUpdate: (details) { // GestureDetector(
// 检测左滑手势 // onPanUpdate: (details) {
if (details.delta.dx < -10) { // // 检测左滑手势
// 左滑距离超过10像素时触发 // if (details.delta.dx < -10) {
_handleSwipeLeft(); // // 左滑距离超过10像素时触发
} // _handleSwipeLeft();
}, // }
child: Column( // },
children: [ // child:
Expanded( Column(
child: _buildTranslationContent(isDarkMode), children: [
), Expanded(
_buildControlBar(isDarkMode), child: _buildTranslationContent(isDarkMode),
], ),
), _buildControlBar(isDarkMode),
],
); );
// );
} }
// 处理左滑手势 // 处理左滑手势
void _handleSwipeLeft() async { // void _handleSwipeLeft() async {
await controller.stopAll(); // await controller.stopAll();
Get.toNamed(Routes.translationHistory); // Get.toNamed(Routes.translationHistory);
} // }
Widget _buildTranslationContent(bool isDarkMode) { Widget _buildTranslationContent(bool isDarkMode) {
return Obx(() { return Obx(() {
@ -584,8 +586,7 @@ class TranslationView extends GetView<TranslationController> {
if (isRecognizing) { if (isRecognizing) {
controller.stopAll(); controller.stopAll();
} else { } else {
// 弹出翻译模式选择器 controller.startRecognition();
TranslationModeSelector.show(isDarkMode);
} }
}, },
child: Container( child: Container(

Loading…
Cancel
Save