diff --git a/NfcLock.Ios.Binding/NfcLockFramework/NfcLockFramework.xcodeproj/project.pbxproj b/NfcLock.Ios.Binding/NfcLockFramework/NfcLockFramework.xcodeproj/project.pbxproj index 521cc78..bb02012 100644 --- a/NfcLock.Ios.Binding/NfcLockFramework/NfcLockFramework.xcodeproj/project.pbxproj +++ b/NfcLock.Ios.Binding/NfcLockFramework/NfcLockFramework.xcodeproj/project.pbxproj @@ -264,8 +264,8 @@ 185AC0612F22284600E22FA2 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - BUILD_LIBRARY_FOR_DISTRIBUTION = YES; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + BUILD_LIBRARY_FOR_DISTRIBUTION = NO; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -276,7 +276,7 @@ GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = ""; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 16.6; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -302,8 +302,8 @@ 185AC0622F22284600E22FA2 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - BUILD_LIBRARY_FOR_DISTRIBUTION = YES; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + BUILD_LIBRARY_FOR_DISTRIBUTION = NO; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -314,7 +314,7 @@ GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = ""; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 16.6; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/NfcLock.Ios.Binding/NfcLockFramework/NfcLockFramework.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate b/NfcLock.Ios.Binding/NfcLockFramework/NfcLockFramework.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate index 574f4a1..6261bb5 100644 Binary files a/NfcLock.Ios.Binding/NfcLockFramework/NfcLockFramework.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate and b/NfcLock.Ios.Binding/NfcLockFramework/NfcLockFramework.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/NfcLock.Ios.Binding/NfcLockFramework/NfcLockFramework/NfcLockFramework.swift b/NfcLock.Ios.Binding/NfcLockFramework/NfcLockFramework/NfcLockFramework.swift index 7f8e9f0..f3c7fce 100644 --- a/NfcLock.Ios.Binding/NfcLockFramework/NfcLockFramework/NfcLockFramework.swift +++ b/NfcLock.Ios.Binding/NfcLockFramework/NfcLockFramework/NfcLockFramework.swift @@ -67,7 +67,7 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate { private func _startScan() { // 1. 检查设备是否支持 NFC guard NFCTagReaderSession.readingAvailable else { - _endScan(errorMessage: "设备不支持NFC功能") + _endScan(errorMessage: "Device does not support NFC") return } @@ -79,7 +79,7 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate { delegate: self, // 这里必须传实例 self，而非静态的 self queue: nil ) - session?.alertMessage = "请将 iPhone 靠近设备" + session?.alertMessage = "Hold your iPhone near the device" session?.begin() } } @@ -104,7 +104,7 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate { helper.setLoopCb { id, isNew, rssi in let isNew0 = isNew.boolValue let rssi0 = rssi?.intValue ?? 0 - self.session?.alertMessage = "检测到设备" + self.session?.alertMessage = "Device detected" return KotlinBoolean(bool: cb(id, isNew0, rssi0)) } } @@ -121,11 +121,11 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate { let level0 = level?.intValue ?? 0 switch res { case "OK": - self.session?.alertMessage = "充电中（\(level0)%）" + self.session?.alertMessage = "Charging (\(level0)%)" case "UNAUTHORIZED": - self._endScan(errorMessage: "验证失败") + self._endScan(errorMessage: "Authentication failed") default: - self._endScan(errorMessage: "NFC 标签丢失") + self._endScan(errorMessage: "NFC tag lost") } cb(res, level0) } @@ -137,24 +137,24 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate { switch res { case "OK": if progress0 < 100 { - self.session?.alertMessage = "\(self.controlName)中（\(progress0)%）" + self.session?.alertMessage = "\(self.controlName) (\(progress0)%)" } else { - self.session?.alertMessage = "\(self.controlName)成功" + self.session?.alertMessage = "\(self.controlName) succeeded" } default: - self._endScan(errorMessage: "\(self.controlName)失败") + self._endScan(errorMessage: "\(self.controlName) failed") } cb(res, progress0) } } private func _lock(password: String) { - controlName = "关锁" + controlName = "Locking" helper.lock(password: password) } private func _unlock(password: String) { - controlName = "开锁" + controlName = "Unlocking" helper.unlock(password: password) } @@ -169,7 +169,7 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate { // 区分用户主动取消和真实错误 if let nfcError = error as? NFCReaderError { if nfcError.code != .readerSessionInvalidationErrorUserCanceled { - print("NFC 会话错误: \(nfcError.localizedDescription)") + print("NFC Session Error: \(nfcError.localizedDescription)") } } _endScan() @@ -178,7 +178,7 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate { // 3. 必选方法：检测到 NFC 标签时调用 public func tagReaderSession(_ session: NFCTagReaderSession, didDetect tags: [CoreNFC.NFCTag]) { guard let tag = tags.first else { - _endScan(errorMessage: "未检测到有效NFC标签") + _endScan(errorMessage: "No valid NFC tag detected") return } @@ -186,7 +186,7 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate { guard let self = self else { return } // 避免循环引用 if let error = error { - self._endScan(errorMessage: "NFC 连接失败: \(error.localizedDescription)") + self._endScan(errorMessage: "NFC connection failed: \(error.localizedDescription)") return } @@ -202,7 +202,7 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate { miFareTag.sendMiFareCommand(commandPacket: command) { response, error in if let error = error { - self._endScan(errorMessage: "NFC 标签丢失: \(error.localizedDescription)") + self._endScan(errorMessage: "NFC tag lost: \(error.localizedDescription)") let _ = resolve(KotlinByteArray(size: 0)) return } @@ -224,7 +224,7 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate { } default: - self._endScan(errorMessage: "不是 NFC-A 标签") + self._endScan(errorMessage: "Not an NFC-A tag") } } }