diff --git a/Lookfit.xcodeproj/project.pbxproj b/Lookfit.xcodeproj/project.pbxproj
index b7bec12..a4e3d7f 100644
--- a/Lookfit.xcodeproj/project.pbxproj
+++ b/Lookfit.xcodeproj/project.pbxproj
@@ -1712,7 +1712,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1.0.0;
+ CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = 7JB2HUC928;
@@ -1733,7 +1733,7 @@
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
- MARKETING_VERSION = 1.4.4;
+ MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.ecell.www.fireboltt;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1753,7 +1753,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1.0.0;
+ CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = 7JB2HUC928;
@@ -1774,7 +1774,7 @@
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
- MARKETING_VERSION = 1.4.4;
+ MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.ecell.www.fireboltt;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/Lookfit.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate b/Lookfit.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate
index f454c05..354ae5e 100644
Binary files a/Lookfit.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate and b/Lookfit.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Lookfit.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Lookfit.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 46f8b57..172c849 100644
--- a/Lookfit.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/Lookfit.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -183,54 +183,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ landmarkName = "Bluetooth"
+ landmarkType = "3">
diff --git a/Lookfit/Const/MultiLanguageKey.swift b/Lookfit/Const/MultiLanguageKey.swift
index 9c9f1da..c57ed95 100644
--- a/Lookfit/Const/MultiLanguageKey.swift
+++ b/Lookfit/Const/MultiLanguageKey.swift
@@ -241,7 +241,7 @@ struct MultiLanguageKey {
static let bindingSteps_3 = ";\n3、点击上方二维码区域,添加或更换"
static let bindingSteps_4 = "二维码;\n4、点击下方绑定按钮,将名片绑定到手表;"
static let bindingQrCode = "绑定"
-
+ static let findThePhoneCMD = "寻找手机指令"
}
class OCLanguage: NSObject {
diff --git a/Lookfit/Modules/Device/Service/BluetoothService.swift b/Lookfit/Modules/Device/Service/BluetoothService.swift
index f9d167f..729106b 100644
--- a/Lookfit/Modules/Device/Service/BluetoothService.swift
+++ b/Lookfit/Modules/Device/Service/BluetoothService.swift
@@ -483,12 +483,12 @@ extension BluetoothService {
GlobalDeviceProfileModel.shareInstance.isPlaying = true
isPlaying = true
showFindPhoneAlert()
- localNotification(title: "提示", body: "寻找手机指令")
+ localNotification(title: MultiLanguageKey.tip.localized, body: MultiLanguageKey.findThePhoneCMD.localized)
}
func showFindPhoneAlert() {
- let alertVC = UIAlertController(title: "提示", message: "寻找手机指令", preferredStyle: .alert)
- let sureAction = UIAlertAction(title: "取消", style: UIAlertAction.Style.default) { [weak self] (action) in
+ let alertVC = UIAlertController(title: MultiLanguageKey.tip.localized, message: MultiLanguageKey.findThePhoneCMD.localized, preferredStyle: .alert)
+ let sureAction = UIAlertAction(title: MultiLanguageKey.cancel.localized, style: UIAlertAction.Style.default) { [weak self] (action) in
guard let `self` = self else { return }
self.stopFindPhone()
}
diff --git a/Lookfit/Resource/ar.lproj/Localizable.strings b/Lookfit/Resource/ar.lproj/Localizable.strings
index 4fc66dc..80aec6b 100644
--- a/Lookfit/Resource/ar.lproj/Localizable.strings
+++ b/Lookfit/Resource/ar.lproj/Localizable.strings
@@ -198,3 +198,4 @@
"二维码保存成功" = "تم حفظ رمز الاستجابة السريعة بنجاح";
"绑定二维码获取失败,请稍后重试" = "فشل الحصول على رمز الاستجابة السريعة المرتبط ، يرجى المحاولة مرة أخرى لاحقًا";
"注意：升级过程中请勿关闭APP，并设备与APP保持在有效的蓝牙距离内，避免升级失败" = "ملاحظة: لا تغلق التطبيق أثناء عملية الترقية ، واحتفظ بالجهاز والتطبيق ضمن مسافة Bluetooth صالحة لتجنب فشل الترقية";
+"寻找手机指令" = "Find the phone cmd";
diff --git a/Lookfit/Resource/de.lproj/Localizable.strings b/Lookfit/Resource/de.lproj/Localizable.strings
index bc833d0..741b62e 100644
--- a/Lookfit/Resource/de.lproj/Localizable.strings
+++ b/Lookfit/Resource/de.lproj/Localizable.strings
@@ -201,3 +201,4 @@
"隐私政策" = "Privacy policy";
"用户协议" = "User protocol";
+"寻找手机指令" = "Find the phone cmd";
diff --git a/Lookfit/Resource/en.lproj/Localizable.strings b/Lookfit/Resource/en.lproj/Localizable.strings
index 290cf38..c0847f4 100644
--- a/Lookfit/Resource/en.lproj/Localizable.strings
+++ b/Lookfit/Resource/en.lproj/Localizable.strings
@@ -255,3 +255,4 @@
"隐私政策" = "Privacy policy";
"用户协议" = "User protocol";
"清醒时长" = "awakeDuration";
+"寻找手机指令" = "Find the phone cmd";
diff --git a/Lookfit/Resource/es.lproj/Localizable.strings b/Lookfit/Resource/es.lproj/Localizable.strings
index c002338..9f88706 100644
--- a/Lookfit/Resource/es.lproj/Localizable.strings
+++ b/Lookfit/Resource/es.lproj/Localizable.strings
@@ -198,3 +198,4 @@
"二维码保存成功" = "Código QR guardado correctamente";
"绑定二维码获取失败,请稍后重试" = "No se pudo obtener el código QR vinculado. Vuelva a intentarlo más tarde.";
"注意：升级过程中请勿关闭APP，并设备与APP保持在有效的蓝牙距离内，避免升级失败" = "Nota: No cierre la APLICACIÓN durante el proceso de actualización y mantenga el dispositivo y la APLICACIÓN dentro de una distancia Bluetooth válida para evitar fallas en la actualización.";
+"寻找手机指令" = "Find the phone cmd";
diff --git a/Lookfit/Resource/fr.lproj/Localizable.strings b/Lookfit/Resource/fr.lproj/Localizable.strings
index 8807b64..072f7bb 100644
--- a/Lookfit/Resource/fr.lproj/Localizable.strings
+++ b/Lookfit/Resource/fr.lproj/Localizable.strings
@@ -198,3 +198,4 @@
"二维码保存成功" = "Code QR enregistré avec succès";
"绑定二维码获取失败,请稍后重试" = "Impossible d'obtenir le code QR lié, veuillez réessayer plus tard";
"注意：升级过程中请勿关闭APP，并设备与APP保持在有效的蓝牙距离内，避免升级失败" = "Remarque: ne fermez pas l'application pendant le processus de mise à niveau et conservez l'appareil et l'application à une distance Bluetooth valide pour éviter l'échec de la mise à niveau";
+"寻找手机指令" = "Find the phone cmd";
diff --git a/Lookfit/Resource/ja.lproj/Localizable.strings b/Lookfit/Resource/ja.lproj/Localizable.strings
index e3ebebe..3846475 100644
--- a/Lookfit/Resource/ja.lproj/Localizable.strings
+++ b/Lookfit/Resource/ja.lproj/Localizable.strings
@@ -198,3 +198,4 @@
"二维码保存成功" = "QRコードが正常に保存されました";
"绑定二维码获取失败,请稍后重试" = "バインドされたQRコードを取得できませんでした。しばらくしてからもう一度お試しください";
"注意：升级过程中请勿关闭APP，并设备与APP保持在有效的蓝牙距离内，避免升级失败" = "注：アップグレードプロセス中にAPPを閉じないでください。また、アップグレードの失敗を防ぐために、デバイスとAPPを有効なBluetooth距離内に維持してください。";
+"寻找手机指令" = "携帯電話のコマンドを探します";
diff --git a/Lookfit/Resource/ko.lproj/Localizable.strings b/Lookfit/Resource/ko.lproj/Localizable.strings
index 844312e..21d8f92 100644
--- a/Lookfit/Resource/ko.lproj/Localizable.strings
+++ b/Lookfit/Resource/ko.lproj/Localizable.strings
@@ -198,3 +198,4 @@
"二维码保存成功" = "QR 코드가 성공적으로 저장되었습니다.";
"绑定二维码获取失败,请稍后重试" = "바인딩 된 QR 코드를 가져 오지 못했습니다. 나중에 다시 시도하세요.";
"注意：升级过程中请勿关闭APP，并设备与APP保持在有效的蓝牙距离内，避免升级失败" = "참고 : 업그레이드 프로세스 중에는 앱을 닫지 말고 업그레이드 실패를 방지하기 위해 장치와 앱을 유효한 블루투스 거리 내에 두십시오.";
+"寻找手机指令" = "핸드폰 명령 찾기";
diff --git a/Lookfit/Resource/ms.lproj/Localizable.strings b/Lookfit/Resource/ms.lproj/Localizable.strings
index fd171bc..b0a160f 100644
--- a/Lookfit/Resource/ms.lproj/Localizable.strings
+++ b/Lookfit/Resource/ms.lproj/Localizable.strings
@@ -198,3 +198,4 @@
"二维码保存成功" = "Código QR guardado correctamente";
"绑定二维码获取失败,请稍后重试" = "No se pudo obtener el código QR vinculado. Vuelva a intentarlo más tarde.";
"注意：升级过程中请勿关闭APP，并设备与APP保持在有效的蓝牙距离内，避免升级失败" = "Catatan: Jangan tutup APP semasa proses peningkatan, dan simpan peranti dan APP dalam jarak Bluetooth yang sah untuk mengelakkan kegagalan peningkatan";
+"寻找手机指令" = "Find the phone cmd";
diff --git a/Lookfit/Resource/nl.lproj/Localizable.strings b/Lookfit/Resource/nl.lproj/Localizable.strings
index e129174..3be7c11 100644
--- a/Lookfit/Resource/nl.lproj/Localizable.strings
+++ b/Lookfit/Resource/nl.lproj/Localizable.strings
@@ -233,3 +233,4 @@
"隐私政策" = "Privacy policy";
"用户协议" = "User protocol";
"清醒时长" = "awakeDuration";
+"寻找手机指令" = "Find the phone cmd";
diff --git a/Lookfit/Resource/pl.lproj/Localizable.strings b/Lookfit/Resource/pl.lproj/Localizable.strings
index c267a99..5d028c1 100644
--- a/Lookfit/Resource/pl.lproj/Localizable.strings
+++ b/Lookfit/Resource/pl.lproj/Localizable.strings
@@ -198,3 +198,4 @@
"二维码保存成功" = "Kod QR został pomyślnie zapisany";
"绑定二维码获取失败,请稍后重试" = "Nie udało się uzyskać powiązanego kodu QR, spróbuj ponownie później";
"注意：升级过程中请勿关闭APP，并设备与APP保持在有效的蓝牙距离内，避免升级失败" = "Uwaga: nie zamykaj aplikacji podczas procesu aktualizacji i trzymaj urządzenie i aplikację w prawidłowej odległości Bluetooth, aby uniknąć niepowodzenia aktualizacji";
+"寻找手机指令" = "Find the phone cmd";
diff --git a/Lookfit/Resource/pt-PT.lproj/Localizable.strings b/Lookfit/Resource/pt-PT.lproj/Localizable.strings
index 64d5b11..35c6ac3 100644
--- a/Lookfit/Resource/pt-PT.lproj/Localizable.strings
+++ b/Lookfit/Resource/pt-PT.lproj/Localizable.strings
@@ -198,3 +198,4 @@
"二维码保存成功" = "Código QR salvo com sucesso";
"绑定二维码获取失败,请稍后重试" = "Falha ao obter o código QR vinculado, tente novamente mais tarde";
"注意：升级过程中请勿关闭APP，并设备与APP保持在有效的蓝牙距离内，避免升级失败" = "Nota: Não feche o APP durante o processo de atualização e mantenha o dispositivo e o APP a uma distância válida do Bluetooth para evitar falha na atualização";
+"寻找手机指令" = "Find the phone cmd";
diff --git a/Lookfit/Resource/ru.lproj/Localizable.strings b/Lookfit/Resource/ru.lproj/Localizable.strings
index 88b6fc0..a31ce2e 100644
--- a/Lookfit/Resource/ru.lproj/Localizable.strings
+++ b/Lookfit/Resource/ru.lproj/Localizable.strings
@@ -215,4 +215,4 @@
"绑定" = "связыва";
"其他" = "друг";
"推送中" = "Готово";
-
+"寻找手机指令" = "Find the phone cmd";
diff --git a/Lookfit/Resource/th.lproj/Localizable.strings b/Lookfit/Resource/th.lproj/Localizable.strings
index 237b85b..cd754f5 100644
--- a/Lookfit/Resource/th.lproj/Localizable.strings
+++ b/Lookfit/Resource/th.lproj/Localizable.strings
@@ -198,3 +198,4 @@
"二维码保存成功" = "บันทึกรหัส QR เรียบร้อยแล้ว";
"绑定二维码获取失败,请稍后重试" = "ไม่สามารถรับรหัส QR ที่ผูกไว้ได้โปรดลองอีกครั้งในภายหลัง";
"注意：升级过程中请勿关闭APP，并设备与APP保持在有效的蓝牙距离内，避免升级失败" = "หมายเหตุ: อย่าปิดแอปในระหว่างกระบวนการอัปเกรดและให้อุปกรณ์และแอปอยู่ในระยะบลูทู ธ ที่ถูกต้องเพื่อหลีกเลี่ยงความล้มเหลวในการอัปเกรด";
+"寻找手机指令" = "Find the phone cmd";
diff --git a/Lookfit/Resource/tr.lproj/Localizable.strings b/Lookfit/Resource/tr.lproj/Localizable.strings
index 1c391b6..1a724f8 100644
--- a/Lookfit/Resource/tr.lproj/Localizable.strings
+++ b/Lookfit/Resource/tr.lproj/Localizable.strings
@@ -198,3 +198,4 @@
"二维码保存成功" = "QR kodu başarıyla kaydedildi";
"绑定二维码获取失败,请稍后重试" = "Bağlı QR kodu alınamadı, lütfen daha sonra tekrar deneyin";
"注意：升级过程中请勿关闭APP，并设备与APP保持在有效的蓝牙距离内，避免升级失败" = "Not: Yükseltme işlemi sırasında APP'yi kapatmayın ve yükseltme hatasını önlemek için cihazı ve APP'yi geçerli bir Bluetooth mesafesi içinde tutun";
+"寻找手机指令" = "Find the phone cmd";
diff --git a/Lookfit/Resource/zh-HK.lproj/Localizable.strings b/Lookfit/Resource/zh-HK.lproj/Localizable.strings
index 6ae4cd5..591b1fb 100644
--- a/Lookfit/Resource/zh-HK.lproj/Localizable.strings
+++ b/Lookfit/Resource/zh-HK.lproj/Localizable.strings
@@ -201,3 +201,4 @@
"隐私政策" = "隐私政策";
"用户协议" = "用户协议";
+"寻找手机指令" = "寻找手机指令";
diff --git a/Lookfit/Resource/zh-Hans.lproj/Localizable.strings b/Lookfit/Resource/zh-Hans.lproj/Localizable.strings
index 00f9714..577a578 100644
--- a/Lookfit/Resource/zh-Hans.lproj/Localizable.strings
+++ b/Lookfit/Resource/zh-Hans.lproj/Localizable.strings
@@ -255,3 +255,4 @@
"隐私政策" = "隐私政策";
"用户协议" = "用户协议";
"清醒时长" = "清醒时长";
+"寻找手机指令" = "寻找手机指令";
diff --git a/Lookfit/Resource/zh-Hant.lproj/Localizable.strings b/Lookfit/Resource/zh-Hant.lproj/Localizable.strings
index bc56827..b9aa811 100644
--- a/Lookfit/Resource/zh-Hant.lproj/Localizable.strings
+++ b/Lookfit/Resource/zh-Hant.lproj/Localizable.strings
@@ -200,3 +200,4 @@
"注意：升级过程中请勿关闭APP，并设备与APP保持在有效的蓝牙距离内，避免升级失败" = "注意：升級過程中請勿關閉APP，並設備與APP保持在有效的藍牙距離內，避免升級失敗";
"隐私政策" = "隐私政策";
"用户协议" = "用户协议";
+"寻找手机指令" = "寻找手机指令";
diff --git a/R.generated.swift b/R.generated.swift
index 66a9afb..723ba60 100644
--- a/R.generated.swift
+++ b/R.generated.swift
@@ -1290,7 +1290,7 @@ struct R: Rswift.Validatable {
fileprivate init() {}
}
- /// This `R.string.localizable` struct is generated, and contains static references to 245 localization keys.
+ /// This `R.string.localizable` struct is generated, and contains static references to 246 localization keys.
struct localizable {
/// en translation: Synchronizing Succeed
///
@@ -1520,6 +1520,10 @@ struct R: Rswift.Validatable {
///
/// Locales: en, zh-Hans, nl, ru, fr, de, pt-PT, es, tr, pl, ar, ms, th, ja, ko, zh-HK, zh-Hant
static let 找设备 = Rswift.StringResource(key: "找设备", tableName: "Localizable", bundle: R.hostingBundle, locales: ["en", "zh-Hans", "nl", "ru", "fr", "de", "pt-PT", "es", "tr", "pl", "ar", "ms", "th", "ja", "ko", "zh-HK", "zh-Hant"], comment: nil)
+ /// en translation: Find the phone cmd
+ ///
+ /// Locales: en, zh-Hans, nl, ru, fr, de, pt-PT, es, tr, pl, ar, ms, th, ja, ko, zh-HK, zh-Hant
+ static let 寻找手机指令 = Rswift.StringResource(key: "寻找手机指令", tableName: "Localizable", bundle: R.hostingBundle, locales: ["en", "zh-Hans", "nl", "ru", "fr", "de", "pt-PT", "es", "tr", "pl", "ar", "ms", "th", "ja", "ko", "zh-HK", "zh-Hant"], comment: nil)
/// en translation: Firmware Upgrade
///
/// Locales: en, zh-Hans, nl, ru, fr, de, pt-PT, es, tr, pl, ar, ms, th, ja, ko, zh-HK, zh-Hant
@@ -3128,6 +3132,21 @@ struct R: Rswift.Validatable {
return NSLocalizedString("找设备", bundle: bundle, comment: "")
}
+ /// en translation: Find the phone cmd
+ ///
+ /// Locales: en, zh-Hans, nl, ru, fr, de, pt-PT, es, tr, pl, ar, ms, th, ja, ko, zh-HK, zh-Hant
+ static func 寻找手机指令(preferredLanguages: [String]? = nil) -> String {
+ guard let preferredLanguages = preferredLanguages else {
+ return NSLocalizedString("寻找手机指令", bundle: hostingBundle, comment: "")
+ }
+
+ guard let (_, bundle) = localeBundle(tableName: "Localizable", preferredLanguages: preferredLanguages) else {
+ return "寻找手机指令"
+ }
+
+ return NSLocalizedString("寻找手机指令", bundle: bundle, comment: "")
+ }
+
/// en translation: Firmware Upgrade
///
/// Locales: en, zh-Hans, nl, ru, fr, de, pt-PT, es, tr, pl, ar, ms, th, ja, ko, zh-HK, zh-Hant