Browse Source

上传iOS 问题修复

weicu
liwei1dao 1 year ago
parent
commit
85ce6a46db
  1. 17
      ios/Runner.xcodeproj/project.pbxproj
  2. 2
      lib/core/translations/language/en_us.dart
  3. 2
      lib/core/translations/language/ru_ru.dart
  4. 2
      lib/core/translations/language/th_th.dart
  5. 2
      lib/core/translations/language/tr_tr.dart
  6. 4
      lib/core/translations/language/uk_ua.dart
  7. 4
      lib/core/translations/language/zh_cn.dart
  8. 4
      lib/core/translations/language/zh_hk.dart
  9. 5
      lib/modules/meeting/views/bottomSheet/share_bottom_sheet.dart
  10. 8
      lib/modules/pairing/controllers/pairing_controller.dart
  11. 2
      lib/modules/pairing/views/pairing_view.dart
  12. 2
      local_plugins/amap_service/ios/Classes/AmapService.swift
  13. 2
      local_plugins/amap_service/ios/Classes/AmapServicePlugin.swift

17
ios/Runner.xcodeproj/project.pbxproj

@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 54; objectVersion = 60;
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
@ -539,8 +539,13 @@
MARKETING_VERSION = 1.0.1; MARKETING_VERSION = 1.0.1;
PRODUCT_BUNDLE_IDENTIFIER = com.saitong.voitrans; PRODUCT_BUNDLE_IDENTIFIER = com.saitong.voitrans;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";
}; };
name = Profile; name = Profile;
@ -734,9 +739,14 @@
MARKETING_VERSION = 1.0.1; MARKETING_VERSION = 1.0.1;
PRODUCT_BUNDLE_IDENTIFIER = com.saitong.voitrans; PRODUCT_BUNDLE_IDENTIFIER = com.saitong.voitrans;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";
}; };
name = Debug; name = Debug;
@ -761,8 +771,13 @@
MARKETING_VERSION = 1.0.1; MARKETING_VERSION = 1.0.1;
PRODUCT_BUNDLE_IDENTIFIER = com.saitong.voitrans; PRODUCT_BUNDLE_IDENTIFIER = com.saitong.voitrans;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";
}; };
name = Release; name = Release;

2
lib/core/translations/language/en_us.dart

