@onekeyfe/react-native-lite-card 1.1.19 → 1.1.21

package/ReactNativeLiteCard.podspec

@@ -18,5 +18,7 @@ Pod::Spec.new do |s|
   s.private_header_files = "ios/**/*.h"
 
 
+  s.dependency 'ReactNativeNativeLogger'
+
   install_modules_dependencies(s)
 end

package/android/build.gradle

@@ -82,4 +82,5 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation 'com.google.code.gson:gson:2.10.1'
   implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
+  implementation project(":onekeyfe_react-native-native-logger")
 }

package/android/src/main/java/com/onekeyfe/reactnativelitecard/LoggerManager.kt

@@ -1,9 +1,9 @@
 package com.onekeyfe.reactnativelitecard
 
-import android.util.Log
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import com.margelo.nitro.nativelogger.OneKeyLog
 import com.onekeyfe.reactnativelitecard.utils.sendEvent
 
 class LoggerManager(private val context: ReactApplicationContext) :
@@ -29,7 +29,7 @@ class LoggerManager(private val context: ReactApplicationContext) :
 
     @ReactMethod
     public fun logInfo(message: String) {
-        Log.d(TAG, message)
+        OneKeyLog.info("LiteCard", message)
         sendEvent(context, LOG_EVENT_INFO, message)
     }
 }

package/android/src/main/java/com/onekeyfe/reactnativelitecard/ReactNativeLiteCardModule.kt

@@ -4,7 +4,7 @@ import android.content.Intent
 import android.nfc.NfcAdapter
 import android.nfc.Tag
 import android.nfc.tech.IsoDep
-import android.util.Log
+import com.margelo.nitro.nativelogger.OneKeyLog
 import androidx.annotation.IntDef
 import androidx.fragment.app.FragmentActivity
 import kotlinx.coroutines.*
@@ -90,18 +90,18 @@ class ReactNativeLiteCardModule(val reactContext: ReactApplicationContext) :
             putString("type", "unknown")
           }
           emitOnNFCActiveConnection(dataMap.copy())
-          Log.d(TAG, "Unknown device")
+          OneKeyLog.debug("LiteCard","Unknown device")
           return
         }
 
