chore: change react native ble plx

OneKeyHQ · Sep 13, 2024 · 7e35d10 · 7e35d10
1 parent 5d8e461
commit 7e35d10
Show file tree

Hide file tree

Showing 10 changed files with 1,168 additions and 54 deletions.
diff --git a/packages/connect-examples/expo-example/App.tsx b/packages/connect-examples/expo-example/App.tsx
@@ -121,15 +121,15 @@ function UpdateTip() {
 // Main App
 export default function App() {
   return (
-    <TamaguiProviderWrapperMemo>
-      <SafeAreaProvider>
-        <SDKProvider>
-          <AppIntlProvider>
+    <AppIntlProvider>
+      <TamaguiProviderWrapperMemo>
+        <SafeAreaProvider>
+          <SDKProvider>
             <UpdateTip />
             <NavigationContentMemo />
-          </AppIntlProvider>
-        </SDKProvider>
-      </SafeAreaProvider>
-    </TamaguiProviderWrapperMemo>
+          </SDKProvider>
+        </SafeAreaProvider>
+      </TamaguiProviderWrapperMemo>
+    </AppIntlProvider>
   );
 }
diff --git a/packages/connect-examples/expo-example/locale/en-US.json b/packages/connect-examples/expo-example/locale/en-US.json
@@ -77,6 +77,7 @@
   "label__image_res_type": "Resource type",
   "label__res_file_suffix": "File Suffix",
   "label__res_type_wall_paper": "WallPaper",
+  "label__res_file_name": "File Name (wp|nft-{filename}-{random})",
   "label__res_type_nft": "NFT",
   "label__nft_data": "NFT Data",
   "label__nft_url": "NFT URL",

diff --git a/packages/connect-examples/expo-example/package.json b/packages/connect-examples/expo-example/package.json
@@ -20,7 +20,7 @@
     "@onekeyfe/hd-common-connect-sdk": "^1.0.10",
     "@onekeyfe/hd-core": "^1.0.10",
     "@onekeyfe/hd-web-sdk": "^1.0.10",
-    "@onekeyfe/react-native-ble-plx": "3.0.0",
+    "react-native-ble-plx": "3.2.1",
     "@react-native-async-storage/async-storage": "1.21.0",
     "@react-native-picker/picker": "2.6.1",
     "@react-navigation/bottom-tabs": "^6.5.12",
@@ -49,6 +49,7 @@
     "expo-localization": "~14.8.4",
     "expo-splash-screen": "~0.26.5",
     "expo-status-bar": "~1.11.1",
+    "metro": "0.80.12",
     "jotai": "^2.6.4",
     "levelup": "^5.1.1",
     "lodash": "^4.17.21",

diff --git a/packages/connect-examples/expo-example/src/components/HandleSDKEvents.tsx b/packages/connect-examples/expo-example/src/components/HandleSDKEvents.tsx
@@ -60,8 +60,6 @@ export default function HandleSDKEvents() {
         if (message.type === UI_REQUEST.REQUEST_PIN) {
           if (supportInputPinOnSoftware(message.payload.device.features).support) {
             setShowPinInput(true);
-          } else {
-            onInputPinOnDeviceCallback();
           }
         }
         if (message.type === UI_REQUEST.REQUEST_PASSPHRASE) {
@@ -111,7 +109,7 @@ export default function HandleSDKEvents() {
         SDK.off(UI_EVENT, uiEventCallback);
         registerListener = false;
       };
-    }, [HardwareLowLevelSDK, SDK, onInputPinOnDeviceCallback])
+    }, [HardwareLowLevelSDK, SDK])
   );
 
   return (

diff --git a/packages/connect-examples/expo-example/src/provider/HardwareInputPinProvider.tsx b/packages/connect-examples/expo-example/src/provider/HardwareInputPinProvider.tsx
@@ -31,16 +31,11 @@ export const HardwareInputPinDialogProvider: React.FC<{ children: ReactNode }> =
     });
   }, [dialogState.sdk]);
 
-  const openDialog = useCallback(
-    (sdk: any, features: Features) => {
-      if (supportInputPinOnSoftware(features).support) {
-        setDialogState({ isOpen: true, sdk });
-      } else {
-        onInputPinOnDeviceCallback();
-      }
-    },
-    [onInputPinOnDeviceCallback]
-  );
+  const openDialog = useCallback((sdk: any, features: Features) => {
+    if (supportInputPinOnSoftware(features).support) {
+      setDialogState({ isOpen: true, sdk });
+    }
+  }, []);
 
   const closeDialog = useCallback(() => {
     setDialogState(prevState => ({ ...prevState, isOpen: false, sdk: undefined }));

diff --git a/packages/hd-transport-react-native/package.json b/packages/hd-transport-react-native/package.json
@@ -21,7 +21,7 @@
   "dependencies": {
     "@onekeyfe/hd-shared": "^1.0.10",
     "@onekeyfe/hd-transport": "^1.0.10",
-    "@onekeyfe/react-native-ble-plx": "3.0.1",
+    "react-native-ble-plx": "3.2.1",
     "react-native-ble-manager": "^8.1.0"
   }
 }
diff --git a/packages/hd-transport-react-native/src/BleTransport.ts b/packages/hd-transport-react-native/src/BleTransport.ts
@@ -1,4 +1,4 @@
-import { Device, Characteristic } from '@onekeyfe/react-native-ble-plx';
+import { Device, Characteristic } from 'react-native-ble-plx';
 
 export default class BleTransport {
   id: string;

diff --git a/packages/hd-transport-react-native/src/index.ts b/packages/hd-transport-react-native/src/index.ts
@@ -6,7 +6,7 @@ import {
   BleErrorCode,
   Characteristic,
   ScanMode,
-} from '@onekeyfe/react-native-ble-plx';
+} from 'react-native-ble-plx';
 import ByteBuffer from 'bytebuffer';
 import transport, { COMMON_HEADER_SIZE, LogBlockCommand } from '@onekeyfe/hd-transport';
 import { createDeferred, Deferred, ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
@@ -30,8 +30,9 @@ const { check, buildBuffers, receiveOne, parseConfigure } = transport;
 const transportCache: Record<string, any> = {};
 
 let connectOptions: Record<string, unknown> = {
+  autoConnect: false,
   requestMTU: 256,
-  timeout: 3000,
+  // timeout: 60 * 1000,
   refreshGatt: 'OnConnected',
 };
 
@@ -541,7 +542,7 @@ export default class ReactNativeBleTransport {
       for (const o of buffers) {
         const outData = o.toString('base64');
         // Upload resources on low-end phones may OOM
-        // this.Log.debug('send hex strting: ', o.toString('hex'));
+        this.Log.debug('send hex strting: ', o.toString('hex'));
         try {
           await transport.writeCharacteristic.writeWithoutResponse(outData);
         } catch (e) {

diff --git a/packages/hd-transport-react-native/src/types.ts b/packages/hd-transport-react-native/src/types.ts
@@ -1,4 +1,4 @@
-export type { BleManager as BlePlxManager } from '@onekeyfe/react-native-ble-plx';
+export type { BleManager as BlePlxManager } from 'react-native-ble-plx';
 
 export type TransportOptions = {
   scanTimeout?: number;