Skip to content

Commit 7da9245

Browse files
authored
Merge branch 'wechat-miniprogram:master' into optimize-branches
2 parents 163a45d + bb4ad8d commit 7da9245

Some content is hidden

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

71 files changed

+2464
-77
lines changed

.github/workflows/ci.yml

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

.github/workflows/pr-lint-check.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: PR Lint Check
2+
3+
on:
4+
pull_request:
5+
branches: [ master ]
6+
7+
jobs:
8+
eslint-changed:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
with:
13+
fetch-depth: 0
14+
15+
- name: Setup Node.js
16+
uses: actions/setup-node@v4
17+
with:
18+
node-version: '20'
19+
20+
- name: Install dependencies
21+
run: npm install
22+
23+
- name: Get changed files
24+
id: changed-files
25+
uses: tj-actions/changed-files@v46
26+
with:
27+
since_last_remote_commit: 'true'
28+
29+
- name: Filter JavaScript files
30+
id: filter-js
31+
run: |
32+
changed_js_files=$(echo '${{ steps.changed-files.outputs.all_changed_files }}' | grep -E '\.(js|ts|jsx|tsx)$' || true)
33+
echo "changed_js_files=${changed_js_files}" >> $GITHUB_OUTPUT
34+
35+
- name: Run ESLint on changed JS files
36+
if: ${{ steps.filter-js.outputs.changed_js_files != '' }}
37+
run: |
38+
echo "Changed JS files: ${{ steps.filter-js.outputs.changed_js_files }}"
39+
npx eslint ${{ steps.filter-js.outputs.changed_js_files }}

miniprogram/app.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,18 @@
293293
"examples/app-bar/pages/detail/index"
294294
]
295295
},
296+
{
297+
"root": "packageSkylineRouter",
298+
"pages": [
299+
"pages/preset-router/index/index",
300+
"pages/preset-router/list/index",
301+
"pages/open-container/index/index",
302+
"pages/open-container/detail/index",
303+
"pages/open-container/other/index",
304+
"pages/page-return-gesture/index/index"
305+
],
306+
"renderer": "skyline"
307+
},
296308
{
297309
"root": "packageXRFrame",
298310
"pages": [
@@ -397,6 +409,12 @@
397409
"packageComponent"
398410
]
399411
},
412+
"page/animation/index": {
413+
"network": "all",
414+
"packages": [
415+
"packageSkylineRouter"
416+
]
417+
},
400418
"page/API/index": {
401419
"network": "all",
402420
"packages": [

miniprogram/packageAPI/pages/ar/2dmarker-ar/2dmarker-ar.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Component({
6464
const session = this.session = wx.createVKSession({
6565
track: {
6666
plane: {
67-
mode: 3
67+
mode: 1
6868
},
6969
marker: true,
7070
},
@@ -84,7 +84,7 @@ Component({
8484

8585
// VKSession EVENT addAnchors
8686
session.on('addAnchors', anchors => {
87-
// console.log("addAnchor", anchors);
87+
console.log("addAnchor", anchors);
8888

8989
this.left.visible = true
9090
this.right.visible = true

miniprogram/packageAPI/pages/ar/3dmarker-ar/3dmarker-ar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Component({
7171
const session = this.session = wx.createVKSession({
7272
track: {
7373
plane: {
74-
mode: 3
74+
mode: 1
7575
},
7676
marker: true,
7777
},

miniprogram/packageAPI/pages/ar/body-detect/behavior.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export default function getBehavior() {
9595
const session = this.session = wx.createVKSession({
9696
track: {
9797
plane: {
98-
mode: 3
98+
mode: 1
9999
},
100100
body: {
101101
mode: 1

miniprogram/packageAPI/pages/ar/hand-detect/behavior.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export default function getBehavior() {
9595
const session = this.session = wx.createVKSession({
9696
track: {
9797
plane: {
98-
mode: 3
98+
mode: 1
9999
},
100100
hand: {
101101
mode: 1

miniprogram/packageAPI/pages/ar/osd-ar/behavior.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export default function getBehavior() {
9595
const session = this.session = wx.createVKSession({
9696
track: {
9797
plane: {
98-
mode: 3
98+
mode: 1
9999
},
100100
OSD: true,
101101
},

miniprogram/packageAPI/pages/ar/photo-body-detect/behavior.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export default function getBehavior() {
9494
const session = this.session = wx.createVKSession({
9595
track: {
9696
plane: {
97-
mode: 3
97+
mode: 1
9898
},
9999
body: {
100100
mode: 2

miniprogram/packageAPI/pages/ar/photo-hand-detect/behavior.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export default function getBehavior() {
9494
const session = this.session = wx.createVKSession({
9595
track: {
9696
plane: {
97-
mode: 3
97+
mode: 1
9898
},
9999
hand: {
100100
mode: 2

0 commit comments

Comments
 (0)