-        Log.d(TAG, isoDep.toString())
+        OneKeyLog.debug("LiteCard",isoDep.toString())
         launch(Dispatchers.IO) {
           mNFCConnectedChannel.trySend(isoDep)
           try {
             // 处理主动触发 NFC
             delay(100)
             if (!mNFCConnectedChannel.isEmpty) {
-              Log.e(TAG, "There is no way to use NFC")
+              OneKeyLog.error("LiteCard","There is no way to use NFC")
 //                            mNFCConnectedChannel.receive()
               val startRequest = OneKeyLiteCard.initRequest(isoDep)
               val dataMap = Arguments.createMap().apply {
@@ -114,7 +114,7 @@ class ReactNativeLiteCardModule(val reactContext: ReactApplicationContext) :
               emitOnNFCActiveConnection(dataMap.copy())
             }
           } catch (e: Exception) {
-            e.printStackTrace()
+            OneKeyLog.error("LiteCard", "NFC connection failed: ${e.message}")
             // 未知设备或连接失败
             val dataMap = Arguments.createMap().apply {
               putInt("code", -1)
@@ -208,12 +208,12 @@ class ReactNativeLiteCardModule(val reactContext: ReactApplicationContext) :
     val topActivity = Utils.getTopActivity() ?: return
     NfcPermissionUtils.checkPermission(topActivity) {
       try {
-        Log.d(TAG, "NFC permission check success")
+        OneKeyLog.debug("LiteCard","NFC permission check success")
         val isoDep = acquireDevice() ?: return
         val executeResult = execute(isoDep)
         callback?.invoke(null, executeResult, mCurrentCardState.createArguments())
       } catch (e: NFCExceptions) {
-        Log.e(TAG, "NFC device execute error", e)
+        OneKeyLog.error("LiteCard", "NFC device execute error: ${e.message}")
         callback?.invoke(e.createArguments(), null, mCurrentCardState.createArguments())
       } finally {
         releaseDevice()
@@ -221,7 +221,7 @@ class ReactNativeLiteCardModule(val reactContext: ReactApplicationContext) :
       return
     }
     // 没有 NFC 使用权限
-    Log.d(TAG, "NFC device not permission")
+    OneKeyLog.debug("LiteCard","NFC device not permission")
     callback?.invoke(NFCExceptions.NotNFCPermission().createArguments(), null, null)
   }
 
@@ -245,11 +245,11 @@ class ReactNativeLiteCardModule(val reactContext: ReactApplicationContext) :
 
   override fun getLiteInfo(callback: Callback?) {
     launch {
-      Log.d(TAG, "getLiteInfo")
+      OneKeyLog.debug("LiteCard","getLiteInfo")
       handleOperation<Any>(callback) { isoDep ->
-        Log.e(TAG, "getLiteInfo Obtain the device")
+        OneKeyLog.debug("LiteCard","getLiteInfo Obtain the device")
         val cardInfo = OneKeyLiteCard.getCardInfo(isoDep)
-        Log.e(TAG, "getLiteInfo result $cardInfo")
+        OneKeyLog.debug("LiteCard","getLiteInfo result obtained")
         cardInfo.createArguments()
       }
     }
@@ -264,7 +264,7 @@ class ReactNativeLiteCardModule(val reactContext: ReactApplicationContext) :
     val isNfcExists = NfcUtils.isNfcExits(topActivity)
     if (!isNfcExists) {
       // 没有 NFC 设备
-      Log.d(TAG, "NFC device not found")
+      OneKeyLog.debug("LiteCard","NFC device not found")
       callback?.invoke(NFCExceptions.NotExistsNFC().createArguments(), null, null)
       return
     }
@@ -272,7 +272,7 @@ class ReactNativeLiteCardModule(val reactContext: ReactApplicationContext) :
     val isNfcEnable = NfcUtils.isNfcEnable(topActivity)
     if (!isNfcEnable) {
       // 没有打开 NFC 开关
-      Log.d(TAG, "NFC device not enable")
+      OneKeyLog.debug("LiteCard","NFC device not enable")
       callback?.invoke(NFCExceptions.NotEnableNFC().createArguments(), null, null)
       return
     }
@@ -281,7 +281,7 @@ class ReactNativeLiteCardModule(val reactContext: ReactApplicationContext) :
       return
     }
     // 没有 NFC 使用权限
-    Log.d(TAG, "NFC device not permission")
+    OneKeyLog.debug("LiteCard","NFC device not permission")
     callback?.invoke(NFCExceptions.NotNFCPermission().createArguments(), null, null)
   }
 
@@ -291,9 +291,17 @@ class ReactNativeLiteCardModule(val reactContext: ReactApplicationContext) :
     overwrite: Boolean,
     callback: Callback?
   ) {
+    if (pwd.isNullOrEmpty() || pwd.length != 6 || !pwd.all { it.isDigit() }) {
+      callback?.invoke(NFCExceptions.InputPasswordEmptyException().createArguments(), null, null)
+      return
+    }
+    if (mnemonic.isNullOrEmpty()) {
+      callback?.invoke(NFCExceptions.ExecFailureException().createArguments(), null, null)
+      return
+    }
     launch {
       handleOperation(callback) { isoDep ->
-        Log.e(TAG, "setMnemonic Obtain the device")
+        OneKeyLog.debug("LiteCard","setMnemonic Obtain the device")
         val isSuccess =
           OneKeyLiteCard.setMnemonic(
             mCurrentCardState,
@@ -303,7 +311,7 @@ class ReactNativeLiteCardModule(val reactContext: ReactApplicationContext) :
             overwrite
           )
         if (!isSuccess) throw NFCExceptions.ExecFailureException()
-        Log.e(TAG, "setMnemonic result success")
+        OneKeyLog.debug("LiteCard","setMnemonic result success")
         true
       }
     }
@@ -313,10 +321,14 @@ class ReactNativeLiteCardModule(val reactContext: ReactApplicationContext) :
     pwd: String,
     callback: Callback?
   ) {
+    if (pwd.isEmpty() || pwd.length != 6 || !pwd.all { it.isDigit() }) {
+      callback?.invoke(NFCExceptions.InputPasswordEmptyException().createArguments(), null, null)
+      return
+    }
     launch {
-      Log.d(TAG, "getMnemonicWithPin")
+      OneKeyLog.debug("LiteCard","getMnemonicWithPin")
       handleOperation(callback) { isoDep ->
-        Log.e(TAG, "getMnemonicWithPin Obtain the device")
+        OneKeyLog.debug("LiteCard","getMnemonicWithPin Obtain the device")
         OneKeyLiteCard.getMnemonicWithPin(mCurrentCardState, isoDep, pwd)
       }
     }
@@ -328,9 +340,9 @@ class ReactNativeLiteCardModule(val reactContext: ReactApplicationContext) :
     callback: Callback?
   ) {
     launch {
-      Log.d(TAG, "changePin")
+      OneKeyLog.debug("LiteCard","changePin")
       handleOperation(callback) { isoDep ->
-        Log.e(TAG, "changePin Obtain the device")
+        OneKeyLog.debug("LiteCard","changePin Obtain the device")
         OneKeyLiteCard.changPin(mCurrentCardState, isoDep, oldPin, newPin)
       }
     }
@@ -338,12 +350,12 @@ class ReactNativeLiteCardModule(val reactContext: ReactApplicationContext) :
 
   override fun reset(callback: Callback?) {
     launch {
-      Log.d(TAG, "reset")
+      OneKeyLog.debug("LiteCard","reset")
       handleOperation(callback) { isoDep ->
-        Log.e(TAG, "reset Obtain the device")
+        OneKeyLog.debug("LiteCard","reset Obtain the device")
         val isSuccess = OneKeyLiteCard.reset(isoDep)
         if (!isSuccess) throw NFCExceptions.ExecFailureException()
-        Log.e(TAG, "reset result success")
+        OneKeyLog.debug("LiteCard","reset result success")
         true
       }
     }
@@ -357,7 +369,7 @@ class ReactNativeLiteCardModule(val reactContext: ReactApplicationContext) :
 
   override fun intoSetting() {
     launch {
-      Log.d(TAG, "intoSetting")
+      OneKeyLog.debug("LiteCard","intoSetting")
       Utils.getTopActivity()?.let {
         NfcUtils.intentToNfcSetting(it)
       }
@@ -401,10 +413,10 @@ class ReactNativeLiteCardModule(val reactContext: ReactApplicationContext) :
         try {
           OneKeyLiteCard.startNfc(it) {
             mNFCState.set(NFCState.Started)
-            Log.d(TAG, "NFC starting success")
+            OneKeyLog.debug("LiteCard","NFC starting success")
           }
         } catch (e: Exception) {
-          Log.e(TAG, "startNfc failed", e)
+          OneKeyLog.error("LiteCard", "startNfc failed: ${e.message}")
         }
       }
     }
@@ -416,9 +428,9 @@ class ReactNativeLiteCardModule(val reactContext: ReactApplicationContext) :
         try {
           OneKeyLiteCard.stopNfc(it as FragmentActivity)
           mNFCState.set(NFCState.Dead)
-          Log.d(TAG, "NFC 已关闭")
+          OneKeyLog.debug("LiteCard","NFC 已关闭")
         } catch (e: Exception) {
-          Log.e(TAG, "stopNfc failed", e)
+          OneKeyLog.error("LiteCard", "stopNfc failed: ${e.message}")
         }
       }
     }

package/android/src/main/java/com/onekeyfe/reactnativelitecard/nfc/broadcast/NfcStatusChangeBroadcastReceiver.kt

@@ -5,7 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.nfc.NfcAdapter
-import android.util.Log
+import com.margelo.nitro.nativelogger.OneKeyLog
 
 open class NfcStatusChangeBroadcastReceiver : BroadcastReceiver() {
 
@@ -15,7 +15,7 @@ open class NfcStatusChangeBroadcastReceiver : BroadcastReceiver() {
             val state =
                     intent.getIntExtra(NfcAdapter.EXTRA_ADAPTER_STATE, NfcAdapter.STATE_OFF)
 
-            Log.e(TAG, "nfc state broadcast receiver, state is $state")
+            OneKeyLog.debug("LiteCard", "nfc state broadcast receiver, state is $state")
             when (state) {
                 NfcAdapter.STATE_OFF -> onNfcOff()
                 NfcAdapter.STATE_ON -> onNfcOn()

package/android/src/main/java/com/onekeyfe/reactnativelitecard/onekeyLite/OnekeyLiteCard.kt

@@ -2,8 +2,8 @@ package com.onekeyfe.reactnativelitecard.onekeyLite
 
 import android.app.Activity
 import android.nfc.tech.IsoDep
-import android.util.Log
 import androidx.fragment.app.FragmentActivity
+import com.margelo.nitro.nativelogger.OneKeyLog
 import androidx.lifecycle.Lifecycle
 import com.google.gson.Gson
 import kotlinx.coroutines.Dispatchers
@@ -20,9 +20,10 @@ import com.onekeyfe.reactnativelitecard.utils.NfcPermissionUtils
 object OneKeyLiteCard {
     const val TAG = "OneKeyLiteCard"
 
-    private val mCommandGenerator by lazy(LazyThreadSafetyMode.NONE) {
+    private val mCommandGenerator by lazy {
         CommandGenerator()
     }
+    @Volatile
     private var mCardConnection: Connection? = null
 
     suspend fun startNfc(activity: FragmentActivity, callback: ((Boolean) -> Unit)? = null) =
@@ -52,7 +53,7 @@ object OneKeyLiteCard {
                 callback?.invoke(true)
                 return@withContext
             }
-            Log.e(TAG, "startNfc Not NFC permission")
+            OneKeyLog.error("LiteCard","startNfc Not NFC permission")
             callback?.invoke(false)
         }
 
@@ -110,7 +111,7 @@ object OneKeyLiteCard {
     ): Boolean {
         if (cardState == null) throw NFCExceptions.ConnectionFailException()
 
-        printLog(TAG, "--> setMnemonic: cardState:${Gson().toJson(cardState)}")
+        printLog(TAG, "--> setMnemonic: isNewCard:${cardState?.isNewCard}, hasBackup:${cardState?.hasBackup}")
 
         if (!overwrite) {
             // 不是覆写要验证是否已经已经存有备份
@@ -146,7 +147,8 @@ object OneKeyLiteCard {
             }
         }
 
-        return mCardConnection?.backupData(mnemonic ?: "") == true
+        if (mnemonic.isNullOrEmpty()) throw NFCExceptions.ExecFailureException()
+        return mCardConnection?.backupData(mnemonic) == true
     }
 
     @Throws(NFCExceptions::class)

package/android/src/main/java/com/onekeyfe/reactnativelitecard/onekeyLite/nfc/Connection.kt

@@ -140,7 +140,7 @@ class Connection(val isoDep: IsoDep, private val mCommandGenerator: CommandGener
 
         printLog(TAG, "0. ---> getDeviceCertificate begin")
         val certInfo = getDeviceCertificate() ?: return false
-        printLog(TAG, "0. <--- getDeviceCertificate end: ${certInfo.subjectID}")
+        printLog(TAG, "0. <--- getDeviceCertificate end")
 
         printLog(TAG, "1. ---> nativeGPCInitialize begin")
         val param = SecureChanelParam.objectFromData(
@@ -303,7 +303,7 @@ class Connection(val isoDep: IsoDep, private val mCommandGenerator: CommandGener
             mCardType, CommandType.SETUP_NEW_PIN, hasOpenSafeChannel, "DFFE0B8204080006$pinHex"
         )
         val res = command.send(this)
-        printLog(TAG, "<--- setupNewPin end: ${res.getCode()} ${res.data} area:${mCommandArea}")
+        printLog(TAG, "<--- setupNewPin end: ${res.getCode()} area:${mCommandArea}")
 
         if (!res.isSuccess()) {
             return false
@@ -326,7 +326,7 @@ class Connection(val isoDep: IsoDep, private val mCommandGenerator: CommandGener
         )
         val res = command.send(this)
 
-        printLog(TAG, "<--- changePin end: ${res.getCode()} ${res.data} area:${mCommandArea}")
+        printLog(TAG, "<--- changePin end: ${res.getCode()} area:${mCommandArea}")
 
         return if (res.isConnectFailure()) {
             NfcConstant.INTERRUPT_STATUS
@@ -356,7 +356,7 @@ class Connection(val isoDep: IsoDep, private val mCommandGenerator: CommandGener
             mCardType, CommandType.VERIFY_PIN, hasOpenSafeChannel, "06$pinHex"
         )
         val res = command.send(this)
-        printLog(TAG, "<--- startVerifyPin end: ${res.getCode()} ${res.data} area:${mCommandArea}")
+        printLog(TAG, "<--- startVerifyPin end: ${res.getCode()} area:${mCommandArea}")
 
         return if (res.isConnectFailure()) {
             NfcConstant.INTERRUPT_STATUS
@@ -385,7 +385,7 @@ class Connection(val isoDep: IsoDep, private val mCommandGenerator: CommandGener
             mCardType, CommandType.BACKUP_DATA, hasOpenSafeChannel, mnemonic
         )
         val res = command.send(this)
-        printLog(TAG, "<--- backupData end: ${res.getCode()} ${res.data} area:${mCommandArea}")
+        printLog(TAG, "<--- backupData end: ${res.getCode()} area:${mCommandArea}")
 
         if (!res.isSuccess()) {
             return false

package/android/src/main/java/com/onekeyfe/reactnativelitecard/utils/LogUtil.kt

@@ -1,11 +1,25 @@
 package com.onekeyfe.reactnativelitecard.utils
 
-import com.onekeyfe.reactnativelitecard.onekeyLite.NfcConstant
-import com.onekeyfe.reactnativelitecard.LoggerManager
+import android.content.pm.ApplicationInfo
+import com.margelo.nitro.nativelogger.OneKeyLog
 
 object LogUtil {
+    // Only enable detailed NFC/APDU logging in debug builds
+    // Uses FLAG_DEBUGGABLE from the host app's ApplicationInfo at runtime,
+    // rather than the library's BuildConfig which won't reflect the host's build type.
+    private val isDebug: Boolean by lazy {
+        try {
+            val app = Utils.getApp()
+            app != null && (app.applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE) != 0
+        } catch (_: Exception) {
+            false
+        }
+    }
+
     @JvmStatic
     fun printLog(tag: String, msg: String) {
-        if (NfcConstant.DEBUG) LoggerManager.getInstance()?.logInfo("$tag: $msg")
+        if (isDebug) {
+            OneKeyLog.debug(tag, msg)
+        }
     }
 }

package/android/src/main/java/com/onekeyfe/reactnativelitecard/utils/MiUtil.kt

@@ -6,8 +6,8 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.provider.Settings
-import android.util.Log
 import androidx.annotation.IntDef
+import com.margelo.nitro.nativelogger.OneKeyLog
 import androidx.annotation.RequiresApi
 import com.onekeyfe.reactnativelitecard.utils.MiUtil.PermissionResult.Companion.PERMISSION_ASK
 import com.onekeyfe.reactnativelitecard.utils.MiUtil.PermissionResult.Companion.PERMISSION_DENIED
@@ -59,13 +59,13 @@ object MiUtil {
             //the ops of NFC is 10016,check /data/system/appops/xxx.xml
             val invoke = checkOpNoThrowMethod.invoke(mAppOps, 10016, uid, pkg)
             if (invoke == null) {
-                Log.d(TAG,
+                OneKeyLog.debug("LiteCard",
                         "MIUI check permission checkOpNoThrowMethod(AppOpsManager) invoke result is null"
                 )
                 return PERMISSION_UNKNOWN
             }
             val result = invoke.toString()
-            Log.d(TAG,
+            OneKeyLog.debug("LiteCard",
                     "MIUI check permission checkOpNoThrowMethod(AppOpsManager) invoke result = $result"
             )
             when (result) {
@@ -74,7 +74,7 @@ object MiUtil {
                 "5" -> return PERMISSION_ASK
             }
         } catch (e: Exception) {
-            Log.d(TAG, "check nfc permission fail ${e.message}", e)
+            OneKeyLog.debug("LiteCard", "check nfc permission fail: ${e.message}")
         }
         return PERMISSION_UNKNOWN
     }
@@ -86,7 +86,7 @@ object MiUtil {
             context.startActivity(intent)
             true
         } catch (e: Exception) {
-            Log.d(TAG, "open app setting fail ${e.message}", e)
+            OneKeyLog.debug("LiteCard", "open app setting fail: ${e.message}")
             false
         }
     }

package/ios/Classes/OKNFCBridge.mm

@@ -17,6 +17,7 @@
 
 
 #import "OKNFCBridge.h"
+#import "LCLogger.h"
 
 @implementation OKNFCBridge
 
@@ -44,6 +45,7 @@
     }
 
     NSString *hexStr = [NSString stringWithCString:c_apdu encoding:NSUTF8StringEncoding];
+    JUB_FreeMemory(c_apdu);
     NSData *APDUData = [hexStr dataFromHexString];
     NFCISO7816APDU *apdu = [[NFCISO7816APDU alloc] initWithData:APDUData];
     return apdu;
@@ -84,6 +86,8 @@
         return NO;
     }
 
+    JUB_FreeMemory(value);
+
     JUB_UINT16 wRet = 0;
     JUB_CHAR_PTR pDecResp = nullptr;
     rv = JUB_GPC_ParseAPDUResponse(c_data,&wRet, &pDecResp);
@@ -130,7 +134,9 @@
         return nil;
     }
 
-    return [NSString stringWithFormat:@"%s", mutualAuthData];
+    NSString *result = [NSString stringWithFormat:@"%s", mutualAuthData];
+    JUB_FreeMemory(mutualAuthData);
+    return result;
 }
 
 + (BOOL)openChannel:(NSData *)authRes {
@@ -139,10 +145,10 @@
 
     rv = JUB_GPC_OpenSecureChannel(authResp);
     if (JUBR_OK != rv) {
-        NSLog(@"error: JUB_GPC_OpenSecureChannel");
+        [LCLogger error:@"JUB_GPC_OpenSecureChannel failed"];
         return NO;
     }
-    NSLog(@"OKNFC: openChannel success.");
+    [LCLogger debug:@"openChannel success"];
     return YES;
 }
 
@@ -161,10 +167,11 @@
     JUB_CHAR_PTR subjectID = nullptr;
     rv = JUB_GPC_ParseCertificate(value, &sn, &subjectID);
     if (JUBR_OK != rv) {
+        JUB_FreeMemory(value);
         return NO;
     }
 
-    NSLog(@"OKNFC: subjectID: %s",subjectID);
+    [LCLogger debug:@"subjectID parsed"];
     GPC_SCP11_SHAREDINFO shareInfo;
     shareInfo.scpID = (char *)"1107";
     shareInfo.keyUsage = (char *)"3C";
@@ -178,11 +185,15 @@
 
     rv = JUB_GPC_Initialize(shareInfo, [NFCConfig envFor:@"crt"].UTF8String, sk);
 
+    JUB_FreeMemory(value);
+    JUB_FreeMemory(sn);
+    JUB_FreeMemory(subjectID);
+
     if (JUBR_OK != rv) {
         return NO;
     }
 
-    NSLog(@"OKNFC: JUB_GPC_Initialize OK.");
+    [LCLogger debug:@"JUB_GPC_Initialize OK"];
     return YES;
 }
 
@@ -205,6 +216,7 @@
     JUB_CHAR_PTR subjectID = nullptr;
     rv = JUB_GPC_ParseCertificate(value, &sn, &subjectID);
     if (JUBR_OK != rv) {
+        JUB_FreeMemory(value);
         return NO;
     }
 
@@ -212,7 +224,11 @@
 
     BOOL identical = [certSN isEqualToString:cardSN];
 
-    NSLog(@"OKNFC: certSN: %@; cardSN: %@; identical: %@",certSN, cardSN, identical ? @"YES✅" : @"NO❌");
+    JUB_FreeMemory(value);
+    JUB_FreeMemory(sn);
+    JUB_FreeMemory(subjectID);
+
+    [LCLogger debug:[NSString stringWithFormat:@"certSN verification: %@", identical ? @"PASS" : @"FAIL"]];
     return identical;
 }
 

package/ios/Classes/OKNFTLite/OKLiteV1.m

@@ -8,6 +8,7 @@
 #import "OKLiteV1.h"
 #import "OKNFCUtility.h"
 #import "OKLiteCommandModal.h"
+#import "LCLogger.h"
 
 @interface OKLiteV1()
 
@@ -214,7 +215,7 @@
     dispatch_semaphore_signal(sema);
   }];
 
-  dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
+  dispatch_semaphore_wait(sema, dispatch_time(DISPATCH_TIME_NOW, 30 * NSEC_PER_SEC));
   return success;
 }
 
@@ -344,7 +345,7 @@
       selectSuccess = sw1 == OKNFC_SW1_OK;
       dispatch_semaphore_signal(sema);
     }];
-    dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
+    dispatch_semaphore_wait(sema, dispatch_time(DISPATCH_TIME_NOW, 30 * NSEC_PER_SEC));
     if (selectSuccess) {
       self.selectNFCApp = app;
     } else {
@@ -371,7 +372,7 @@
       dispatch_semaphore_signal(sema);
     }];
   }];