@ -742,7 +742,7 @@ const Map<String, String> enUS = {
// 配对模块 // 配对模块
// 配对页面 // 配对页面
"devicePairing": "Device Pairing", "devicePairing": "Device Pairing",
"connectYourDeepSoundHeadset": "Connect Your DeepSound Headset", "connectYourDeepSoundHeadset": "Connect Your Voitrans Headset",
"bind": "Bind", "bind": "Bind",
"authorizeBind": "Authorize Binding", "authorizeBind": "Authorize Binding",
"enterCode": "Please enter code", "enterCode": "Please enter code",

2
lib/core/translations/language/ru_ru.dart

@ -702,7 +702,7 @@ const Map<String, String> ruRU = {
// 配对模块 // 配对模块
// 配对页面 (pairing_view.dart & pairing_view_new.dart) // 配对页面 (pairing_view.dart & pairing_view_new.dart)
"devicePairing": "Сопряжение устройства", "devicePairing": "Сопряжение устройства",
"connectYourDeepSoundHeadset": "Подключите ваши наушники DeepSound", "connectYourDeepSoundHeadset": "Подключите ваши наушники Voitrans",
"bind": "Привязать", "bind": "Привязать",
"authorizeBind": "Авторизовать привязку", "authorizeBind": "Авторизовать привязку",
"enterCode": "Пожалуйста, введите код", "enterCode": "Пожалуйста, введите код",

2
lib/core/translations/language/th_th.dart

@ -736,7 +736,7 @@ const Map<String, String> thTH = {
'retryAuthorization': 'ลองอนุญาตอีกครั้ง', 'retryAuthorization': 'ลองอนุญาตอีกครั้ง',
'pleaseGrantNecessaryPermissions': 'กรุณาให้สิทธิ์ที่จำเป็น', 'pleaseGrantNecessaryPermissions': 'กรุณาให้สิทธิ์ที่จำเป็น',
'checkFailedRetry': 'การตรวจสอบล้มเหลว โปรดลองอีกครั้ง', 'checkFailedRetry': 'การตรวจสอบล้มเหลว โปรดลองอีกครั้ง',
'pleaseConnectDeepSoundDevice': 'กรุณาเชื่อมต่ออุปกรณ์ DeepSound', 'pleaseConnectDeepSoundDevice': 'กรุณาเชื่อมต่ออุปกรณ์ Voitrans',
'verificationFailedRetry': 'การตรวจสอบล้มเหลว โปรดลองอีกครั้ง', 'verificationFailedRetry': 'การตรวจสอบล้มเหลว โปรดลองอีกครั้ง',
'invalidDeviceAddress': 'ที่อยู่อุปกรณ์ไม่ถูกต้อง', 'invalidDeviceAddress': 'ที่อยู่อุปกรณ์ไม่ถูกต้อง',
'bleDeviceAssociationFailed': 'การเชื่อมโยงอุปกรณ์ BLE ล้มเหลว', 'bleDeviceAssociationFailed': 'การเชื่อมโยงอุปกรณ์ BLE ล้มเหลว',

2
lib/core/translations/language/tr_tr.dart

@ -695,7 +695,7 @@ const Map<String, String> trTR = {
// 配对模块 // 配对模块
// 配对页面 (pairing_view.dart & pairing_view_new.dart) // 配对页面 (pairing_view.dart & pairing_view_new.dart)
"devicePairing": "Cihaz Eşleştirme", "devicePairing": "Cihaz Eşleştirme",
"connectYourDeepSoundHeadset": "DeepSound Kulaklığınızı Bağlayın", "connectYourDeepSoundHeadset": "Voitrans Kulaklığınızı Bağlayın",
"bind": "Bağla", "bind": "Bağla",
"authorizeBind": "Bağlamayı Yetkilendir", "authorizeBind": "Bağlamayı Yetkilendir",
"enterCode": "Lütfen kodu girin", "enterCode": "Lütfen kodu girin",

4
lib/core/translations/language/uk_ua.dart

@ -702,7 +702,7 @@ const Map<String, String> ukUA = {
// 配对模块 // 配对模块
// 配对页面 (pairing_view.dart & pairing_view_new.dart) // 配对页面 (pairing_view.dart & pairing_view_new.dart)
"devicePairing": "Спарювання пристрою", "devicePairing": "Спарювання пристрою",
"connectYourDeepSoundHeadset": "Підключіть ваші навушники DeepSound", "connectYourDeepSoundHeadset": "Підключіть ваші навушники Voitrans",
"bind": "Прив'язати", "bind": "Прив'язати",
"authorizeBind": "Авторизувати прив'язку", "authorizeBind": "Авторизувати прив'язку",
"enterCode": "Будь ласка, введіть код", "enterCode": "Будь ласка, введіть код",
@ -757,7 +757,7 @@ const Map<String, String> ukUA = {
'retryAuthorization': 'Повторити авторизацію', 'retryAuthorization': 'Повторити авторизацію',
'pleaseGrantNecessaryPermissions': 'Будь ласка, надайте необхідні дозволи', 'pleaseGrantNecessaryPermissions': 'Будь ласка, надайте необхідні дозволи',
'checkFailedRetry': 'Перевірка не вдалася, спробуйте ще раз', 'checkFailedRetry': 'Перевірка не вдалася, спробуйте ще раз',
'pleaseConnectDeepSoundDevice': 'Будь ласка, підключіть пристрій DeepSound', 'pleaseConnectDeepSoundDevice': 'Будь ласка, підключіть пристрій Voitrans',
'verificationFailedRetry': 'Перевірка не вдалася, спробуйте ще раз', 'verificationFailedRetry': 'Перевірка не вдалася, спробуйте ще раз',
'invalidDeviceAddress': 'Недійсна адреса пристрою', 'invalidDeviceAddress': 'Недійсна адреса пристрою',
'bleDeviceAssociationFailed': 'Не вдалося асоціювати пристрій BLE', 'bleDeviceAssociationFailed': 'Не вдалося асоціювати пристрій BLE',

4
lib/core/translations/language/zh_cn.dart

@ -684,7 +684,7 @@ const Map<String, String> zhCN = {
// 配对模块 // 配对模块
// 配对页面 (pairing_view.dart & pairing_view_new.dart) // 配对页面 (pairing_view.dart & pairing_view_new.dart)
"devicePairing": "设备配对", "devicePairing": "设备配对",
"connectYourDeepSoundHeadset": "连接您的 DeepSound 耳机", "connectYourDeepSoundHeadset": "连接您的 Voitrans 耳机",
"bind": "绑定", "bind": "绑定",
"authorizeBind": "授权绑定", "authorizeBind": "授权绑定",
"enterCode": "请输入代码", "enterCode": "请输入代码",
@ -736,7 +736,7 @@ const Map<String, String> zhCN = {
'retryAuthorization': '重新授权', 'retryAuthorization': '重新授权',
'pleaseGrantNecessaryPermissions': '请授予必要权限', 'pleaseGrantNecessaryPermissions': '请授予必要权限',
'checkFailedRetry': '检查失败,请重试', 'checkFailedRetry': '检查失败,请重试',
'pleaseConnectDeepSoundDevice': '请连接 DeepSound 设备', 'pleaseConnectDeepSoundDevice': '请连接 Voitrans 设备',
'verificationFailedRetry': '验证失败,请重试', 'verificationFailedRetry': '验证失败,请重试',
'invalidDeviceAddress': '设备地址无效', 'invalidDeviceAddress': '设备地址无效',
'bleDeviceAssociationFailed': 'BLE设备关联失败', 'bleDeviceAssociationFailed': 'BLE设备关联失败',

4
lib/core/translations/language/zh_hk.dart

@ -648,7 +648,7 @@ const Map<String, String> zhHK = {
// 配對模塊 // 配對模塊
// 配對頁面 (pairing_view.dart & pairing_view_new.dart) // 配對頁面 (pairing_view.dart & pairing_view_new.dart)
"devicePairing": "設備配對", "devicePairing": "設備配對",
"connectYourDeepSoundHeadset": "連接您的 DeepSound 耳機", "connectYourDeepSoundHeadset": "連接您的 Voitrans 耳機",
"bind": "綁定", "bind": "綁定",
"authorizeBind": "授權綁定", "authorizeBind": "授權綁定",
"enterCode": "請輸入代碼", "enterCode": "請輸入代碼",
@ -695,7 +695,7 @@ const Map<String, String> zhHK = {
'retryAuthorization': '重新授權', 'retryAuthorization': '重新授權',
'pleaseGrantNecessaryPermissions': '請授予必要權限', 'pleaseGrantNecessaryPermissions': '請授予必要權限',
'checkFailedRetry': '檢查失敗,請重試', 'checkFailedRetry': '檢查失敗,請重試',
'pleaseConnectDeepSoundDevice': '請連接 DeepSound 設備', 'pleaseConnectDeepSoundDevice': '請連接 Voitrans 設備',
'verificationFailedRetry': '驗證失敗,請重試', 'verificationFailedRetry': '驗證失敗,請重試',
'invalidDeviceAddress': '設備地址無效', 'invalidDeviceAddress': '設備地址無效',
'bleDeviceAssociationFailed': 'BLE設備關聯失敗', 'bleDeviceAssociationFailed': 'BLE設備關聯失敗',

5
lib/modules/meeting/views/bottomSheet/share_bottom_sheet.dart

@ -103,7 +103,7 @@ class _ShareBottomSheetState extends State<ShareBottomSheet> {
final result = await SharePlus.instance.share(ShareParams( final result = await SharePlus.instance.share(ShareParams(
title: _controller.meetingData.value.title, title: _controller.meetingData.value.title,
subject: subject:
'DeepSound WEB,由DeepSound.Ai提供支持-实时记录会议纪要,多语言翻译。', 'Voitrans WEB,由DeepSound.Ai提供支持-实时记录会议纪要,多语言翻译。',
uri: Uri.parse( uri: Uri.parse(
'http://web.ideapsound.com/share/$id/$token', 'http://web.ideapsound.com/share/$id/$token',
), ),
@ -281,7 +281,8 @@ class _ShareBottomSheetState extends State<ShareBottomSheet> {
title, title,
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: Colors.black87.withValues(alpha: onTap != null ? 1 : 0.5), color:
Colors.black87.withValues(alpha: onTap != null ? 1 : 0.5),
), ),
), ),
), ),

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

@ -181,7 +181,8 @@ class PairingController extends GetxController {
/// 处理蓝牙开关状态变化 /// 处理蓝牙开关状态变化
void _handleBluetoothStateChange(String state) { void _handleBluetoothStateChange(String state) {
if (state == 'off') { if (state == 'off') {
_setError(ErrorType.bluetoothOff, 'pleaseEnableBluetooth'.tr); _setError(
ErrorType.bluetoothOff, 'connectDeepSoundViaSystemBluetooth'.tr);
} else if (state == 'on' && _errorType.value == ErrorType.bluetoothOff) { } else if (state == 'on' && _errorType.value == ErrorType.bluetoothOff) {
// 蓝牙重新开启,恢复流程 // 蓝牙重新开启,恢复流程
Logger.i(_tag, '检测到蓝牙已开启,自动恢复配对流程'); Logger.i(_tag, '检测到蓝牙已开启,自动恢复配对流程');
@ -336,7 +337,7 @@ class PairingController extends GetxController {
switch (_errorType.value) { switch (_errorType.value) {
case ErrorType.bluetoothOff: case ErrorType.bluetoothOff:
showConnectButton.value = true; showConnectButton.value = true;
connectButtonText.value = 'enableBluetooth'.tr; //开启蓝牙 connectButtonText.value = 'goToBluetoothSettings'.tr; //开启蓝牙
break; break;
case ErrorType.noClassicDevice: case ErrorType.noClassicDevice:
showConnectButton.value = true; showConnectButton.value = true;
@ -400,7 +401,8 @@ class PairingController extends GetxController {
final arePermissionsOk = results[1] as bool; final arePermissionsOk = results[1] as bool;
if (!isBluetoothOk) { if (!isBluetoothOk) {
_setError(ErrorType.bluetoothOff, 'pleaseEnableBluetooth'.tr); _setError(
ErrorType.bluetoothOff, 'connectDeepSoundViaSystemBluetooth'.tr);
return; return;
} }

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

@ -481,7 +481,7 @@ class _PairingViewState extends State<PairingView>
final errorType = controller.errorType; final errorType = controller.errorType;
switch (errorType) { switch (errorType) {
case ErrorType.bluetoothOff: case ErrorType.bluetoothOff:
return 'bluetoothTurnedOff'.tr; // 蓝牙已关闭,请打开蓝牙 return 'connectDeepSoundViaSystemBluetooth'.tr; // 蓝牙已关闭,请打开蓝牙
case ErrorType.noPermission: case ErrorType.noPermission:
return 'lackPermissions'.tr; // 缺少蓝牙权限 return 'lackPermissions'.tr; // 缺少蓝牙权限
case ErrorType.noClassicDevice: case ErrorType.noClassicDevice:

2
local_plugins/amap_service/ios/Classes/AmapService.swift

@ -24,7 +24,7 @@ public class AmapService: NSObject, AMapNaviDriveManagerDelegate {
// 设置高德地图服务 // 设置高德地图服务
// 1. 设置隐私合规 // 1. 设置隐私合规
AMapServices.shared()?.enableHTTPS = true AMapServices.shared()?.enableHTTPS = true
AMapServices.shared()?.apiKey = "0b704e172b7ade5a7a18728e8f517a05" AMapServices.shared()?.apiKey = "6144a636c24dc9f2e1e57f7597849cf7"
} }
public func startNavigation(from start: String, to end: String) { public func startNavigation(from start: String, to end: String) {

2
local_plugins/amap_service/ios/Classes/AmapServicePlugin.swift

@ -22,7 +22,7 @@ public class AmapServicePlugin: NSObject, FlutterPlugin, FlutterStreamHandler {
// 高德SDK初始化 // 高德SDK初始化
DispatchQueue.main.async { DispatchQueue.main.async {
AMapServices.shared()?.apiKey = "0b704e172b7ade5a7a18728e8f517a05" AMapServices.shared()?.apiKey = "6144a636c24dc9f2e1e57f7597849cf7"
AMapServices.shared()?.enableHTTPS = true AMapServices.shared()?.enableHTTPS = true
if #available(iOS 13.0, *) { if #available(iOS 13.0, *) {

Loading…
Cancel
Save