gaofeng/NFCLockDemoMaui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.kingkongcang.com/gaofeng/NFCLockDemoMaui

Browse Source 
# Conflicts:
#	AndroidBinding1/nfc-sdk.aar   resolved by master version
#	NfcLock.Ios.Binding/ApiDefinition.cs   resolved by master version
#	NfcLock.Ios.Binding/NfcLockFramework.xcframework/.DS_Store   resolved by master version
#	NfcLock.Ios.Binding/NfcLockFramework.xcframework/ios-arm64/NfcLockFramework.framework/Headers/NfcLockFramework-Swift.h   resolved by master version
#	NfcLock.Ios.Binding/NfcLockFramework.xcframework/ios-arm64_x86_64-simulator/.DS_Store   resolved by master version
#	NfcLock.Ios.Binding/NfcLockFramework.xcframework/ios-arm64_x86_64-simulator/NfcLockFramework.framework/.DS_Store   resolved by master version
#	NfcLock.Ios.Binding/NfcLockFramework.xcframework/ios-arm64_x86_64-simulator/NfcLockFramework.framework/Headers/NfcLockFramework-Swift.h   resolved by master version
This commit is contained in:
denggaofeng 2026-08-19 09:56:11 +08:00
commit 664642db2c
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
NfcLock.Ios.Binding/NfcLockFramework/NfcLockFramework.xcodeproj/project.pbxproj
View File