-  dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
+  dispatch_semaphore_wait(sema, dispatch_time(DISPATCH_TIME_NOW, 30 * NSEC_PER_SEC));
   return success;
 }
 
@@ -389,7 +390,7 @@
     SN = [[NSString alloc] initWithData:responseData encoding:NSUTF8StringEncoding];
     dispatch_semaphore_signal(sema);
   }];
-  dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
+  dispatch_semaphore_wait(sema, dispatch_time(DISPATCH_TIME_NOW, 30 * NSEC_PER_SEC));
   return SN;
 }
 
@@ -425,7 +426,7 @@
     result = OKNFCLitePINVerifyResultPass;
     dispatch_semaphore_signal(sema);
   }];
-  dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
+  dispatch_semaphore_wait(sema, dispatch_time(DISPATCH_TIME_NOW, 30 * NSEC_PER_SEC));
   return result;
 }
 
@@ -450,26 +451,26 @@
     isVerificationPass = YES;
 
     if (sw1 != OKNFC_SW1_OK) {
-      NSLog(@"OKNFC: 获取证书失败");
+      [LCLogger error:@"获取证书失败"];
       isVerificationPass = NO;
       dispatch_semaphore_signal(sema);
       return;
     }
 
     if (![OKNFCBridge verifySN:self.SN withCert:certData]) {
-      NSLog(@"OKNFC: 验证证书失败");
+      [LCLogger error:@"验证证书失败"];
       isVerificationPass = NO;
     }
 
     if (![OKNFCBridge JUB_GPC_Initialize:certData]) {
-      NSLog(@"OKNFC: 初始化安全通道失败");
+      [LCLogger error:@"初始化安全通道失败"];
       isVerificationPass = NO;
     }
 
     dispatch_semaphore_signal(sema);
   }];
 
