Browse Source

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

weicu
tanlongsheng 1 year ago
parent
commit
4da0ca8238
  1. 6
      ios/Runner.xcodeproj/project.pbxproj
  2. 2
      lib/data/services/network/nw_api.dart
  3. 2
      lib/modules/meeting/views/bottomSheet/statistics_bottom_sheet.dart
  4. 10
      lib/modules/meeting/views/meeting_mine_view.dart
  5. 2
      lib/modules/pairing/controllers/pairing_controller.dart
  6. 12
      lib/modules/pairing/views/pairing_view.dart
  7. 2
      local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/BleMediaService.kt
  8. 2
      local_plugins/music_service/android/src/main/kotlin/com/yunqiinnovation/music_service/MusicService.kt
  9. 2
      local_plugins/ota/android/src/main/kotlin/com/example/ota/tool/ota/ble/BleManager.java

6
ios/Runner.xcodeproj/project.pbxproj

@ -535,7 +535,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.chuangxiangyunqi.deapsound;
PRODUCT_BUNDLE_IDENTIFIER = com.saitong.voitrans;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
@ -727,7 +727,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.chuangxiangyunqi.deapsound;
PRODUCT_BUNDLE_IDENTIFIER = com.saitong.voitrans;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@ -753,7 +753,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.chuangxiangyunqi.deapsound;
PRODUCT_BUNDLE_IDENTIFIER = com.saitong.voitrans;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;

2
lib/data/services/network/nw_api.dart

@ -1,4 +1,4 @@
class NWApi {
// Voitrans使用的后台服务器的链接地址
// Voitrans使用的后台服务器的链接地址
//static const baseApi = "https://api.voitrans.net";
}

2
lib/modules/meeting/views/bottomSheet/statistics_bottom_sheet.dart