@ -264,8 +264,8 @@
185AC0612F22284600E22FA2 /* Debug */ = { 185AC0612F22284600E22FA2 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
BUILD_LIBRARY_FOR_DISTRIBUTION = YES; BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
@ -276,7 +276,7 @@
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSHumanReadableCopyright = ""; INFOPLIST_KEY_NSHumanReadableCopyright = "";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 16.6; IPHONEOS_DEPLOYMENT_TARGET = 15.6;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
@ -302,8 +302,8 @@
185AC0622F22284600E22FA2 /* Release */ = { 185AC0622F22284600E22FA2 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
BUILD_LIBRARY_FOR_DISTRIBUTION = YES; BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
@ -314,7 +314,7 @@
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSHumanReadableCopyright = ""; INFOPLIST_KEY_NSHumanReadableCopyright = "";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 16.6; IPHONEOS_DEPLOYMENT_TARGET = 15.6;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",

BIN
NfcLock.Ios.Binding/NfcLockFramework/NfcLockFramework.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

32
NfcLock.Ios.Binding/NfcLockFramework/NfcLockFramework/NfcLockFramework.swift
View File

@ -67,7 +67,7 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate {
private func _startScan() { private func _startScan() {
// 1. 检查设备是否支持 NFC // 1. 检查设备是否支持 NFC
guard NFCTagReaderSession.readingAvailable else { guard NFCTagReaderSession.readingAvailable else {
_endScan(errorMessage: "设备不支持NFC功能") _endScan(errorMessage: "Device does not support NFC")
return return
} }
@ -79,7 +79,7 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate {
delegate: self, // 这里必须传实例 self，而非静态的 self delegate: self, // 这里必须传实例 self，而非静态的 self
queue: nil queue: nil
) )
session?.alertMessage = "请将 iPhone 靠近设备" session?.alertMessage = "Hold your iPhone near the device"
session?.begin() session?.begin()
} }
} }
@ -104,7 +104,7 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate {
helper.setLoopCb { id, isNew, rssi in helper.setLoopCb { id, isNew, rssi in
let isNew0 = isNew.boolValue let isNew0 = isNew.boolValue
let rssi0 = rssi?.intValue ?? 0 let rssi0 = rssi?.intValue ?? 0
self.session?.alertMessage = "检测到设备" self.session?.alertMessage = "Device detected"
return KotlinBoolean(bool: cb(id, isNew0, rssi0)) return KotlinBoolean(bool: cb(id, isNew0, rssi0))
} }
} }
@ -121,11 +121,11 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate {
let level0 = level?.intValue ?? 0 let level0 = level?.intValue ?? 0
switch res { switch res {
case "OK": case "OK":
self.session?.alertMessage = "充电中（\(level0)%）" self.session?.alertMessage = "Charging (\(level0)%)"
case "UNAUTHORIZED": case "UNAUTHORIZED":
self._endScan(errorMessage: "验证失败") self._endScan(errorMessage: "Authentication failed")
default: default:
self._endScan(errorMessage: "NFC 标签丢失") self._endScan(errorMessage: "NFC tag lost")
} }
cb(res, level0) cb(res, level0)
} }
@ -137,24 +137,24 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate {
switch res { switch res {
case "OK": case "OK":
if progress0 < 100 { if progress0 < 100 {
self.session?.alertMessage = "\(self.controlName)中（\(progress0)%）" self.session?.alertMessage = "\(self.controlName) (\(progress0)%)"
} else { } else {
self.session?.alertMessage = "\(self.controlName)成功" self.session?.alertMessage = "\(self.controlName) succeeded"
} }
default: default:
self._endScan(errorMessage: "\(self.controlName)失败") self._endScan(errorMessage: "\(self.controlName) failed")
} }
cb(res, progress0) cb(res, progress0)
} }
} }
private func _lock(password: String) { private func _lock(password: String) {
controlName = "关锁" controlName = "Locking"
helper.lock(password: password) helper.lock(password: password)
} }
private func _unlock(password: String) { private func _unlock(password: String) {
controlName = "开锁" controlName = "Unlocking"
helper.unlock(password: password) helper.unlock(password: password)
} }
@ -169,7 +169,7 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate {
// 区分用户主动取消和真实错误 // 区分用户主动取消和真实错误
if let nfcError = error as? NFCReaderError { if let nfcError = error as? NFCReaderError {
if nfcError.code != .readerSessionInvalidationErrorUserCanceled { if nfcError.code != .readerSessionInvalidationErrorUserCanceled {
print("NFC 会话错误: \(nfcError.localizedDescription)") print("NFC Session Error: \(nfcError.localizedDescription)")
} }
} }
_endScan() _endScan()
@ -178,7 +178,7 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate {
// 3. 必选方法：检测到 NFC 标签时调用 // 3. 必选方法：检测到 NFC 标签时调用
public func tagReaderSession(_ session: NFCTagReaderSession, didDetect tags: [CoreNFC.NFCTag]) { public func tagReaderSession(_ session: NFCTagReaderSession, didDetect tags: [CoreNFC.NFCTag]) {
guard let tag = tags.first else { guard let tag = tags.first else {
_endScan(errorMessage: "未检测到有效NFC标签") _endScan(errorMessage: "No valid NFC tag detected")
return return
} }
@ -186,7 +186,7 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate {
guard let self = self else { return } // 避免循环引用 guard let self = self else { return } // 避免循环引用
if let error = error { if let error = error {
self._endScan(errorMessage: "NFC 连接失败: \(error.localizedDescription)") self._endScan(errorMessage: "NFC connection failed: \(error.localizedDescription)")
return return
} }
@ -202,7 +202,7 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate {
miFareTag.sendMiFareCommand(commandPacket: command) { response, error in miFareTag.sendMiFareCommand(commandPacket: command) { response, error in
if let error = error { if let error = error {
self._endScan(errorMessage: "NFC 标签丢失: \(error.localizedDescription)") self._endScan(errorMessage: "NFC tag lost: \(error.localizedDescription)")
let _ = resolve(KotlinByteArray(size: 0)) let _ = resolve(KotlinByteArray(size: 0))
return return
} }
@ -224,7 +224,7 @@ public class NFCManager: NSObject, NFCTagReaderSessionDelegate {
} }
default: default:
self._endScan(errorMessage: "不是 NFC-A 标签") self._endScan(errorMessage: "Not an NFC-A tag")
} }
} }
} }