-  dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
+  dispatch_semaphore_wait(sema, dispatch_time(DISPATCH_TIME_NOW, 30 * NSEC_PER_SEC));
   self.certVerified = isVerificationPass;
 
   return isVerificationPass;
@@ -486,12 +487,12 @@
                                   modal:modal
                       completionHandler:^(NSData * _Nonnull responseData, uint8_t sw1, uint8_t sw2, NSError * _Nullable error, NSString * _Nonnull parseRespon) {
     if (sw1 != OKNFC_SW1_OK) {
-      NSLog(@"OKNFC: 获取 PIN 状态失败");
+      [LCLogger error:@"获取 PIN 状态失败"];
       dispatch_semaphore_signal(sema);
       return;
     }
     if (responseData.toHexString.intValue == 2) {
-      NSLog(@"OKNFC: 未设置 PIN");
+      [LCLogger debug:@"未设置 PIN"];
       pinStatus = OKNFC_PIN_UNSET;
       dispatch_semaphore_signal(sema);
       return;
@@ -509,7 +510,7 @@
     }
   }];
 
-  dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
+  dispatch_semaphore_wait(sema, dispatch_time(DISPATCH_TIME_NOW, 30 * NSEC_PER_SEC));
   return pinStatus;
 }
 
@@ -527,7 +528,7 @@
     dispatch_semaphore_signal(sema);
   }];
 
