Skip to content

Commit 05cde6f

Browse files
ByteZhang1024ByteZhang1024
authored
chore: optimize device cancel (#417)
* chore: optimize device cancel * chore: optimize ble utils * chore: release 1.0.25-alpha.2 * chore: release 1.0.26-alpha.0
1 parent 25ac0d0 commit 05cde6f

File tree

47 files changed

+1328
-629
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1328
-629
lines changed

‎package.json

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"update-protobuf": "lerna run update:protobuf --scope=@onekeyfe/hd-transport",
3434
"update-version": "lerna version --no-git-tag-version",
3535
"example": "cd ./packages/connect-examples/expo-example && yarn start",
36+
"example:web": "CONNECT_SRC=https://localhost:8087 && cd ./packages/connect-examples/expo-example && yarn start",
3637
"example:desktop": "cd ./packages/connect-examples/electron-example && yarn dev",
3738
"build:example:desktop": "cd ./packages/connect-examples/electron-example && yarn make",
3839
"dev:web": "cd ./packages/hd-web-sdk && yarn dev",

‎packages/connect-examples/electron-example/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "hardware-example",
33
"productName": "HardwareExample",
44
"executableName": "onekey-hardware-example",
5-
"version": "1.0.25",
5+
"version": "1.0.26-alpha.0",
66
"author": "OneKey",
77
"description": "End-to-end encrypted workspaces for teams",
88
"main": "dist/index.js",

‎packages/connect-examples/expo-example/android/app/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<meta-data android:name="expo.modules.updates.EXPO_SDK_VERSION" android:value="50.0.0"/>
1818
<meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>
1919
<meta-data android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS" android:value="0"/>
20-
<activity android:name=".MainActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" android:theme="@style/Theme.App.SplashScreen" android:exported="true" android:screenOrientation="portrait">
20+
<activity android:name=".MainActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|uiMode|locale|layoutDirection" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" android:theme="@style/Theme.App.SplashScreen" android:exported="true" android:screenOrientation="portrait">
2121
<intent-filter>
2222
<action android:name="android.intent.action.MAIN"/>
2323
<category android:name="android.intent.category.LAUNCHER"/>

‎packages/connect-examples/expo-example/android/app/src/main/res/values/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
<string name="app_name">HardwareExample</string>
33
<string name="expo_splash_screen_resize_mode" translatable="false">contain</string>
44
<string name="expo_splash_screen_status_bar_translucent" translatable="false">false</string>
5+
<string name="ExpoLocalization_supportsRTL" translatable="false">undefined</string>
56
</resources>

‎packages/connect-examples/expo-example/ios/HardwareExample.xcodeproj/project.pbxproj

+33-29
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,21 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 54;
6+
objectVersion = 46;
77
objects = {
88

99
/* Begin PBXBuildFile section */
1010
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
1111
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
1212
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
13+
2832BA57F5DA4AEFB52C69E6 /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = D88D49B09C374A85931321F3 /* noop-file.swift */; };
1314
3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */; };
1415
96905EF65AED1B983A6B3ABC /* libPods-HardwareExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58EEBF8E8E6FB1BC6CAF49B5 /* libPods-HardwareExample.a */; };
1516
B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */; };
16-
B44A8B9D11504076BB4FD5F5 /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B9D48BCBE2140F8AC657BC5 /* noop-file.swift */; };
1717
BB2F792D24A3F905000567C9 /* Expo.plist in Resources */ = {isa = PBXBuildFile; fileRef = BB2F792C24A3F905000567C9 /* Expo.plist */; };
1818
/* End PBXBuildFile section */
1919