@ -267,7 +267,7 @@ class _StatisticsBottomSheetState extends State<StatisticsBottomSheet> {
final file = File('${tempDir.path}/$fileName');
await file.writeAsBytes(pngBytes);
final result = await SharePlus.instance.share(ShareParams(
text: '分享 DEAPSOUND',
text: '分享 Voitrans',
files: [XFile(file.path)],
));
if (result.status == ShareResultStatus.success) {

10
lib/modules/meeting/views/meeting_mine_view.dart

@ -73,7 +73,7 @@ class _MeetingMineViewState extends State<MeetingMineView>
_box([
_item(
Icons.cloud_upload_outlined,
'DEAPSOUND PRIVATE CLOUD',
'Voitrans PRIVATE CLOUD',
description: '开启',
onTap: () {
Get.to(() => const MeetingCloudView());
@ -89,7 +89,7 @@ class _MeetingMineViewState extends State<MeetingMineView>
),
_item(
Icons.settings_remote_outlined,
'我的DEAPSOUND设备',
'我的Voitrans设备',
onTap: () {},
),
]),
@ -103,7 +103,7 @@ class _MeetingMineViewState extends State<MeetingMineView>
),
_item(
Icons.info_outline_rounded,
'关于DEAPSOUND',
'关于Voitrans',
description: 'v1.0.0',
onTap: () {},
),
@ -290,7 +290,7 @@ class _MeetingMineViewState extends State<MeetingMineView>
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'DEAPSOUND AI会员',
'Voitrans AI会员',
style: TextStyle(
color: MeetingUIUtils.getTextColor(isDarkMode),
fontSize: 16.sp,
@ -336,7 +336,7 @@ class _MeetingMineViewState extends State<MeetingMineView>
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'绑定 DEAPSOUND 设备可激活 Starter 会员',
'绑定 Voitrans 设备可激活 Starter 会员',
style: TextStyle(
color: Colors.white,
fontSize: 12.sp,

2
lib/modules/pairing/controllers/pairing_controller.dart

@ -546,7 +546,7 @@ class PairingController extends GetxController {
// 调用BLE管理器的关联方法
final success = await _bleManager.startDeviceAssociation(
deviceNamePattern: 'DeapSound', // 或者使用 _currentClassicDevice?.name
deviceNamePattern: 'Voitrans', // 或者使用 _currentClassicDevice?.name
macAddress: _verifiedDeviceAddress!,
);

12
lib/modules/pairing/views/pairing_view.dart

@ -268,7 +268,8 @@ class _PairingViewState extends State<PairingView>
animation: _pulseAnimation,
builder: (context, child) {
final value = _pulseAnimation.value;
final opacity = 0.4 - (_pulseController.value * 0.3); // 0.4 到 0.1 的透明度变化
final opacity =
0.4 - (_pulseController.value * 0.3); // 0.4 到 0.1 的透明度变化
return Container(
width: 200.w * value,
@ -312,7 +313,8 @@ class _PairingViewState extends State<PairingView>
}
// 构建安全连接特殊动画 - 多层波纹效果
Widget _buildSecureConnectionAnimation(Color primaryColor, Color secondaryColor) {
Widget _buildSecureConnectionAnimation(
Color primaryColor, Color secondaryColor) {
return Stack(
alignment: Alignment.center,
children: [
@ -464,7 +466,7 @@ class _PairingViewState extends State<PairingView>
case PairingState.checking:
return 'preparingPairingEnvironment'.tr; // 正在准备配对环境...
case PairingState.waitingClassic:
return 'connectDeepSoundViaSystemBluetooth'.tr; // 请先通过系统蓝牙连接DeapSound设备
return 'connectDeepSoundViaSystemBluetooth'.tr; // 请先通过系统蓝牙连接Voitrans设备
case PairingState.verifying:
return 'verifyingDevice'.tr; // 正在验证设备...
case PairingState.binding:
@ -484,9 +486,9 @@ class _PairingViewState extends State<PairingView>
return 'lackPermissions'.tr; // 缺少蓝牙权限
case ErrorType.noClassicDevice:
return 'connectDeepSoundViaSystemBluetooth'
.tr; // 请先通过系统蓝牙连接DeapSound设备
.tr; // 请先通过系统蓝牙连接Voitrans设备
case ErrorType.deviceNotMatch:
return 'ensureConnectedDeepSoundDevice'.tr; // 请确保连接的是DeapSound设备
return 'ensureConnectedDeepSoundDevice'.tr; // 请确保连接的是Voitrans设备
case ErrorType.deviceBound:
return 'deviceAlreadyBoundToOtherAccount'.tr; // 该设备已被其他账号绑定
case ErrorType.associationFailed:

2
local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/BleMediaService.kt

@ -283,7 +283,7 @@ class BleMediaService : Service(), CoroutineScope {
// 构建通知
val builder = NotificationCompat.Builder(this, CHANNEL_ID)
.setContentTitle("DeapSound")
.setContentTitle("Voitrans")
.setContentText("语音助手代理服务运行中")
.setSmallIcon(android.R.drawable.ic_dialog_info)

2
local_plugins/music_service/android/src/main/kotlin/com/yunqiinnovation/music_service/MusicService.kt

@ -178,7 +178,7 @@ class MusicService : MediaBrowserServiceCompat() {
instance = this
isRunning.set(true)
setupMediaSession()
startForeground(NOTIFICATION_ID, createNotification("等待播放","DeapSound",""))
startForeground(NOTIFICATION_ID, createNotification("等待播放","Voitrans",""))
audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager
// 注册广播监听器

2
local_plugins/ota/android/src/main/kotlin/com/example/ota/tool/ota/ble/BleManager.java

@ -637,7 +637,7 @@ public class BleManager {
if (deviced1 != null && deviced1.getAddress().equals(device.getAddress())) {
// 匹配成功
Log.i(TAG, "filterDevice找到了DeapSound设备");
Log.i(TAG, "filterDevice找到了Voitrans设备");
// 直接连接设备
boolean connected = connectBleDevice(device);

Loading…
Cancel
Save