-  dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
+  dispatch_semaphore_wait(sema, dispatch_time(DISPATCH_TIME_NOW, 30 * NSEC_PER_SEC));
   return success;
 }
 
@@ -551,7 +552,7 @@
     dispatch_semaphore_signal(sema);
   }];
 
-  dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
+  dispatch_semaphore_wait(sema, dispatch_time(DISPATCH_TIME_NOW, 30 * NSEC_PER_SEC));
   return mnc;
 }
 
@@ -568,11 +569,11 @@
       return;
     }
     success = YES;
-    NSLog(@"OKNFC: 成功设置 PIN = %@", pin);
+    [LCLogger debug:@"成功设置 PIN"];
     dispatch_semaphore_signal(sema);
   }];
 
-  dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
+  dispatch_semaphore_wait(sema, dispatch_time(DISPATCH_TIME_NOW, 30 * NSEC_PER_SEC));
   return success;
 }
 
@@ -597,11 +598,11 @@
       return;
     }
     result = OKNFCLiteChangePinResultPass;
-    NSLog(@"OKNFC: 成功修改 PIN = %@", newPin);
+    [LCLogger debug:@"成功修改 PIN"];
     dispatch_semaphore_signal(sema);
   }];
 
-  dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
+  dispatch_semaphore_wait(sema, dispatch_time(DISPATCH_TIME_NOW, 30 * NSEC_PER_SEC));
   return result;
 }
 

