Skip to content

Commit 94f048a

Browse files
huhuanminghuhuanming
committed
fix: fix version
1 parent a4bf19d commit 94f048a

31 files changed

+103
-83
lines changed

‎native-modules/react-native-check-biometric-auth-changed/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/react-native-check-biometric-auth-changed",
3-
"version": "1.1.3",
3+
"version": "1.1.5",
44
"description": "react-native-check-biometric-auth-changed",
55
"workspaces": [
66
"example"

‎native-modules/react-native-lite-card/android/build.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ def getExtOrIntegerDefault(name) {
2828
android {
2929
namespace "com.onekeyfe.reactnativelitecard"
3030

31+
externalNativeBuild {
32+
cmake {
33+
path "src/main/cpp/CMakeLists.txt"
34+
}
35+
}
36+
3137
compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
3238

3339
defaultConfig {

‎native-modules/react-native-lite-card/android/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
package="com.onekeyfe.reactnativelitecard">
23
</manifest>

native-modules/react-native-lite-card/android/src/main/config/command.json renamed to native-modules/react-native-lite-card/android/src/main/assets/config/command.json

File renamed without changes.

‎native-modules/react-native-lite-card/android/src/main/java/com/onekeyfe/reactnativelitecard/LoggerManager.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package so.onekey.app.wallet.lite
1+
package com.onekeyfe.reactnativelitecard
22

33
import android.util.Log
44
import com.facebook.react.bridge.ReactApplicationContext
55
import com.facebook.react.bridge.ReactContextBaseJavaModule
66
import com.facebook.react.bridge.ReactMethod
7-
import so.onekey.app.wallet.lite.utils.sendEvent
7+
import com.onekeyfe.reactnativelitecard.utils.sendEvent
88

99
class LoggerManager(private val context: ReactApplicationContext) :
1010
ReactContextBaseJavaModule(context) {

‎native-modules/react-native-lite-card/android/src/main/java/com/onekeyfe/reactnativelitecard/ReactNativeLiteCardModule.kt‎

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,25 @@ import kotlinx.coroutines.channels.Channel
1212
import com.facebook.react.bridge.Callback
1313
import com.facebook.react.bridge.ReactApplicationContext
1414
import com.facebook.react.module.annotations.ReactModule
15-
import so.onekey.app.wallet.lite.nfc.NFCExceptions
16-
import so.onekey.app.wallet.lite.nfc.NfcUtils
17-
import so.onekey.app.wallet.lite.onekeyLite.OneKeyLiteCard
18-
import so.onekey.app.wallet.lite.onekeyLite.entitys.CardState
19-
import so.onekey.app.wallet.lite.utils.NfcPermissionUtils
20-
import so.onekey.app.wallet.lite.utils.Utils
15+
import com.onekeyfe.reactnativelitecard.nfc.NFCExceptions
16+
import com.onekeyfe.reactnativelitecard.nfc.NfcUtils
17+
import com.onekeyfe.reactnativelitecard.onekeyLite.OneKeyLiteCard
18+
import com.onekeyfe.reactnativelitecard.onekeyLite.entitys.CardState
19+
import com.onekeyfe.reactnativelitecard.utils.NfcPermissionUtils
20+
import com.onekeyfe.reactnativelitecard.utils.Utils
2121
import java.util.concurrent.atomic.AtomicInteger
2222
import com.facebook.react.bridge.Arguments
2323
import com.facebook.react.bridge.BaseActivityEventListener
2424
import com.facebook.react.bridge.LifecycleEventListener
2525
import com.facebook.react.bridge.WritableMap
26-
import so.onekey.app.wallet.lite.nfc.broadcast.NfcStatusChangeBroadcastReceiver
26+
import com.onekeyfe.reactnativelitecard.nfc.broadcast.NfcStatusChangeBroadcastReceiver
2727
import java.util.concurrent.Executors.newFixedThreadPool
2828

2929
private val NFCDispatcher = newFixedThreadPool(1).asCoroutineDispatcher()
3030
public fun NFCScope(): CoroutineScope = CoroutineScope(SupervisorJob() + NFCDispatcher)
3131

3232
@ReactModule(name = ReactNativeLiteCardModule.NAME)
33-
class ReactNativeLiteCardModule(reactContext: ReactApplicationContext) :
33+
class ReactNativeLiteCardModule(val reactContext: ReactApplicationContext) :
3434
NativeReactNativeLiteCardSpec(reactContext), LifecycleEventListener, CoroutineScope by NFCScope() {
3535

3636
companion object {
@@ -50,6 +50,21 @@ class ReactNativeLiteCardModule(reactContext: ReactApplicationContext) :
5050
return NAME
5151
}
5252

53+
override fun initialize() {
54+
super.initialize()
55+
Utils.init(reactContext)
56+
Utils.getActivityLifecycle()
57+
Utils.getTopActivity()?.registerReceiver(
58+
mNfcStateBroadcastReceiver,
59+
NfcStatusChangeBroadcastReceiver.nfcBroadcastReceiverIntentFilter
60+
)
61+
Utils.getTopActivity()?.let {
62+
launch(Dispatchers.IO) {
63+
OneKeyLiteCard.startNfc(it as FragmentActivity) {}
64+
}
65+
}
66+
}
67+
5368
private val mNFCConnectedChannel = Channel<IsoDep?>(1)
5469
private var lastIsoDep: IsoDep? = null
5570
private val mNFCState = AtomicInteger(NFCState.Dead)
@@ -74,7 +89,7 @@ class ReactNativeLiteCardModule(reactContext: ReactApplicationContext) :
7489
val dataMap = Arguments.createMap().apply {
7590
putString("type", "unknown")
7691
}
77-
emitOnNFCActiveConnection(dataMap)
92+
emitOnNFCActiveConnection(dataMap.copy())
7893
Log.d(TAG, "Unknown device")
7994
return
8095
}
@@ -96,7 +111,7 @@ class ReactNativeLiteCardModule(reactContext: ReactApplicationContext) :
96111
putBoolean("isNewCard", startRequest.isNewCard)
97112
putBoolean("hasBackup", startRequest.hasBackup)
98113
}
99-
emitOnNFCActiveConnection(dataMap)
114+
emitOnNFCActiveConnection(dataMap.copy())
100115
}
101116
} catch (e: Exception) {
102117
e.printStackTrace()
@@ -105,8 +120,7 @@ class ReactNativeLiteCardModule(reactContext: ReactApplicationContext) :
105120
putInt("code", -1)
106121
putString("type", "unknown")
107122
}
108-
emitOnNFCActiveConnection(dataMap)
109-
emitOnNFCActiveConnection(dataMap)
123+
emitOnNFCActiveConnection(dataMap.copy())
110124
}
111125
}
112126
}
@@ -128,15 +142,15 @@ class ReactNativeLiteCardModule(reactContext: ReactApplicationContext) :
128142
emitOnNFCUIEvent(Arguments.createMap().also {
129143
it.putInt("code", 3)
130144
it.putString("message", "close_connect_ui")
131-
})
145+
}.copy())
132146

