Skip to content

Commit 14448ee

Browse files
committed
Merge branch 'onekey' into test/api
2 parents 8cdef8b + 8f160a0 commit 14448ee

File tree

279 files changed

+236157
-1930
lines changed

Some content is hidden

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

279 files changed

+236157
-1930
lines changed

.claude/agents/hardware-sdk-expert.md

Lines changed: 0 additions & 220 deletions
This file was deleted.

.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ submodules/
99
packages/**/coverage/
1010
packages/hd-transport/scripts/protobuf-patches/
1111
packages/connect-examples/electron-example/public/
12+
packages/connect-examples/react-native-demo/
13+
packages/connect-examples/native-android-example/
14+
packages/connect-examples/native-ios-example/

.github/templates/404.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@
1616

1717
// 智能路由分发逻辑 - 保持原始URL不变,让SPA自己处理路由
1818
if (path.startsWith('/expo-playground/')) {
19-
// expo-playground 的子路由,保存原始路径信息
20-
if (path !== '/expo-playground/' && path !== '/expo-playground') {
19+
const base = '/expo-playground';
20+
const relativePath = path.slice(base.length);
21+
22+
if (relativePath && relativePath !== '/') {
2123
console.log('Handling expo-playground sub-route:', path);
22-
// 保存完整的原始URL到sessionStorage供应用恢复路由
23-
sessionStorage.setItem('spa_redirect_url', path + fullUrl);
24-
// 重定向到应用首页,让React Router处理路由恢复
25-
window.location.replace('/expo-playground/');
24+
const normalized = relativePath.startsWith('/') ? relativePath : `/${relativePath}`;
25+
const hashPath = normalized.startsWith('/') ? `#${normalized}` : `#/${normalized}`;
26+
window.location.replace(`${base}/${hashPath}${search}${hash}`);
2627
return;
2728
}
2829
return;

.github/workflows/build-example-android.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
node-version: '22'
1717

1818
- name: Set up JDK 17
19-
uses: actions/setup-java@v2
19+
uses: actions/setup-java@v4
2020
with:
2121
java-version: '17'
2222
distribution: 'zulu'
@@ -26,7 +26,7 @@ jobs:
2626
yarn setup
2727
2828
- name: Cache Gradle packages
29-
uses: actions/cache@v2
29+
uses: actions/cache@v4
3030
with:
3131
path: |
3232
~/.gradle/caches
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Build Example Desktop (macOS)
2+
3+
on:
4+
workflow_call:
5+
6+
jobs:
7+
build-mac:
8+
runs-on: macos-latest
9+
permissions:
10+
contents: write
11+
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v4
15+
with:
16+
fetch-depth: 0
17+
18+
- name: Setup Node.js
19+
uses: actions/setup-node@v4
20+
with:
21+
node-version: '22'
22+
23+
- name: Install dependencies
24+
run: |
25+
echo "📦 Installing dependencies..."
26+
yarn
27+
yarn bootstrap
28+
29+
- name: Build all packages
30+
run: |
31+
echo "🔨 Building all packages..."
32+
yarn build
33+
34+
- name: Build macOS App
35+
env:
36+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37+
run: |
38+
cd packages/connect-examples/electron-example
39+
yarn make:mac
40+
41+
- name: Upload macOS Artifact
42+
uses: actions/upload-artifact@v4
43+
with:
44+
name: mac-example-desktop
45+
path: packages/connect-examples/electron-example/out/*.dmg
46+
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Build Example Desktop (Windows)
2+
3+
on:
4+
workflow_call:
5+
6+
jobs:
7+
build-win:
8+
runs-on: windows-latest
9+
permissions:
10+
contents: write
11+
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v4
15+
with:
16+
fetch-depth: 0
17+
18+
- name: Setup Node.js
19+
uses: actions/setup-node@v4
20+
with:
21+
node-version: '22'
22+
cache: 'yarn'
23+
24+
- name: Enable long paths on Windows
25+
run: git config --system core.longpaths true
26+
27+
- name: Install dependencies
28+
run: |
29+
echo "📦 Installing dependencies..."
30+
yarn
31+
yarn bootstrap
32+
33+
- name: Build all packages
34+
run: |
35+
echo "🔨 Building all packages..."
36+
yarn build
37+
38+
- name: Build Windows App
39+
env:
40+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
41+
run: |
42+
cd packages/connect-examples/electron-example
43+
yarn make:win
44+
45+
- name: Upload Windows Artifact
46+
uses: actions/upload-artifact@v4
47+
with:
48+
name: win-example-desktop
49+
path: packages/connect-examples/electron-example/out/*.exe

0 commit comments

Comments
 (0)