package/ios/Classes/OKNFTLite/OKNFCManager.m

@@ -9,6 +9,7 @@
 #import "OKNFCBridge.h"
 #import "OKNFCUtility.h"
 #import <CoreNFC/CoreNFC.h>
+#import "LCLogger.h"
 //#import "OKNFCHintViewController.h"
 //#import "OKMnemonic.h"
 #import "NSString+OKAdd.h"
@@ -82,15 +83,15 @@
 #pragma mark - NFCTagReaderSessionDelegate
 
 - (void)tagReaderSession:(NFCTagReaderSession *)session didDetectTags:(NSArray<__kindof id<NFCTag>> *)tags {
-    NSLog(@"OKNFC tagReaderSession didDetectTags %@", tags);
+    [LCLogger debug:@"tagReaderSession didDetectTags"];
 
     id<NFCISO7816Tag> tag = [tags.firstObject asNFCISO7816Tag];
     if (!tag) { return; }
 
     [session connectToTag:tag completionHandler:^(NSError * _Nullable error) {
         if (error) {
-            NSString *errMsg = [NSString stringWithFormat:@"OKNFC connectToTag %@", error];
-            NSLog(@"%@", errMsg);
+            NSString *errMsg = [NSString stringWithFormat:@"connectToTag error: %@", error.localizedDescription];
+            [LCLogger error:errMsg];
             //            [kTools debugTipMessage:errMsg];
             [self endNFCSessionWithError:YES];
             return;
@@ -100,7 +101,7 @@
 }
 
 - (void)tagReaderSession:(NFCTagReaderSession *)session didInvalidateWithError:(NSError *)error {
-    NSLog(@"OKNFC tagReaderSession didInvalidateWithError %@", error);
+    [LCLogger debug:[NSString stringWithFormat:@"tagReaderSession didInvalidateWithError: %@", error.localizedDescription]];
     if (error.code == 200 || error.code == 6) {
         switch (self.sessionType) {
             case OKNFCLiteSessionTypeGetInfo:
@@ -144,7 +145,7 @@
 }
 
 - (void)tagReaderSessionDidBecomeActive:(NFCTagReaderSession *)session {
-    NSLog(@"OKNFC tagReaderSessionDidBecomeActive %@", session);
+    [LCLogger debug:@"tagReaderSessionDidBecomeActive"];
 }
 
 #pragma mark - Tasks
@@ -237,7 +238,12 @@
 
 - (void)_setMnemonic:(BOOL)force {
     SetMnemonicCallback callback = [_completionBlocks objectForKey:kSetMnemonicBlock];
-    [self.lite setMnemonic:self.exportMnemonic withPin:self.pin overwrite:force complete:callback];
+    NSString *mnemonic = self.exportMnemonic;
+    NSString *pin = self.pin;
+    // Clear sensitive data from properties immediately
+    self.exportMnemonic = nil;
+    self.pin = nil;
+    [self.lite setMnemonic:mnemonic withPin:pin overwrite:force complete:callback];
 }
 
 #pragma mark - getMnemonic
@@ -254,7 +260,10 @@
 
 - (void)_getMnemonic {
     GetMnemonicCallback callback = [_completionBlocks objectForKey:kGetMnemonicBlock];
-    [self.lite getMnemonicWithPin:self.pin complete:callback];
+    NSString *pin = self.pin;
+    // Clear sensitive data from property immediately
+    self.pin = nil;
+    [self.lite getMnemonicWithPin:pin complete:callback];
 }
 
 #pragma mark - changePin
@@ -269,7 +278,12 @@
 
 - (void)_changePin {
     ChangePinCallback callback = [_completionBlocks objectForKey:kChangePinBlock];
-    [self.lite changePin:self.pin to:self.neoPin complete:callback];
+    NSString *oldPin = self.pin;
+    NSString *newPin = self.neoPin;
+    // Clear sensitive data from properties immediately
+    self.pin = nil;
+    self.neoPin = nil;
+    [self.lite changePin:oldPin to:newPin complete:callback];
 }
 
 #pragma mark - reset
@@ -306,7 +320,7 @@
 
         dispatch_semaphore_signal(sema);
     }];
-    dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
+    dispatch_semaphore_wait(sema, dispatch_time(DISPATCH_TIME_NOW, 30 * NSEC_PER_SEC));
 
     if(success) {
         self.lite = [[OKLiteV1 alloc] initWithDelegate:self];
@@ -317,7 +331,7 @@
             success = sw1 == OKNFC_SW1_OK;
             dispatch_semaphore_signal(sema);
         }];
-        dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
+        dispatch_semaphore_wait(sema, dispatch_time(DISPATCH_TIME_NOW, 30 * NSEC_PER_SEC));
         if (success) {
             self.lite = [[OKLiteV2 alloc] initWithDelegate:self];
         }

package/ios/Classes/Utils/LCLogger.h

@@ -0,0 +1,16 @@
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/// Lightweight logging wrapper that dynamically dispatches to OneKeyLog.
+/// Avoids `@import ReactNativeNativeLogger` which fails when C++ modules are disabled.
+@interface LCLogger : NSObject
+
++ (void)debug:(NSString *)message;
++ (void)info:(NSString *)message;
++ (void)warn:(NSString *)message;
++ (void)error:(NSString *)message;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/Classes/Utils/LCLogger.m

@@ -0,0 +1,42 @@
+#import "LCLogger.h"
+
+static NSString *const kTag = @"LiteCard";
+
+@implementation LCLogger
+
++ (void)debug:(NSString *)message {
+    [self _log:@"debug::" message:message];
+}
+
++ (void)info:(NSString *)message {
+    [self _log:@"info::" message:message];
+}
+
++ (void)warn:(NSString *)message {
+    [self _log:@"warn::" message:message];
+}
+
++ (void)error:(NSString *)message {
+    [self _log:@"error::" message:message];
+}
+
+#pragma mark - Private
+
++ (void)_log:(NSString *)selectorName message:(NSString *)message {
+    Class logClass = NSClassFromString(@"ReactNativeNativeLogger.OneKeyLog");
+    if (!logClass) {
+        logClass = NSClassFromString(@"OneKeyLog");
+    }
+    if (!logClass) {
+        return;
+    }
+    SEL sel = NSSelectorFromString(selectorName);
+    if (![logClass respondsToSelector:sel]) {
+        return;
+    }
+    typedef void (*LogFunc)(id, SEL, NSString *, NSString *);
+    LogFunc func = (LogFunc)[logClass methodForSelector:sel];
+    func(logClass, sel, kTag, message);
+}
+
+@end

package/ios/Classes/Utils/OKNFCUtility.m

@@ -6,16 +6,17 @@
 //
 
 #import "OKNFCUtility.h"
+#import "LCLogger.h"
 
 @implementation OKNFCUtility
 
 + (void)logAPDU:(NSString *)name response:(NSData *)responseData sw1:(uint8_t)sw1 sw2:(uint8_t)sw2 error:(NSError *)error {
     BOOL ok = sw1 == OKNFC_SW1_OK;
-    NSString *sw1e = ok ? @"成功 ✅" : @"失败 ❌";
-    NSString *msg = [NSString stringWithFormat:@"OKNFC: Log %@: %@ \n-> sw1: %d(%x) sw2: %d(%x) err:%@ \n-> responseData: %@", name, sw1e, sw1, sw1, sw2, sw2, error, responseData];
-    NSLog(@"%@", msg);
-    if (!ok) {
-//        [kTools debugTipMessage:msg];
+    NSString *msg = [NSString stringWithFormat:@"APDU %@: %@ sw1:%d(%x) sw2:%d(%x)", name, ok ? @"OK" : @"FAIL", sw1, sw1, sw2, sw2];
+    if (ok) {
+        [LCLogger debug:msg];
+    } else {
+        [LCLogger error:msg];
     }
 }
 

package/ios/ReactNativeLiteCard.mm

@@ -3,6 +3,7 @@
 #import "NFCConfig.h"
 #import "OKNFCManager.h"
 #import "OKLiteV1.h"
+#import "LCLogger.h"
 
 typedef NS_ENUM(NSInteger, NFCLiteExceptions) {
   NFCLiteExceptionsInitChannel = 1000,// 初始化异常
@@ -34,6 +35,7 @@ typedef NS_ENUM(NSInteger, NFCLiteExceptions) {
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params
 {
+    [LCLogger info:@"ReactNativeLiteCard module initialized"];
     return std::make_shared<facebook::react::NativeReactNativeLiteCardSpecJSI>(params);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-lite-card",
-  "version": "1.1.19",
+  "version": "1.1.21",
   "description": "lite card",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",