133147
// 还有需要处理的 NFC 事件
134148
if (decrementAndGet > 0) {
135149
// 展示连接 ui
136150
emitOnNFCUIEvent(Arguments.createMap().also {
137151
it.putInt("code", 1)
138152
it.putString("message", "show_connect_ui")
139-
})
153+
}.copy())
140154
}
141155
}
142156

@@ -146,7 +160,7 @@ class ReactNativeLiteCardModule(reactContext: ReactApplicationContext) :
146160
emitOnNFCUIEvent(Arguments.createMap().also {
147161
it.putInt("code", 1)
148162
it.putString("message", "show_connect_ui")
149-
})
163+
}.copy())
150164
mShowDialogNumber.incrementAndGet()
151165
val tryReceiveResult = mNFCConnectedChannel.tryReceive()
152166

@@ -182,7 +196,7 @@ class ReactNativeLiteCardModule(reactContext: ReactApplicationContext) :
182196
emitOnNFCUIEvent(Arguments.createMap().also {
183197
it.putInt("code", 2)
184198
it.putString("message", "connected")
185-
})
199+
}.copy())
186200
}
187201
return receiveIsoDep
188202
}
@@ -218,15 +232,15 @@ class ReactNativeLiteCardModule(reactContext: ReactApplicationContext) :
218232
map.putBoolean("isNewCard", this.isNewCard)
219233
map.putString("serialNum", this.serialNum)
220234
map.putInt("pinRetryCount", this.pinRetryCount)
221-
return map
235+
return map.copy()
222236
}
223237

224238
private fun NFCExceptions?.createArguments(): WritableMap {
225239
val map = Arguments.createMap()
226240
if (this == null) return map
227241
map.putInt("code", this.code)
228242
map.putString("message", this.message)
229-
return map
243+
return map.copy()
230244
}
231245

232246
override fun getLiteInfo(callback: Callback?) {
@@ -387,7 +401,6 @@ class ReactNativeLiteCardModule(reactContext: ReactApplicationContext) :
387401
try {
388402
OneKeyLiteCard.startNfc(it) {
389403
mNFCState.set(NFCState.Started)
390-
391404
Log.d(TAG, "NFC starting success")
392405
}
393406
} catch (e: Exception) {

‎native-modules/react-native-lite-card/android/src/main/java/com/onekeyfe/reactnativelitecard/keys/KeysNativeProvider.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package so.onekey.app.wallet.lite.keys
1+
package com.onekeyfe.reactnativelitecard.keys
22

33
import android.content.Context
44

‎native-modules/react-native-lite-card/android/src/main/java/com/onekeyfe/reactnativelitecard/nfc/Exceptions.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package so.onekey.app.wallet.lite.nfc
1+
package com.onekeyfe.reactnativelitecard.nfc
22

33
sealed class NFCExceptions(val code: Int, override val message: String? = null) : Exception(message) {
44
fun toJson(): String {

‎native-modules/react-native-lite-card/android/src/main/java/com/onekeyfe/reactnativelitecard/nfc/NfcUtils.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package so.onekey.app.wallet.lite.nfc
1+
package com.onekeyfe.reactnativelitecard.nfc
22

33
import android.app.Activity
44
import android.app.PendingIntent
@@ -9,7 +9,7 @@ import android.nfc.NfcAdapter
99
import android.nfc.tech.*
1010
import android.os.Build
1111
import android.provider.Settings
12-
import so.onekey.app.wallet.lite.utils.MiUtil
12+
import com.onekeyfe.reactnativelitecard.utils.MiUtil
1313

1414
object NfcUtils {
1515

‎native-modules/react-native-lite-card/android/src/main/java/com/onekeyfe/reactnativelitecard/nfc/broadcast/NfcStatusChangeBroadcastReceiver.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package so.onekey.app.wallet.lite.nfc.broadcast
1+
package com.onekeyfe.reactnativelitecard.nfc.broadcast
22

33
import android.content.BroadcastReceiver
44
import android.content.Context

0 commit comments

Comments
 (0)