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

lib/core/translations/language/en_us.dart

@@ -1391,4 +1391,9 @@ const Map<String, String> enUS = {
   "yesterday": "Yesterday",
   //补充
   "insufficientIntegral": "Insufficient integral",
+
+  //余额不足弹窗
+  'recharge': 'Go to Recharge',
+  'insufficientBalanceDesc':
+      'Insufficient balance, please go to the corresponding recharge page to recharge.',
 };

lib/core/translations/language/zh_cn.dart

@@ -1275,4 +1275,8 @@ const Map<String, String> zhCN = {
   'earlyAccessNewFeatures': '新功能优先体验',
   'crossDeviceSync': '跨设备同步',
   'vipDisclaimer': '具体权益以实际套餐说明为准，可能随版本迭代调整。',
+
+  //余额不足弹窗
+  "insufficientBalanceDesc": "餘額不足，請前往對應充值界面進行充值",
+  "recharge": "前往充值",
 };

lib/core/translations/language/zh_hk.dart

@@ -904,4 +904,8 @@ const Map<String, String> zhHK = {
   'earlyAccessNewFeatures': '新功能優先體驗',
   'crossDeviceSync': '跨設備同步',
   'vipDisclaimer': '具體權益以實際套餐說明為準，可能隨版本迭代調整。',
+
+  //余额不足弹窗
+  "insufficientBalanceDesc": "余额不足，请前往对应充值界面进行充值",
+  "recharge": "去充值",
 };

lib/modules/agent/controllers/agent_controller.dart

@@ -31,6 +31,7 @@ import 'package:path_provider/path_provider.dart';
 import 'package:photo_view/photo_view.dart';
 import '../../../core/utils/permission_util.dart';
 import '../../../data/models/message_model.dart';
