@shijiu/jsview-vue 0.9.502 → 0.9.631
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dom/bin/jsview-browser-debug-dom.min.js +1 -1
- package/dom/bin/jsview-dom.min.js +1 -1
- package/dom/target_core_revision.js +4 -3
- package/index.js +10 -0
- package/package.json +8 -1
- package/patches/node_modules/@vue/runtime-core/dist/runtime-core.esm-bundler.js +16 -5
- package/samples/AnimPicture/App.vue +89 -106
- package/samples/Basic/App.vue +65 -68
- package/samples/Basic/components/ContentBlock.vue +31 -36
- package/samples/Basic/components/anim/AnimGroup.vue +61 -75
- package/samples/Basic/components/anim/AnimKeyframeBasic.vue +54 -43
- package/samples/Basic/components/anim/AnimKeyframeComposite.vue +25 -31
- package/samples/Basic/components/anim/AnimTransition.vue +142 -105
- package/samples/Basic/components/div/DivBackground.vue +38 -16
- package/samples/Basic/components/div/DivClip.vue +143 -78
- package/samples/Basic/components/div/DivCssScoped.vue +10 -10
- package/samples/Basic/components/div/DivCssVar.vue +40 -42
- package/samples/Basic/components/div/DivGroup1.vue +45 -39
- package/samples/Basic/components/div/DivGroup2.vue +56 -45
- package/samples/Basic/components/div/DivLayout.vue +63 -5
- package/samples/Basic/components/div/DivRadius.vue +51 -42
- package/samples/Basic/components/div/DivTransform.vue +21 -16
- package/samples/Basic/components/panel/Panel1.vue +46 -44
- package/samples/Basic/components/panel/Panel2.vue +22 -26
- package/samples/Basic/components/panel/TitleBar.vue +12 -12
- package/samples/Basic/components/text/TextAlign.vue +54 -44
- package/samples/Basic/components/text/TextEmoji.vue +16 -20
- package/samples/Basic/components/text/TextFontStyle.vue +77 -53
- package/samples/Basic/components/text/TextGroup1.vue +46 -38
- package/samples/Basic/components/text/TextGroup2.vue +25 -28
- package/samples/Basic/components/text/TextOverflow.vue +78 -59
- package/samples/BasicFocusControl/App.vue +22 -43
- package/samples/BasicFocusControl/components/BaseBlock.vue +42 -43
- package/samples/BasicFocusControl/components/MainArea.vue +55 -70
- package/samples/BasicFocusControl/components/MainAreaLeftBlock.vue +11 -15
- package/samples/BasicFocusControl/components/MainAreaRightBlock.vue +21 -24
- package/samples/BasicFocusControl/components/SideBar.vue +32 -47
- package/samples/BasicFocusControl/components/SideBarBlock.vue +20 -23
- package/samples/Collision/App.vue +452 -0
- package/samples/ColorSpace/App.vue +15 -24
- package/samples/DemoHomepage/App.vue +7 -11
- package/samples/DemoHomepage/components/BodyFrame.vue +21 -9
- package/samples/DemoHomepage/components/TabFrame.vue +7 -8
- package/samples/DemoHomepage/router.js +52 -33
- package/samples/DemoHomepage/views/Homepage.vue +18 -9
- package/samples/FilterDemo/AnimatePic.vue +58 -0
- package/samples/FilterDemo/App.vue +99 -61
- package/samples/FilterDemo/VideoLayer.vue +62 -0
- package/samples/FlipCard/App.vue +32 -41
- package/samples/FlipCard/FlipCard.vue +48 -54
- package/samples/GridDemo/App.vue +109 -77
- package/samples/GridDemo/ButtonBlock.vue +50 -49
- package/samples/GridDemo/FocusItem.vue +19 -38
- package/samples/GridDemo/Item.vue +46 -54
- package/samples/HashHistory/App.vue +63 -79
- package/samples/HashHistory/components/HorizontalButtonList.vue +72 -95
- package/samples/HashHistory/components/Item.vue +42 -56
- package/samples/HashHistory/router.js +23 -12
- package/samples/HashHistory/views/MainPage.vue +35 -46
- package/samples/HashHistory/views/SubPage.vue +34 -47
- package/samples/ImpactStop/App.vue +435 -0
- package/samples/Input/App.vue +8 -18
- package/samples/Input/FullKeyboard.vue +2 -6
- package/samples/Input/InputPanel.vue +18 -12
- package/samples/Input/KeyboardItem.vue +1 -1
- package/samples/LongImage/App.vue +11 -27
- package/samples/LongImage/Button.vue +50 -145
- package/samples/LongImage/ButtonItem.vue +44 -0
- package/samples/LongImage/LongImageScroll.vue +71 -106
- package/samples/LongImage/Scroll.vue +7 -9
- package/samples/LongText/App.vue +13 -28
- package/samples/LongText/Button.vue +43 -145
- package/samples/LongText/ButtonItem.vue +44 -0
- package/samples/LongText/LongTextScroll.vue +68 -101
- package/samples/LongText/Scroll.vue +7 -9
- package/samples/Marquee/App.vue +34 -37
- package/samples/MaskClip/App.vue +17 -30
- package/samples/MetroWidgetDemos/Advanced/App.vue +47 -0
- package/samples/MetroWidgetDemos/Advanced/ButtonItem.vue +90 -0
- package/samples/MetroWidgetDemos/Advanced/Buttons.vue +70 -0
- package/samples/MetroWidgetDemos/Advanced/Mixed.vue +77 -0
- package/samples/MetroWidgetDemos/Advanced/Widgets.vue +71 -0
- package/samples/MetroWidgetDemos/Item.vue +67 -0
- package/samples/{SimpleWidgetDemo → MetroWidgetDemos/PerformanceTest}/App.vue +80 -104
- package/samples/{SimpleWidgetDemo → MetroWidgetDemos/PerformanceTest}/Item.vue +7 -0
- package/samples/{ClassNameDemo → MetroWidgetDemos/PerformanceTest}/assets/bg.jpg +0 -0
- package/samples/{ClassNameDemo → MetroWidgetDemos/PerformanceTest}/assets/coupon_content.png +0 -0
- package/samples/{ClassNameDemo → MetroWidgetDemos/PerformanceTest}/assets/coupon_left.png +0 -0
- package/samples/{ClassNameDemo → MetroWidgetDemos/PerformanceTest}/assets/coupon_mid.png +0 -0
- package/samples/{ClassNameDemo → MetroWidgetDemos/PerformanceTest}/assets/coupon_right.png +0 -0
- package/samples/{ClassNameDemo → MetroWidgetDemos/PerformanceTest}/assets/focus_border.png +0 -0
- package/samples/{ClassNameDemo → MetroWidgetDemos/PerformanceTest}/assets/holder_logo.png +0 -0
- package/samples/{ClassNameDemo → MetroWidgetDemos/PerformanceTest}/assets/jrbm.png +0 -0
- package/samples/{ClassNameDemo → MetroWidgetDemos/PerformanceTest}/assets/line_left.png +0 -0
- package/samples/{ClassNameDemo → MetroWidgetDemos/PerformanceTest}/assets/line_mid.png +0 -0
- package/samples/{ClassNameDemo → MetroWidgetDemos/PerformanceTest}/assets/line_right.png +0 -0
- package/samples/{ClassNameDemo → MetroWidgetDemos/PerformanceTest}/assets/loading.png +0 -0
- package/samples/{ClassNameDemo → MetroWidgetDemos/PerformanceTest}/assets/logo.png +0 -0
- package/samples/{ClassNameDemo → MetroWidgetDemos/PerformanceTest}/assets/mcjx.png +0 -0
- package/samples/{ClassNameDemo → MetroWidgetDemos/PerformanceTest}/assets/tao.png +0 -0
- package/samples/{ClassNameDemo → MetroWidgetDemos/PerformanceTest}/assets/tmall.png +0 -0
- package/samples/{SimpleWidgetDemo → MetroWidgetDemos/PerformanceTest}/border.png +0 -0
- package/samples/{SimpleWidgetDemo → MetroWidgetDemos/PerformanceTest}/components/ContentItem.vue +60 -86
- package/samples/{SimpleWidgetDemo → MetroWidgetDemos/PerformanceTest}/components/MyTab.vue +0 -0
- package/samples/MetroWidgetDemos/PerformanceTest/data.js +45 -0
- package/samples/MetroWidgetDemos/PingPong/App.vue +135 -0
- package/samples/MetroWidgetDemos/PingPong/AppPage.vue +73 -0
- package/samples/MetroWidgetDemos/PingPong/AppTab.vue +62 -0
- package/samples/MetroWidgetDemos/PingPong/TabItem.vue +84 -0
- package/samples/MetroWidgetDemos/PingPong/ViewSwiper.vue +214 -0
- package/samples/MetroWidgetDemos/Simple/AbsoluteTemplate.vue +75 -0
- package/samples/MetroWidgetDemos/Simple/App.vue +45 -0
- package/samples/MetroWidgetDemos/Simple/RelativeTemplate.vue +111 -0
- package/samples/MetroWidgetDemos/WidgetItem.vue +89 -0
- package/samples/MetroWidgetDemos/data.js +204 -0
- package/samples/NinePatchDemo/App.vue +114 -115
- package/samples/NinePatchDemo/Item.vue +7 -8
- package/samples/Preload/App.vue +67 -64
- package/samples/Preload/Item.vue +21 -29
- package/samples/QrcodeDemo/App.vue +24 -29
- package/samples/SoundPool/App.vue +77 -106
- package/samples/SprayView/App.vue +10 -8
- package/samples/SpriteImage/App.vue +1 -2
- package/samples/TextBox/App.vue +86 -101
- package/samples/TextBox/RenderCenter.vue +1 -1
- package/samples/TextBox/RenderLeft.vue +1 -1
- package/samples/TextBox/RenderOneLine.vue +1 -1
- package/samples/TextBox/RenderRight.vue +1 -1
- package/samples/TextShadowDemo/App.vue +1 -2
- package/samples/TextureAnimation/App.vue +16 -13
- package/samples/TextureAnimation/App2.vue +111 -0
- package/samples/TextureAnimation/assets/blackWhiteGrid.png +0 -0
- package/samples/TextureAnimation/assets/light.png +0 -0
- package/samples/TextureAnimation/assets/light2.png +0 -0
- package/samples/TextureAnimation/assets/mask.png +0 -0
- package/samples/TextureSize/App.vue +15 -25
- package/samples/ThrowMoveDemo/AccelerateDemo.vue +2 -4
- package/samples/ThrowMoveDemo/LRParabolicDemo.vue +2 -3
- package/samples/ThrowMoveDemo/TargetDemo.vue +3 -4
- package/samples/ThrowMoveDemo/UDParabolicDemo.vue +2 -3
- package/samples/TouchSample/App.vue +2 -3
- package/samples/TouchSample/Item.vue +15 -13
- package/samples/TouchSample/MetroWidgetHorizontal.vue +2 -2
- package/samples/TouchSample/MetroWidgetVertical.vue +1 -1
- package/samples/TouchSample/TouchContainerHorizontal.vue +4 -3
- package/samples/TouchSample/TouchContainerVertical.vue +3 -2
- package/samples/TransitPage/App.vue +20 -32
- package/samples/VideoDemo/App.vue +65 -81
- package/samples/VideoDemo/components/Button.vue +41 -52
- package/samples/VideoDemo/components/Controllor.vue +171 -169
- package/samples/VideoDemo/components/VideoFrame.vue +87 -99
- package/samples/VisibleSensorDemo/App.vue +234 -0
- package/scripts/jsview-jsmap-serve.js +42 -0
- package/scripts/jsview-post-install.js +1 -1
- package/tsconfig.json +3 -0
- package/utils/JsViewEngineWidget/JsvFocusBlock.vue +204 -193
- package/utils/JsViewEngineWidget/JsvFocusManager.js +30 -17
- package/utils/JsViewEngineWidget/MetroWidget/MetroWidget.vue +1561 -1656
- package/utils/JsViewEngineWidget/MetroWidget/PageUpdater.js +136 -0
- package/utils/JsViewEngineWidget/MetroWidget/ToolFunctions.js +18 -0
- package/utils/JsViewEngineWidget/TemplateParser.js +111 -1
- package/utils/JsViewEngineWidget/WidgetCommon.js +8 -2
- package/utils/JsViewEngineWidget/index.js +4 -4
- package/utils/JsViewPlugin/JsvPlayer/GetVersion.js +1 -1
- package/utils/JsViewPlugin/JsvPlayer/JsvMedia.js +301 -58
- package/utils/JsViewPlugin/JsvPlayer/JsvPlayer.vue +22 -3
- package/utils/JsViewPlugin/JsvPlayer/index.js +8 -1
- package/utils/JsViewPlugin/JsvPlayer/version.js +5 -5
- package/utils/JsViewVueTools/JsvImpactTracer.js +113 -0
- package/utils/JsViewVueTools/JsvRefTaker.js +35 -0
- package/utils/JsViewVueTools/index.js +20 -0
- package/utils/JsViewVueWidget/BrowserDebugWidget/BrowserPreload.vue +11 -1
- package/utils/JsViewVueWidget/BrowserDebugWidget/BrowserQrcode.vue +8 -4
- package/utils/JsViewVueWidget/BrowserDebugWidget/BrowserTextureAnim.vue +203 -14
- package/utils/JsViewVueWidget/JsvActorMove/JsvActorMove.vue +2 -2
- package/utils/JsViewVueWidget/JsvApic/JsvApic.vue +2 -2
- package/utils/JsViewVueWidget/JsvFilterView.vue +59 -51
- package/utils/JsViewVueWidget/JsvGrid.vue +139 -41
- package/utils/JsViewVueWidget/JsvInput/Cursor.vue +4 -2
- package/utils/JsViewVueWidget/JsvInput/JsvInput.vue +13 -12
- package/utils/JsViewVueWidget/JsvMaskClipDiv.vue +3 -1
- package/utils/JsViewVueWidget/JsvNativeSharedDiv.vue +8 -17
- package/utils/JsViewVueWidget/JsvNinePatch.vue +1 -1
- package/utils/JsViewVueWidget/JsvPosterDiv.vue +37 -7
- package/utils/JsViewVueWidget/JsvPosterImage.vue +34 -13
- package/utils/JsViewVueWidget/JsvPreload/JsvPreload.vue +39 -53
- package/utils/JsViewVueWidget/JsvQrcode/JsvQrcode.vue +1 -1
- package/utils/JsViewVueWidget/JsvSpray/JsvSpray.vue +13 -10
- package/utils/JsViewVueWidget/JsvSpriteAnim/JsvSpriteAnim.vue +282 -285
- package/utils/JsViewVueWidget/JsvSpriteAnim/index.js +2 -3
- package/utils/JsViewVueWidget/JsvSwiper/JsvSwiper.vue +6 -1
- package/utils/JsViewVueWidget/JsvSwiper3D/JsvSwiper.vue +6 -1
- package/utils/JsViewVueWidget/JsvTextureAnim/JsvTextureAnim.vue +142 -61
- package/utils/JsViewVueWidget/JsvTextureAnim/index.js +9 -5
- package/utils/JsViewVueWidget/JsvTransparentDiv.vue +7 -8
- package/utils/JsViewVueWidget/JsvVideo.vue +9 -12
- package/utils/JsViewVueWidget/JsvVisibleSensor/JsvVisibleSensor.vue +141 -0
- package/utils/JsViewVueWidget/JsvVisibleSensor/index.js +9 -0
- package/utils/JsViewVueWidget/index.js +42 -0
- package/samples/AdvanceMetroWidget/App.vue +0 -123
- package/samples/AdvanceMetroWidget/Frame.vue +0 -102
- package/samples/AdvanceMetroWidget/Item.vue +0 -63
- package/samples/AdvanceMetroWidget/data.js +0 -137
- package/samples/ClassNameDemo/App.vue +0 -119
- package/samples/ClassNameDemo/components/ContentItem.vue +0 -253
- package/samples/ClassNameDemo/components/LoadingView.vue +0 -43
- package/samples/ClassNameDemo/components/TitleView.vue +0 -24
- package/samples/ClassNameDemo/data.js +0 -24
- package/samples/FlowMultiWidget/App.vue +0 -91
- package/samples/FlowMultiWidget/assets/nine_patch_focus.png +0 -0
- package/samples/FlowMultiWidget/components/Block.vue +0 -107
- package/samples/FlowMultiWidget/components/FlowPage.vue +0 -60
- package/samples/FlowMultiWidget/components/Item.vue +0 -103
- package/samples/FlowMultiWidget/components/MenuItem.vue +0 -72
- package/samples/FlowMultiWidget/components/MyMenu.vue +0 -90
- package/samples/FlowMultiWidget/data.js +0 -446
- package/samples/HashHistory/views/BasePage.vue +0 -19
- package/samples/HashHistory/views/SubPageFirst.vue +0 -10
- package/samples/HashHistory/views/SubPageSecond.vue +0 -10
- package/samples/SimpleWidgetDemo/assets/bg.jpg +0 -0
- package/samples/SimpleWidgetDemo/assets/coupon_content.png +0 -0
- package/samples/SimpleWidgetDemo/assets/coupon_left.png +0 -0
- package/samples/SimpleWidgetDemo/assets/coupon_mid.png +0 -0
- package/samples/SimpleWidgetDemo/assets/coupon_right.png +0 -0
- package/samples/SimpleWidgetDemo/assets/focus_border.png +0 -0
- package/samples/SimpleWidgetDemo/assets/holder_logo.png +0 -0
- package/samples/SimpleWidgetDemo/assets/jrbm.png +0 -0
- package/samples/SimpleWidgetDemo/assets/line_left.png +0 -0
- package/samples/SimpleWidgetDemo/assets/line_mid.png +0 -0
- package/samples/SimpleWidgetDemo/assets/line_right.png +0 -0
- package/samples/SimpleWidgetDemo/assets/loading.png +0 -0
- package/samples/SimpleWidgetDemo/assets/logo.png +0 -0
- package/samples/SimpleWidgetDemo/assets/mcjx.png +0 -0
- package/samples/SimpleWidgetDemo/assets/tao.png +0 -0
- package/samples/SimpleWidgetDemo/assets/tmall.png +0 -0
- package/samples/SimpleWidgetDemo/data.js +0 -124
- package/utils/JsViewEngineWidget/MetroWidget/ContentView.vue +0 -63
- package/utils/JsViewEngineWidget/MetroWidget/DivWrapper.vue +0 -51
- package/utils/JsViewEngineWidget/MetroWidget/ItemView.vue +0 -213
- package/utils/JsViewEngineWidget/MetroWidget/RootView.vue +0 -154
|
@@ -1,30 +1,27 @@
|
|
|
1
|
-
<script
|
|
2
|
-
import
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
1
|
+
<script setup>
|
|
2
|
+
import BaseBlock from "./BaseBlock.vue";
|
|
3
|
+
import { useFocusHub } from "jsview";
|
|
4
|
+
defineProps({
|
|
5
|
+
name: String,
|
|
6
|
+
style: {
|
|
7
|
+
type: Object,
|
|
8
|
+
default() {
|
|
9
|
+
return {};
|
|
10
|
+
},
|
|
10
11
|
},
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
(this.$root as any).changeFocusInDemoSpace('sideBarR0C0');
|
|
20
|
-
return true;
|
|
21
|
-
}
|
|
22
|
-
return false;
|
|
12
|
+
});
|
|
13
|
+
|
|
14
|
+
const focusHub = useFocusHub();
|
|
15
|
+
const onKeyDown = (ev) => {
|
|
16
|
+
if (ev.keyCode === 39) {
|
|
17
|
+
// Right key
|
|
18
|
+
focusHub.setFocus("sideBarR0C0");
|
|
19
|
+
return true;
|
|
23
20
|
}
|
|
24
|
-
|
|
21
|
+
return false;
|
|
22
|
+
};
|
|
25
23
|
</script>
|
|
26
24
|
|
|
27
25
|
<template>
|
|
28
|
-
<BaseBlock :name="
|
|
29
|
-
:onKeyDown="onKeyDown"/>
|
|
26
|
+
<BaseBlock :name="name" :style="style" :onKeyDown="onKeyDown" />
|
|
30
27
|
</template>
|
|
@@ -1,56 +1,41 @@
|
|
|
1
|
-
<script
|
|
2
|
-
import
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
1
|
+
<script setup>
|
|
2
|
+
import SideBarBlock from "./SideBarBlock.vue";
|
|
3
|
+
import { useFocusHub } from "jsview";
|
|
4
|
+
let focusRow = 0;
|
|
5
|
+
const focusHub = useFocusHub();
|
|
6
|
+
|
|
7
|
+
const onKeyDown = (ev) => {
|
|
8
|
+
// 子节点未处理的按键事件会流向此节点
|
|
9
|
+
let keyUsed = true;
|
|
10
|
+
switch (ev.keyCode) {
|
|
11
|
+
case 38: // Up
|
|
12
|
+
focusRow = 0;
|
|
13
|
+
break;
|
|
14
|
+
case 40: // Down
|
|
15
|
+
focusRow = 1;
|
|
16
|
+
break;
|
|
17
|
+
default:
|
|
18
|
+
keyUsed = false;
|
|
16
19
|
}
|
|
17
20
|
|
|
18
|
-
|
|
19
|
-
//
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
switch (ev.keyCode) {
|
|
23
|
-
case 38: // Up
|
|
24
|
-
this.focusRow = 0;
|
|
25
|
-
break;
|
|
26
|
-
case 40: // Down
|
|
27
|
-
this.focusRow = 1;
|
|
28
|
-
break;
|
|
29
|
-
default:
|
|
30
|
-
keyUsed = false;
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
if (keyUsed) {
|
|
34
|
-
// 焦点与之前相同时也可以重复调用,焦点管理系统内容有是否变更的判断处理
|
|
35
|
-
const name = `sideBarR${this.focusRow}C0`;
|
|
36
|
-
ev.ownerNode.findBlockByName(name)?.requestFocus();
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
return keyUsed;
|
|
21
|
+
if (keyUsed) {
|
|
22
|
+
// 焦点与之前相同时也可以重复调用,焦点管理系统内容有是否变更的判断处理
|
|
23
|
+
const name = `sideBarR${focusRow}C0`;
|
|
24
|
+
focusHub.setFocus(name);
|
|
40
25
|
}
|
|
41
26
|
|
|
42
|
-
|
|
43
|
-
}
|
|
27
|
+
return keyUsed;
|
|
28
|
+
};
|
|
44
29
|
</script>
|
|
45
30
|
|
|
46
31
|
<template>
|
|
47
|
-
<div>
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
</div>
|
|
32
|
+
<div>
|
|
33
|
+
<!--jsv-focus-block是非可描画节点,所以如果想接收style等属性,不要放在顶级-->
|
|
34
|
+
<jsv-focus-block :onKeyDown="onKeyDown">
|
|
35
|
+
<SideBarBlock name="sideBarR0C0" :style="{ left: 0, top: 0 }" />
|
|
36
|
+
<SideBarBlock name="sideBarR1C0" :style="{ left: 0, top: 120 }" />
|
|
37
|
+
</jsv-focus-block>
|
|
38
|
+
</div>
|
|
54
39
|
</template>
|
|
55
40
|
|
|
56
41
|
<style scoped>
|
|
@@ -63,7 +48,7 @@ class SideBar extends Vue {
|
|
|
63
48
|
top: 50;
|
|
64
49
|
width: 400;
|
|
65
50
|
height: 50;
|
|
66
|
-
background-color: rgba(27,38,151,0.8);
|
|
51
|
+
background-color: rgba(27, 38, 151, 0.8);
|
|
67
52
|
}
|
|
68
53
|
|
|
69
54
|
.body {
|
|
@@ -1,30 +1,27 @@
|
|
|
1
|
-
<script
|
|
2
|
-
import
|
|
3
|
-
import {
|
|
4
|
-
import BaseBlock from "./BaseBlock.vue"
|
|
1
|
+
<script setup>
|
|
2
|
+
import BaseBlock from "./BaseBlock.vue";
|
|
3
|
+
import { useFocusHub } from "jsview";
|
|
5
4
|
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
5
|
+
defineProps({
|
|
6
|
+
name: String,
|
|
7
|
+
style: {
|
|
8
|
+
type: Object,
|
|
9
|
+
default() {
|
|
10
|
+
return {};
|
|
11
|
+
},
|
|
10
12
|
},
|
|
11
|
-
|
|
12
|
-
|
|
13
|
+
});
|
|
14
|
+
const focusHub = useFocusHub();
|
|
15
|
+
const onKeyDown = (ev) => {
|
|
16
|
+
if (ev.keyCode === 37) {
|
|
17
|
+
// Right key
|
|
18
|
+
focusHub.setFocus("main");
|
|
19
|
+
return true;
|
|
13
20
|
}
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
class SideBarBlock extends Vue {
|
|
17
|
-
onKeyDown(ev: JsvFocusEvent) {
|
|
18
|
-
if (ev.keyCode === 37) { // Left key
|
|
19
|
-
(this.$root as any).changeFocusInDemoSpace('main');
|
|
20
|
-
return true;
|
|
21
|
-
}
|
|
22
|
-
return false;
|
|
23
|
-
}
|
|
24
|
-
}
|
|
21
|
+
return false;
|
|
22
|
+
};
|
|
25
23
|
</script>
|
|
26
24
|
|
|
27
25
|
<template>
|
|
28
|
-
<BaseBlock :name="
|
|
29
|
-
:onKeyDown="onKeyDown"/>
|
|
26
|
+
<BaseBlock :name="name" :style="style" :onKeyDown="onKeyDown" />
|
|
30
27
|
</template>
|
|
@@ -0,0 +1,452 @@
|
|
|
1
|
+
<!--
|
|
2
|
+
* @Author: ChenChanghua
|
|
3
|
+
* @Date: 2022-08-30 10:58:38
|
|
4
|
+
* @LastEditors: ChenChanghua
|
|
5
|
+
* @LastEditTime: 2022-08-30 14:20:46
|
|
6
|
+
* @Description: file content
|
|
7
|
+
-->
|
|
8
|
+
<script setup>
|
|
9
|
+
import { createImpactTracer, createImpactCallback } from "jsview";
|
|
10
|
+
import { ref, onMounted, onBeforeUnmount } from "vue";
|
|
11
|
+
import { useRouter } from "vue-router";
|
|
12
|
+
|
|
13
|
+
const router = useRouter();
|
|
14
|
+
|
|
15
|
+
const transEle1 = ref(null),
|
|
16
|
+
transEle2 = ref(null),
|
|
17
|
+
rotateEle1 = ref(null),
|
|
18
|
+
rotateEle2 = ref(null),
|
|
19
|
+
rotateEle3 = ref(null),
|
|
20
|
+
rotateEle4 = ref(null),
|
|
21
|
+
scaleEle1 = ref(null),
|
|
22
|
+
scaleEle2 = ref(null),
|
|
23
|
+
skewEle1 = ref(null),
|
|
24
|
+
skewEle2 = ref(null);
|
|
25
|
+
|
|
26
|
+
let sensors = [];
|
|
27
|
+
|
|
28
|
+
const tLeftColor = ref("#FF0000"),
|
|
29
|
+
tRightColor = ref("#00FF00"),
|
|
30
|
+
rLeftColor = ref("#FF0000"),
|
|
31
|
+
rRightColor = ref("#00FF00"),
|
|
32
|
+
r2LeftColor = ref("#FF0000"),
|
|
33
|
+
r2RightColor = ref("#00FF00"),
|
|
34
|
+
sLeftColor = ref("#FF0000"),
|
|
35
|
+
sRightColor = ref("#00FF00"),
|
|
36
|
+
skLeftColor = ref("#FF0000"),
|
|
37
|
+
skRightColor = ref("#00FF00");
|
|
38
|
+
|
|
39
|
+
const lastItemVisibility = ref("hidden"); // 验证View先声明碰撞检测再显示的场景,是否碰撞能正常生效
|
|
40
|
+
const lastItemGone = ref(false); // 验证碰撞对象关联的View从ViewTree拿掉后是否触发Native端的自清理处理
|
|
41
|
+
|
|
42
|
+
setTimeout(() => {
|
|
43
|
+
lastItemVisibility.value = "visible";
|
|
44
|
+
}, 1000);
|
|
45
|
+
setTimeout(() => {
|
|
46
|
+
lastItemGone.value = true;
|
|
47
|
+
}, 5000);
|
|
48
|
+
|
|
49
|
+
const onKeyDown = (ev) => {
|
|
50
|
+
if (ev.keyCode == 8 || ev.keyCode == 27 || ev.keyCode == 10000) {
|
|
51
|
+
router?.go(-1); // 有router时,是从DemoHomepage进入,回退
|
|
52
|
+
}
|
|
53
|
+
return true;
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
onMounted(() => {
|
|
57
|
+
const translate_sensor = createImpactTracer(
|
|
58
|
+
transEle1.value,
|
|
59
|
+
transEle2.value,
|
|
60
|
+
createImpactCallback(
|
|
61
|
+
() => {
|
|
62
|
+
tLeftColor.value = "#00FFFF";
|
|
63
|
+
tRightColor.value = "#FFFF00";
|
|
64
|
+
},
|
|
65
|
+
() => {
|
|
66
|
+
tLeftColor.value = "#FF0000";
|
|
67
|
+
tRightColor.value = "#00FF00";
|
|
68
|
+
}
|
|
69
|
+
)
|
|
70
|
+
);
|
|
71
|
+
sensors.push(translate_sensor);
|
|
72
|
+
|
|
73
|
+
const rotate_count = { count: 0 };
|
|
74
|
+
const rotate_sensor = createImpactTracer(
|
|
75
|
+
rotateEle1.value,
|
|
76
|
+
rotateEle2.value,
|
|
77
|
+
createImpactCallback(
|
|
78
|
+
() => {
|
|
79
|
+
rLeftColor.value = "#00FFFF";
|
|
80
|
+
rRightColor.value = "#FFFF00";
|
|
81
|
+
},
|
|
82
|
+
() => {
|
|
83
|
+
rotate_count.count++;
|
|
84
|
+
if (rotate_count.count >= 2) {
|
|
85
|
+
// 旋转有头尾连续两次碰撞
|
|
86
|
+
console.log("Finish collision of rotate element");
|
|
87
|
+
}
|
|
88
|
+
rLeftColor.value = "#FF0000";
|
|
89
|
+
rRightColor.value = "#00FF00";
|
|
90
|
+
}
|
|
91
|
+
)
|
|
92
|
+
);
|
|
93
|
+
sensors.push(rotate_sensor);
|
|
94
|
+
|
|
95
|
+
const rotate2_sensor = createImpactTracer(
|
|
96
|
+
rotateEle3.value,
|
|
97
|
+
rotateEle4.value,
|
|
98
|
+
createImpactCallback(
|
|
99
|
+
() => {
|
|
100
|
+
r2LeftColor.value = "#00FFFF";
|
|
101
|
+
r2RightColor.value = "#FFFF00";
|
|
102
|
+
},
|
|
103
|
+
() => {
|
|
104
|
+
r2LeftColor.value = "#FF0000";
|
|
105
|
+
r2RightColor.value = "#00FF00";
|
|
106
|
+
}
|
|
107
|
+
)
|
|
108
|
+
);
|
|
109
|
+
sensors.push(rotate2_sensor);
|
|
110
|
+
|
|
111
|
+
const scale_sensor = createImpactTracer(
|
|
112
|
+
scaleEle1.value,
|
|
113
|
+
scaleEle2.value,
|
|
114
|
+
createImpactCallback(
|
|
115
|
+
() => {
|
|
116
|
+
sLeftColor.value = "#00FFFF";
|
|
117
|
+
sRightColor.value = "#FFFF00";
|
|
118
|
+
},
|
|
119
|
+
() => {
|
|
120
|
+
sLeftColor.value = "#FF0000";
|
|
121
|
+
sRightColor.value = "#00FF00";
|
|
122
|
+
}
|
|
123
|
+
)
|
|
124
|
+
);
|
|
125
|
+
sensors.push(scale_sensor);
|
|
126
|
+
|
|
127
|
+
const skew_sensor = createImpactTracer(
|
|
128
|
+
skewEle1.value,
|
|
129
|
+
skewEle2.value,
|
|
130
|
+
createImpactCallback(
|
|
131
|
+
() => {
|
|
132
|
+
skLeftColor.value = "#00FFFF";
|
|
133
|
+
skRightColor.value = "#FFFF00";
|
|
134
|
+
},
|
|
135
|
+
() => {
|
|
136
|
+
skLeftColor.value = "#FF0000";
|
|
137
|
+
skRightColor.value = "#00FF00";
|
|
138
|
+
}
|
|
139
|
+
)
|
|
140
|
+
);
|
|
141
|
+
sensors.push(skew_sensor);
|
|
142
|
+
});
|
|
143
|
+
|
|
144
|
+
onBeforeUnmount(() => {
|
|
145
|
+
for (let i = 0; i < sensors.length; i++) {
|
|
146
|
+
sensors[i].Recycle();
|
|
147
|
+
}
|
|
148
|
+
sensors = [];
|
|
149
|
+
});
|
|
150
|
+
</script>
|
|
151
|
+
|
|
152
|
+
<template>
|
|
153
|
+
<jsv-focus-block
|
|
154
|
+
autoFocus
|
|
155
|
+
:style="{
|
|
156
|
+
width: 1920,
|
|
157
|
+
height: 1080,
|
|
158
|
+
backgroundColor: '#007788',
|
|
159
|
+
}"
|
|
160
|
+
:onAction="{
|
|
161
|
+
onKeyDown: onKeyDown,
|
|
162
|
+
}"
|
|
163
|
+
>
|
|
164
|
+
<div
|
|
165
|
+
:style="{
|
|
166
|
+
textAlign: 'center',
|
|
167
|
+
fontSize: '30px',
|
|
168
|
+
lineHeight: '50px',
|
|
169
|
+
color: '#ffffff',
|
|
170
|
+
left: 100,
|
|
171
|
+
top: 20,
|
|
172
|
+
width: 1280 - 200,
|
|
173
|
+
height: 50,
|
|
174
|
+
backgroundColor: 'rgba(27,38,151,0.8)',
|
|
175
|
+
}"
|
|
176
|
+
>
|
|
177
|
+
原生端辅助的高效率碰撞检测处理
|
|
178
|
+
</div>
|
|
179
|
+
<div :style="{ top: 200, left: 100 }">
|
|
180
|
+
<div
|
|
181
|
+
ref="transEle1"
|
|
182
|
+
:style="{
|
|
183
|
+
left: 0,
|
|
184
|
+
width: 100,
|
|
185
|
+
height: 100,
|
|
186
|
+
backgroundColor: tLeftColor,
|
|
187
|
+
animation: 'toRight 5s',
|
|
188
|
+
}"
|
|
189
|
+
>
|
|
190
|
+
view1
|
|
191
|
+
</div>
|
|
192
|
+
<div :style="{ left: 300 }">
|
|
193
|
+
<div
|
|
194
|
+
ref="transEle2"
|
|
195
|
+
:style="{
|
|
196
|
+
width: 100,
|
|
197
|
+
height: 100,
|
|
198
|
+
backgroundColor: tRightColor,
|
|
199
|
+
animation: 'toLeft 5s',
|
|
200
|
+
}"
|
|
201
|
+
>
|
|
202
|
+
view2
|
|
203
|
+
</div>
|
|
204
|
+
</div>
|
|
205
|
+
</div>
|
|
206
|
+
|
|
207
|
+
<div :style="{ top: 500, left: 100 }">
|
|
208
|
+
<div
|
|
209
|
+
ref="rotateEle1"
|
|
210
|
+
:style="{
|
|
211
|
+
left: 0,
|
|
212
|
+
width: 20,
|
|
213
|
+
height: 150,
|
|
214
|
+
backgroundColor: rLeftColor,
|
|
215
|
+
animation: 'rotate1 5s',
|
|
216
|
+
}"
|
|
217
|
+
>
|
|
218
|
+
view1
|
|
219
|
+
</div>
|
|
220
|
+
<div
|
|
221
|
+
ref="rotateEle2"
|
|
222
|
+
:style="{
|
|
223
|
+
left: 100,
|
|
224
|
+
width: 20,
|
|
225
|
+
height: 150,
|
|
226
|
+
backgroundColor: rRightColor,
|
|
227
|
+
animation: 'rotate2 5s',
|
|
228
|
+
}"
|
|
229
|
+
>
|
|
230
|
+
view2
|
|
231
|
+
</div>
|
|
232
|
+
</div>
|
|
233
|
+
|
|
234
|
+
<div :style="{ top: 500, left: 500 }">
|
|
235
|
+
<div
|
|
236
|
+
:style="{
|
|
237
|
+
top: 50,
|
|
238
|
+
left: 0,
|
|
239
|
+
width: 150,
|
|
240
|
+
height: 150,
|
|
241
|
+
backgroundColor: 'rgba(255,255,255,0.5)',
|
|
242
|
+
animation: 'rotate3 5s',
|
|
243
|
+
}"
|
|
244
|
+
>
|
|
245
|
+
<div
|
|
246
|
+
ref="rotateEle3"
|
|
247
|
+
:style="{
|
|
248
|
+
left: (150 - 20) / 2,
|
|
249
|
+
width: 20,
|
|
250
|
+
height: 150,
|
|
251
|
+
backgroundColor: r2LeftColor,
|
|
252
|
+
}"
|
|
253
|
+
>
|
|
254
|
+
view1
|
|
255
|
+
</div>
|
|
256
|
+
</div>
|
|
257
|
+
<div
|
|
258
|
+
:style="{
|
|
259
|
+
top: 0,
|
|
260
|
+
left: 100,
|
|
261
|
+
width: 150,
|
|
262
|
+
height: 150,
|
|
263
|
+
backgroundColor: 'rgba(255,255,255,0.5)',
|
|
264
|
+
animation: 'rotate4 5s',
|
|
265
|
+
}"
|
|
266
|
+
>
|
|
267
|
+
<div
|
|
268
|
+
ref="rotateEle4"
|
|
269
|
+
:style="{
|
|
270
|
+
left: 0,
|
|
271
|
+
top: (150 - 20) / 2,
|
|
272
|
+
width: 150,
|
|
273
|
+
height: 20,
|
|
274
|
+
backgroundColor: r2RightColor,
|
|
275
|
+
}"
|
|
276
|
+
>
|
|
277
|
+
view2
|
|
278
|
+
</div>
|
|
279
|
+
</div>
|
|
280
|
+
</div>
|
|
281
|
+
|
|
282
|
+
<div :style="{ top: 200, left: 500 }">
|
|
283
|
+
<div
|
|
284
|
+
ref="scaleEle1"
|
|
285
|
+
:style="{
|
|
286
|
+
left: 100,
|
|
287
|
+
width: 100,
|
|
288
|
+
height: 100,
|
|
289
|
+
backgroundColor: sLeftColor,
|
|
290
|
+
animation: 'scale1 5s',
|
|
291
|
+
}"
|
|
292
|
+
>
|
|
293
|
+
view1
|
|
294
|
+
</div>
|
|
295
|
+
<div
|
|
296
|
+
ref="scaleEle2"
|
|
297
|
+
:style="{
|
|
298
|
+
left: 250,
|
|
299
|
+
width: 100,
|
|
300
|
+
height: 100,
|
|
301
|
+
backgroundColor: sRightColor,
|
|
302
|
+
animation: 'scale2 5s',
|
|
303
|
+
}"
|
|
304
|
+
>
|
|
305
|
+
view2
|
|
306
|
+
</div>
|
|
307
|
+
</div>
|
|
308
|
+
|
|
309
|
+
<div
|
|
310
|
+
v-if="!lastItemGone"
|
|
311
|
+
:style="{
|
|
312
|
+
top: 500,
|
|
313
|
+
left: 800,
|
|
314
|
+
visibility: lastItemVisibility,
|
|
315
|
+
}"
|
|
316
|
+
>
|
|
317
|
+
<div
|
|
318
|
+
ref="skewEle1"
|
|
319
|
+
:style="{
|
|
320
|
+
left: 100,
|
|
321
|
+
width: 100,
|
|
322
|
+
height: 100,
|
|
323
|
+
backgroundColor: skLeftColor,
|
|
324
|
+
animation: 'skew1 5s',
|
|
325
|
+
}"
|
|
326
|
+
>
|
|
327
|
+
viewA
|
|
328
|
+
</div>
|
|
329
|
+
<div
|
|
330
|
+
ref="skewEle2"
|
|
331
|
+
:style="{
|
|
332
|
+
left: 300,
|
|
333
|
+
width: 100,
|
|
334
|
+
height: 100,
|
|
335
|
+
backgroundColor: skRightColor,
|
|
336
|
+
animation: 'skew2 5s',
|
|
337
|
+
}"
|
|
338
|
+
>
|
|
339
|
+
viewB
|
|
340
|
+
</div>
|
|
341
|
+
</div>
|
|
342
|
+
</jsv-focus-block>
|
|
343
|
+
</template>
|
|
344
|
+
|
|
345
|
+
<style scoped>
|
|
346
|
+
@keyframes toLeft {
|
|
347
|
+
from {
|
|
348
|
+
transform: translate3d(0, 0, 0) scale3d(0.5, 0.5, 1);
|
|
349
|
+
}
|
|
350
|
+
to {
|
|
351
|
+
transform: translate3d(-300px, 0, 0) scale3d(1.5, 1.5, 1);
|
|
352
|
+
}
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
@keyframes toRight {
|
|
356
|
+
from {
|
|
357
|
+
transform: translate3d(0, 0, 0) scale3d(0.5, 0.5, 1);
|
|
358
|
+
}
|
|
359
|
+
to {
|
|
360
|
+
transform: translate3d(300px, 0, 0) scale3d(1.5, 1.5, 1);
|
|
361
|
+
}
|
|
362
|
+
}
|
|
363
|
+
|
|
364
|
+
@keyframes rotate1 {
|
|
365
|
+
from {
|
|
366
|
+
transform: rotate3d(0, 0, 1, 0deg);
|
|
367
|
+
}
|
|
368
|
+
to {
|
|
369
|
+
transform: rotate3d(0, 0, 1, 360deg);
|
|
370
|
+
}
|
|
371
|
+
}
|
|
372
|
+
|
|
373
|
+
/* webview中 旋转轴为(0,0,-1)会导致getComputeStyle中的transform为单位矩阵*/
|
|
374
|
+
@keyframes rotate2 {
|
|
375
|
+
from {
|
|
376
|
+
transform: rotate3d(0, 0, 1, 0deg);
|
|
377
|
+
}
|
|
378
|
+
to {
|
|
379
|
+
transform: rotate3d(0, 0, 1, -360deg);
|
|
380
|
+
}
|
|
381
|
+
}
|
|
382
|
+
|
|
383
|
+
@keyframes scale1 {
|
|
384
|
+
0% {
|
|
385
|
+
transform: scale3d(1, 1, 1);
|
|
386
|
+
}
|
|
387
|
+
50% {
|
|
388
|
+
transform: scale3d(2, 2, 1);
|
|
389
|
+
}
|
|
390
|
+
100% {
|
|
391
|
+
transform: scale3d(1, 1, 1);
|
|
392
|
+
}
|
|
393
|
+
}
|
|
394
|
+
|
|
395
|
+
@keyframes scale2 {
|
|
396
|
+
0% {
|
|
397
|
+
transform: scale3d(1, 1, 1);
|
|
398
|
+
}
|
|
399
|
+
50% {
|
|
400
|
+
transform: scale3d(2, 2, 1);
|
|
401
|
+
}
|
|
402
|
+
100% {
|
|
403
|
+
transform: scale3d(1, 1, 1);
|
|
404
|
+
}
|
|
405
|
+
}
|
|
406
|
+
|
|
407
|
+
@keyframes skew1 {
|
|
408
|
+
0% {
|
|
409
|
+
transform: skew(0, 0);
|
|
410
|
+
}
|
|
411
|
+
50% {
|
|
412
|
+
transform: skew(-60deg, 0);
|
|
413
|
+
}
|
|
414
|
+
100% {
|
|
415
|
+
transform: skew(0, 0);
|
|
416
|
+
}
|
|
417
|
+
}
|
|
418
|
+
|
|
419
|
+
@keyframes skew2 {
|
|
420
|
+
0% {
|
|
421
|
+
transform: skew(0, 0);
|
|
422
|
+
}
|
|
423
|
+
50% {
|
|
424
|
+
transform: skew(60deg, 0);
|
|
425
|
+
}
|
|
426
|
+
100% {
|
|
427
|
+
transform: skew(0, 0);
|
|
428
|
+
}
|
|
429
|
+
}
|
|
430
|
+
|
|
431
|
+
@keyframes rotate3 {
|
|
432
|
+
from {
|
|
433
|
+
transform: rotate3d(0, 0, 1, 0deg);
|
|
434
|
+
transform-origin: center top;
|
|
435
|
+
}
|
|
436
|
+
to {
|
|
437
|
+
transform: rotate3d(0, 0, 1, -360deg);
|
|
438
|
+
transform-origin: center top;
|
|
439
|
+
}
|
|
440
|
+
}
|
|
441
|
+
|
|
442
|
+
@keyframes rotate4 {
|
|
443
|
+
from {
|
|
444
|
+
transform: rotate3d(0, 0, 1, 0deg);
|
|
445
|
+
transform-origin: center center;
|
|
446
|
+
}
|
|
447
|
+
to {
|
|
448
|
+
transform: rotate3d(0, 0, 1, -360deg);
|
|
449
|
+
transform-origin: center center;
|
|
450
|
+
}
|
|
451
|
+
}
|
|
452
|
+
</style>
|
|
@@ -1,36 +1,27 @@
|
|
|
1
|
-
<script>
|
|
2
|
-
import { Vue } from "vue-class-component";
|
|
1
|
+
<script setup>
|
|
3
2
|
import jpegDemo from "../assets/jpegDemo.jpeg";
|
|
4
3
|
import pngDemo from "../assets/pngDemo.png";
|
|
5
4
|
import pngNoAlphaDemo from "../assets/pngNoAlphaDemo.png";
|
|
6
5
|
import bmpDemo from "../assets/bmpDemo.bmp";
|
|
6
|
+
import { useRouter } from "vue-router";
|
|
7
7
|
|
|
8
|
-
|
|
9
|
-
constructor(props) {
|
|
10
|
-
super(props);
|
|
8
|
+
const router = useRouter();
|
|
11
9
|
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
onKeyDown(ev) {
|
|
19
|
-
// 8:Backspace, 27:Escape, 10000:盒子返回键
|
|
20
|
-
if (ev.keyCode == 8 || ev.keyCode == 27 || ev.keyCode == 10000) {
|
|
21
|
-
window.JsView?.setGlobalConfig({
|
|
22
|
-
texCache: -1,
|
|
23
|
-
});
|
|
24
|
-
|
|
25
|
-
this.$router?.go(-1); // 有router时,是从DemoHomepage进入,回退
|
|
26
|
-
return true;
|
|
27
|
-
}
|
|
10
|
+
const onKeyDown = (ev) => {
|
|
11
|
+
// 8:Backspace, 27:Escape, 10000:盒子返回键
|
|
12
|
+
if (ev.keyCode == 8 || ev.keyCode == 27 || ev.keyCode == 10000) {
|
|
13
|
+
window.JsView?.setGlobalConfig({
|
|
14
|
+
texCache: -1,
|
|
15
|
+
});
|
|
28
16
|
|
|
29
|
-
|
|
17
|
+
router.go(-1); // 有router时,是从DemoHomepage进入,回退
|
|
18
|
+
return true;
|
|
30
19
|
}
|
|
31
|
-
|
|
32
|
-
|
|
20
|
+
|
|
21
|
+
return false;
|
|
22
|
+
};
|
|
33
23
|
</script>
|
|
24
|
+
|
|
34
25
|
<template>
|
|
35
26
|
<jsv-focus-block autoFocus :onKeyDown="onKeyDown">
|
|
36
27
|
<div class="allBgc">
|