2020
/* Begin PBXFileReference section */
21-
0B9D48BCBE2140F8AC657BC5 /* noop-file.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = "noop-file.swift"; path = "HardwareExample/noop-file.swift"; sourceTree = "<group>"; };
2221
13B07F961A680F5B00A75B9A /* HardwareExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HardwareExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
2322
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = HardwareExample/AppDelegate.h; sourceTree = "<group>"; };
2423
13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = HardwareExample/AppDelegate.mm; sourceTree = "<group>"; };
@@ -30,7 +29,8 @@
3029
7A4D352CD337FB3A3BF06240 /* Pods-HardwareExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HardwareExample.release.xcconfig"; path = "Target Support Files/Pods-HardwareExample/Pods-HardwareExample.release.xcconfig"; sourceTree = "<group>"; };
3130
AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SplashScreen.storyboard; path = HardwareExample/SplashScreen.storyboard; sourceTree = "<group>"; };
3231
BB2F792C24A3F905000567C9 /* Expo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Expo.plist; sourceTree = "<group>"; };
33-
D1B1852D8BA14D6C8B9C8CE4 /* HardwareExample-Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "HardwareExample-Bridging-Header.h"; path = "HardwareExample/HardwareExample-Bridging-Header.h"; sourceTree = "<group>"; };
32+
D88D49B09C374A85931321F3 /* noop-file.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = "noop-file.swift"; path = "HardwareExample/noop-file.swift"; sourceTree = "<group>"; };
33+
DE9435231D7D4D6794E5A5D5 /* HardwareExample-Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "HardwareExample-Bridging-Header.h"; path = "HardwareExample/HardwareExample-Bridging-Header.h"; sourceTree = "<group>"; };
3434
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
3535
FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-HardwareExample/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
3636
/* End PBXFileReference section */
@@ -57,8 +57,8 @@
5757
13B07FB61A68108700A75B9A /* Info.plist */,
5858
13B07FB71A68108700A75B9A /* main.m */,
5959
AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */,
60-
0B9D48BCBE2140F8AC657BC5 /* noop-file.swift */,
61-
D1B1852D8BA14D6C8B9C8CE4 /* HardwareExample-Bridging-Header.h */,
60+
D88D49B09C374A85931321F3 /* noop-file.swift */,
61+
DE9435231D7D4D6794E5A5D5 /* HardwareExample-Bridging-Header.h */,
6262
);
6363
name = HardwareExample;
6464
sourceTree = "<group>";
@@ -144,13 +144,13 @@
144144
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "HardwareExample" */;
145145
buildPhases = (
146146
08A4A3CD28434E44B6B9DE2E /* [CP] Check Pods Manifest.lock */,
147-
3AAC0BDB17F1991340D97987 /* [Expo] Configure project */,
147+
685DB4F011013F6E89B80406 /* [Expo] Configure project */,
148148
13B07F871A680F5B00A75B9A /* Sources */,
149149
13B07F8C1A680F5B00A75B9A /* Frameworks */,
150150
13B07F8E1A680F5B00A75B9A /* Resources */,
151151
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
152152
800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */,
153-
A5308144E4F2E02F577D1365 /* [CP] Embed Pods Frameworks */,
153+
83B063A462FAC8F7976338FE /* [CP] Embed Pods Frameworks */,
154154
);
155155
buildRules = (
156156
);
@@ -170,7 +170,9 @@
170170
LastUpgradeCheck = 1130;
171171
TargetAttributes = {
172172
13B07F861A680F5B00A75B9A = {
173+
DevelopmentTeam = 36YZKGR6QU;
173174
LastSwiftMigration = 1250;
175+
ProvisioningStyle = Automatic;
174176
};
175177
};
176178
};
@@ -243,7 +245,7 @@
243245
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
244246
showEnvVarsInLog = 0;
245247
};
246-
3AAC0BDB17F1991340D97987 /* [Expo] Configure project */ = {
248+
685DB4F011013F6E89B80406 /* [Expo] Configure project */ = {
247249
isa = PBXShellScriptBuildPhase;
248250
alwaysOutOfDate = 1;
249251
buildActionMask = 2147483647;
@@ -270,19 +272,23 @@
270272
inputPaths = (
271273
"${PODS_ROOT}/Target Support Files/Pods-HardwareExample/Pods-HardwareExample-resources.sh",
272274
"${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle",
275+
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoFileSystem/ExpoFileSystem_privacy.bundle",
276+
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoLocalization/ExpoLocalization_privacy.bundle",
273277
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
274278
);
275279
name = "[CP] Copy Pods Resources";
276280
outputPaths = (
277281
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXConstants.bundle",
282+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoFileSystem_privacy.bundle",
283+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoLocalization_privacy.bundle",
278284
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
279285
);
280286
runOnlyForDeploymentPostprocessing = 0;
281287
shellPath = /bin/sh;
282288
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-HardwareExample/Pods-HardwareExample-resources.sh\"\n";
283289
showEnvVarsInLog = 0;
284290
};
285-
A5308144E4F2E02F577D1365 /* [CP] Embed Pods Frameworks */ = {
291+
83B063A462FAC8F7976338FE /* [CP] Embed Pods Frameworks */ = {
286292
isa = PBXShellScriptBuildPhase;
287293
buildActionMask = 2147483647;
288294
files = (
@@ -310,7 +316,7 @@
310316
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */,
311317
13B07FC11A68108700A75B9A /* main.m in Sources */,
312318
B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */,
313-
B44A8B9D11504076BB4FD5F5 /* noop-file.swift in Sources */,
319+
2832BA57F5DA4AEFB52C69E6 /* noop-file.swift in Sources */,
314320
);
315321
runOnlyForDeploymentPostprocessing = 0;
316322
};
@@ -324,6 +330,8 @@
324330
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
325331
CLANG_ENABLE_MODULES = YES;
326332
CODE_SIGN_ENTITLEMENTS = HardwareExample/HardwareExample.entitlements;
333+
CODE_SIGN_IDENTITY = "Apple Development";
334+
CODE_SIGN_STYLE = Automatic;
327335
CURRENT_PROJECT_VERSION = 1;
328336
DEVELOPMENT_TEAM = 36YZKGR6QU;
329337
ENABLE_BITCODE = NO;
@@ -333,10 +341,7 @@
333341
);
334342
INFOPLIST_FILE = HardwareExample/Info.plist;
335343
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
336-
LD_RUNPATH_SEARCH_PATHS = (
337-
"$(inherited)",
338-
"@executable_path/Frameworks",
339-
);
344+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
340345
MARKETING_VERSION = 1.0;
341346
OTHER_LDFLAGS = (
342347
"$(inherited)",
@@ -361,14 +366,13 @@
361366
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
362367
CLANG_ENABLE_MODULES = YES;
363368
CODE_SIGN_ENTITLEMENTS = HardwareExample/HardwareExample.entitlements;
369+
CODE_SIGN_IDENTITY = "Apple Development";
370+
CODE_SIGN_STYLE = Automatic;
364371
CURRENT_PROJECT_VERSION = 1;
365372
DEVELOPMENT_TEAM = 36YZKGR6QU;
366373
INFOPLIST_FILE = HardwareExample/Info.plist;
367374
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
368-
LD_RUNPATH_SEARCH_PATHS = (
369-
"$(inherited)",
370-
"@executable_path/Frameworks",
371-
);
375+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
372376
MARKETING_VERSION = 1.0;
373377
OTHER_LDFLAGS = (
374378
"$(inherited)",
@@ -434,16 +438,16 @@
434438
GCC_WARN_UNUSED_FUNCTION = YES;
435439
GCC_WARN_UNUSED_VARIABLE = YES;
436440
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
437-
LD_RUNPATH_SEARCH_PATHS = (
438-
/usr/lib/swift,
439-
"$(inherited)",
440-
);
441+
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
441442
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\"";
442443
MTL_ENABLE_DEBUG_INFO = YES;
443444
ONLY_ACTIVE_ARCH = YES;
444445
OTHER_CFLAGS = "$(inherited)";
445446
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
446-
OTHER_LDFLAGS = "$(inherited) ";
447+
OTHER_LDFLAGS = (
448+
"$(inherited)",
449+
" ",
450+
);
447451
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../../node_modules/react-native";
448452
SDKROOT = iphoneos;
449453
USE_HERMES = true;
@@ -492,15 +496,15 @@
492496
GCC_WARN_UNUSED_FUNCTION = YES;
493497
GCC_WARN_UNUSED_VARIABLE = YES;
494498
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
495-
LD_RUNPATH_SEARCH_PATHS = (
496-
/usr/lib/swift,
497-
"$(inherited)",
498-
);
499+
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
499500
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\"";
500501
MTL_ENABLE_DEBUG_INFO = NO;
501502
OTHER_CFLAGS = "$(inherited)";
502503
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
503-
OTHER_LDFLAGS = "$(inherited) ";
504+
OTHER_LDFLAGS = (
505+
"$(inherited)",
506+
" ",
507+
);
504508
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../../node_modules/react-native";
505509
SDKROOT = iphoneos;
506510
USE_HERMES = true;

‎packages/connect-examples/expo-example/ios/HardwareExample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

-8
This file was deleted.

‎packages/connect-examples/expo-example/ios/HardwareExample/HardwareExample.entitlements

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict/>
5-
</plist>
4+
<dict>
5+
</dict>
6+
</plist>

0 commit comments

Comments
 (0)