+import '../../common/widgets/recharge_dialog.dart';
 
 // 语音输入模式枚举
 enum VoiceInputMode {
@@ -804,63 +805,8 @@ class AgentController extends GetxController with WidgetsBindingObserver {
             Get.snackbar('error'.tr, '${event.data['message']}');
           } else if (code == 2001) {
             // 余额不足或需要充值，给出弹窗确认是否跳转充值界面
-            final msg = '${event.data['message'] ?? '余额不足，请前往充值'}';
+
-            Get.snackbar('error'.tr, msg);
+            showRechargeDialog('agent');
-            Get.dialog(
-              Dialog(
-                shape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(12),
-                ),
-                child: Stack(
-                  children: [
-                    Padding(
-                      padding: const EdgeInsets.fromLTRB(16, 20, 16, 16),
-                      child: Column(
-                        mainAxisSize: MainAxisSize.min,
-                        children: [
-                          const Text(
-                            '提示',
-                            style: const TextStyle(
-                              fontSize: 18,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                          const SizedBox(height: 12),
-                          Text(
-                            '$msg\n是否前往充值界面？',
-                            textAlign: TextAlign.center,
-                          ),
-                          const SizedBox(height: 20),
-                          SizedBox(
-                            width: double.infinity,
-                            child: ElevatedButton(
-                              style: ElevatedButton.styleFrom(
-                                backgroundColor: Colors.orangeAccent,
-                                foregroundColor: Colors.white,
-                              ),
-                              onPressed: () {
-                                Get.back();
-                                Get.toNamed(Routes.goodsvip);
-                              },
-                              child: const Text('去充值'),
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                    Positioned(
-                      right: 8,
-                      top: 8,
-                      child: IconButton(
-                        icon: const Icon(Icons.close),
-                        onPressed: () => Get.back(),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-              barrierDismissible: true,
-            );
           }
           Logger.e(TAG, '代理服务错误: ${event.data['message']}');
           break;

lib/modules/common/widgets/recharge_dialog.dart

@@ -0,0 +1,67 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import '../../../routes/app_routes.dart';
+
+void showRechargeDialog(String type) {
+  Get.dialog(
+    Dialog(
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Stack(
+        children: [
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 20, 16, 16),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Text(
+                  'tip'.tr,
+                  style: const TextStyle(
+                    fontSize: 18,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+                const SizedBox(height: 12),
+                Text(
+                  'insufficientBalanceDesc'.tr, //'余额不足，请前往对应充值界面进行充值',
+                  textAlign: TextAlign.center,
+                ),
+                const SizedBox(height: 20),
+                SizedBox(
+                  width: double.infinity,
+                  child: ElevatedButton(
+                    style: ElevatedButton.styleFrom(
+                      backgroundColor: Colors.orangeAccent,
+                      foregroundColor: Colors.white,
+                    ),
+                    onPressed: () {
+                      Get.back();
+                      if (type == 'agent') {
+                        Get.toNamed(Routes.goodsvip);
+                      } else if (type == 'translation') {
+                        Get.toNamed(Routes.goodstrade);
+                      } else if (type == 'meeting') {
+                        Get.toNamed(Routes.goodsmeet);
+                      }
+                    },
+                    child: Text('recharge'.tr),
+                  ),
+                ),
+              ],
+            ),
+          ),
+          Positioned(
+            right: 8,
+            top: 8,
+            child: IconButton(
+              icon: const Icon(Icons.close),
+              onPressed: () => Get.back(),
+            ),
+          ),
+        ],
+      ),
+    ),
+    barrierDismissible: true,
+  );
+}

lib/modules/goods/views/goodsvip_view.dart

@@ -45,7 +45,7 @@ class GoodsvipView extends GetView<GoodsvipController> {
           for (final g in controller.items) {
             grouped.putIfAbsent(g.usagetype, () => []).add(g);
           }
-          final order = [UsageType.Vip, UsageType.Translation, UsageType.Meet];
+          final order = [UsageType.Vip];
           final children = <Widget>[];
           children.add(_buildFeaturesSection(isDarkMode));
           children.add(SizedBox(height: 16.h));

lib/modules/meeting/views/bottomSheet/generate_bottom_sheet.dart

@@ -7,6 +7,8 @@ import 'package:get_storage/get_storage.dart';
 import '../../controllers/meeting_details_controller.dart';
 import 'record_language_bottom_sheet.dart';
 import '../template/template_view.dart';
+import '../../../../data/models/user_Info.dart';
+import '../../../common/widgets/recharge_dialog.dart';
 
 class GenerateBottomSheet extends StatefulWidget {
   final bool isSummarizeAgain;
@@ -300,6 +302,10 @@ class _GenerateBottomSheetState extends State<GenerateBottomSheet> {
           padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 20.w),
           child: GestureDetector(
             onTap: () {
+              if (User.isLoggedIn() && User.instance.meetintegral <= 0) {
+                showRechargeDialog('meeting');
+                return;
+              }
               if (_templateData['id'] != _templateList[0]['id']) {
                 int index = _templateList
                     .indexWhere((v) => v['id'] == _templateData['id']);

lib/modules/settings/views/settings_view.dart

@@ -243,59 +243,46 @@ class SettingsView extends GetView<SettingsController> {
           ),
         ],
       ),
-      child: InkWell(
+      child: Row(
-        onTap: () => Get.toNamed(Routes.goodsvip),
+        mainAxisAlignment: MainAxisAlignment.spaceAround,
-        borderRadius: BorderRadius.circular(16.r),
+        children: [
-        child: Row(
+          _buildCategoryItem(
-          children: [
+            icon: Icons.workspace_premium,
-            Container(
+            label: 'premiumMember'.tr,
-              width: 42.w,
+            iconBg: isDarkMode
-              height: 42.w,
+                ? Colors.amber[900]!.withOpacity(0.3)
-              decoration: BoxDecoration(
+                : Colors.amber[100]!,
-                color: isDarkMode
+            iconColor: isDarkMode ? Colors.amber[300]! : Colors.amber[600]!,
-                    ? Colors.amber[900]!.withOpacity(0.3)
+            onTap: () => Get.toNamed(Routes.goodsvip),
-                    : Colors.amber[100]!,
+          ),
-                borderRadius: BorderRadius.circular(21.r),
+          _buildCategoryItem(
-              ),
+            icon: Icons.translate,
-              child: Icon(
+            label: 'interpretation'.tr,
-                Icons.workspace_premium,
+            iconBg: isDarkMode
-                size: 20.w,
+                ? Colors.indigo[900]!.withOpacity(0.3)
-                color: isDarkMode ? Colors.amber[300]! : Colors.amber[600]!,
+                : Colors.indigo[100]!,
-              ),
+            iconColor: isDarkMode ? Colors.indigo[300]! : Colors.indigo[600]!,
-            ),
+            onTap: () => Get.toNamed(Routes.goodstrade),
-            SizedBox(width: 12.w),
+          ),
-            Expanded(
+          _buildCategoryItem(
-              child: Column(
+            icon: Icons.people,
-                crossAxisAlignment: CrossAxisAlignment.start,
+            label: 'conferenceAssistant'.tr,
-                children: [
+            iconBg: isDarkMode
-                  Text(
+                ? Colors.pink[900]!.withOpacity(0.3)
-                    'premiumMember'.tr,
+                : Colors.pink[100]!,
-                    style: TextStyle(
+            iconColor: isDarkMode ? Colors.pink[300]! : Colors.pink[600]!,
-                      fontSize: 16.sp,
+            onTap: () => Get.toNamed(Routes.goodsmeet),
-                      fontWeight: FontWeight.w600,
+          ),
-                      color: Colors.white,
+          // _buildCategoryItem(
-                    ),
+          //   icon: Icons.smart_toy,
-                  ),
+          //   label: 'aiFunction'.tr,
-                  SizedBox(height: 4.h),
+          //   iconBg: isDarkMode
-                  Text(
+          //       ? Colors.teal[900]!.withOpacity(0.3)
-                    '${'higherQuota'.tr} · ${'fastResponse'.tr}',
+          //       : Colors.teal[100]!,
-                    style: TextStyle(
+          //   iconColor: isDarkMode ? Colors.teal[300]! : Colors.teal[600]!,
-                      fontSize: 12.sp,
+          //   onTap: () => Get.toNamed(Routes.goodsai),
-                      color: Colors.white70,
+          // ),
-                    ),
+        ],
-                    maxLines: 1,
-                    overflow: TextOverflow.ellipsis,
-                  ),
-                ],
-              ),
-            ),
-            Icon(
-              Icons.arrow_forward_ios,
-              size: 16.w,
-              color: Colors.white70,
-            ),
-          ],
-        ),
       ),
     );
   }
@@ -328,16 +315,20 @@ class SettingsView extends GetView<SettingsController> {
           SizedBox(height: 8.h),
           SizedBox(
             width: 72.w,
-            child: Text(
+            height: 32.h,
-              label,
+            child: Center(
-              textAlign: TextAlign.center,
+              child: Text(
-              style: TextStyle(
+                label,
-                fontSize: 12.sp,
+                textAlign: TextAlign.center,
-                fontWeight: FontWeight.w500,
+                style: TextStyle(
-                color: Colors.white,
+                  fontSize: 12.sp,
+                  fontWeight: FontWeight.w500,
+                  color: Colors.white,
+                  height: 1.2,
+                ),
+                maxLines: 2,
+                overflow: TextOverflow.ellipsis,
               ),
-              maxLines: 2,
-              overflow: TextOverflow.ellipsis,
             ),
           ),
         ],

lib/modules/translation/controllers/translation_controller.dart

@@ -29,6 +29,8 @@ import 'record_timer_controller.dart';
 import 'translation_history_controller.dart';
 import '../models/translation_models.dart';
 import '../views/dialogs/translation_mode_selector.dart';
+import '../../../data/models/user_Info.dart';
+import '../../common/widgets/recharge_dialog.dart';
 
 /// 音频输出设备枚举
 enum AudioOutputDevice {
@@ -393,6 +395,11 @@ class TranslationController extends GetxController with WidgetsBindingObserver {
   /// [speakerId] 说话者ID
   Future<void> _startFaceToFaceRecognition(int speakerId) async {
     try {
+      if (User.isLoggedIn() && User.instance.tradeintegral <= 0) {
+        showRechargeDialog('translation');
+        activeSpeaker.value = 0;
+        return;
+      }
       if (_asrSessionStartTime == null) {
         await _initializeSession();
       }
@@ -842,6 +849,10 @@ class TranslationController extends GetxController with WidgetsBindingObserver {
   /// 开始语音识别
   Future<void> startRecognition() async {
     Logger.info('开始语音识别');
+    if (User.isLoggedIn() && User.instance.tradeintegral <= 0) {
+      showRechargeDialog('translation');
+      return;
+    }
 
     if (!await _checkPermissions()) return;
     if (isRecognizing.value) return;