@shijiu/jsview-vue 0.9.684 → 0.9.783

package/samples/MetroWidgetDemos/slideSetting/App.vue

@@ -0,0 +1,225 @@
+<!--
+ * @Author: ChenChanghua
+ * @Date: 2023-03-08 15:54:16
+ * @Description: file content
+-->
+<script setup>
+import {
+  MetroWidget,
+  HORIZONTAL,
+  useFocusHub,
+  EdgeDirection,
+  SeamlessSlide,
+  WholePageSlide,
+  FixPositionSlide,
+} from "jsview";
+import Item from "./Item.vue";
+import { onMounted } from "vue";
+
+const TAG = "MetroWidgetDemo";
+
+const focusHub = useFocusHub();
+
+const randomColor = () => {
+  let randomColor = Math.round(Math.random() * 2 ** 24).toString(16);
+  return (
+    "#" + new Array(6 - randomColor.length).fill("0").join("") + randomColor
+  );
+};
+
+const data = [];
+for (let i = 0; i < 30; i++) {
+  data.push({
+    width: 90,
+    height: 90,
+    marginRight: 10,
+    marginBottom: 10,
+    color: randomColor(),
+    content: i,
+  });
+}
+
+const widget1 = {
+  provideData: () => {
+    return data;
+  },
+  measures: (data) => {
+    return {
+      width: data.width,
+      height: data.height,
+      marginRight: data.marginRight,
+      marginBottom: data.marginBottom,
+    };
+  },
+  onEdge: (edgeInfo) => {
+    if (edgeInfo.direction == EdgeDirection.bottom) {
+      focusHub.setFocus("widget2");
+    }
+  },
+  widgetLayout: {
+    left: 50,
+    top: 50,
+    width: 500,
+    height: 200,
+  },
+  slideSetting: new SeamlessSlide({
+    startPercent: 0.2,
+    endPercent: 0.8,
+  }),
+};
+
+const widget2 = {
+  provideData: () => {
+    return data;
+  },
+  measures: (data) => {
+    return {
+      width: data.width,
+      height: data.height,
+      marginRight: data.marginRight,
+      marginBottom: data.marginBottom,
+    };
+  },
+  onEdge: (edgeInfo) => {
+    if (edgeInfo.direction == EdgeDirection.top) {
+      focusHub.setFocus("widget1");
+    } else if (edgeInfo.direction == EdgeDirection.bottom) {
+      focusHub.setFocus("widget3");
+    }
+  },
+  widgetLayout: {
+    left: 50,
+    top: 300,
+    width: 500,
+    height: 220,
+  },
+  slideSetting: new WholePageSlide(),
+};
+
+const widget3 = {
+  provideData: () => {
+    return data;
+  },
+  measures: (data) => {
+    return {
+      width: data.width,
+      height: data.height,
+      marginRight: data.marginRight,
+      marginBottom: data.marginBottom,
+    };
+  },
+  onEdge: (edgeInfo) => {
+    if (edgeInfo.direction == EdgeDirection.top) {
+      focusHub.setFocus("widget2");
+    }
+  },
+  widgetLayout: {
+    left: 50,
+    top: 550,
+    width: 500,
+    height: 200,
+  },
+  slideSetting: new FixPositionSlide({ fixPercent: 0.5 }),
+};
+
+onMounted(() => {
+  //组件mount后设置焦点
+  focusHub.setFocus("widget1");
+});
+</script>
+
+<template>
+  <div
+    :style="{
+      width: 1920,
+      height: 1080,
+      backgroundColor: '#007788',
+    }"
+  />
+  <div
+    :style="{
+      left: widget1.widgetLayout.left,
+      top: widget1.widgetLayout.top - 50,
+      width: 1280,
+      height: 50,
+      fontSize: 20,
+      color: '#FFFFFF',
+    }"
+  >
+    {{ "无缝滚动" }}
+  </div>
+  <metro-widget
+    name="widget1"
+    :left="widget1.widgetLayout.left"
+    :top="widget1.widgetLayout.top"
+    :width="widget1.widgetLayout.width"
+    :height="widget1.widgetLayout.height"
+    :provideData="widget1.provideData"
+    :measures="widget1.measures"
+    :onEdge="widget1.onEdge"
+    :direction="HORIZONTAL"
+    :slideSetting="widget1.slideSetting"
+  >
+    <template #renderItem="{ data, onAction }">
+      <item :data="data" :onAction="onAction" />
+    </template>
+  </metro-widget>
+
+  <div
+    :style="{
+      left: widget2.widgetLayout.left,
+      top: widget2.widgetLayout.top - 50,
+      width: 1280,
+      height: 50,
+      fontSize: 20,
+      color: '#FFFFFF',
+    }"
+  >
+    {{ "翻页" }}
+  </div>
+  <metro-widget
+    name="widget2"
+    :left="widget2.widgetLayout.left"
+    :top="widget2.widgetLayout.top"
+    :width="widget2.widgetLayout.width"
+    :height="widget2.widgetLayout.height"
+    :provideData="widget2.provideData"
+    :measures="widget2.measures"
+    :onEdge="widget2.onEdge"
+    :direction="HORIZONTAL"
+    :slideSetting="widget2.slideSetting"
+  >
+    <template #renderItem="{ data, onAction }">
+      <item :data="data" :onAction="onAction" />
+    </template>
+  </metro-widget>
+
+  <div
+    :style="{
+      left: widget3.widgetLayout.left,
+      top: widget3.widgetLayout.top - 50,
+      width: 1280,
+      height: 50,
+      fontSize: 20,
+      color: '#FFFFFF',
+    }"
+  >
+    {{ "焦点固定位置" }}
+  </div>
+  <metro-widget
+    name="widget3"
+    :left="widget3.widgetLayout.left"
+    :top="widget3.widgetLayout.top"
+    :width="widget3.widgetLayout.width"
+    :height="widget3.widgetLayout.height"
+    :provideData="widget3.provideData"
+    :measures="widget3.measures"
+    :onEdge="widget3.onEdge"
+    :direction="HORIZONTAL"
+    :slideSetting="widget3.slideSetting"
+  >
+    <template #renderItem="{ data, onAction }">
+      <item :data="data" :onAction="onAction" />
+    </template>
+  </metro-widget>
+</template>

package/samples/MetroWidgetDemos/slideSetting/Item.vue

@@ -0,0 +1,45 @@
+<!--
+ * @Author: ChenChanghua
+ * @Date: 2023-03-08 14:52:17
+ * @Description: file content
+-->
+<script setup>
+import { ref, shallowRef, inject } from "vue";
+
+const props = defineProps({
+  data: Object,
+  onAction: Object,
+});
+
+const divRef = shallowRef(null);
+const focused = ref(false);
+
+// 注册回调
+const onFocus = () => {
+  focused.value = true;
+};
+const onBlur = () => {
+  focused.value = false;
+};
+const onClick = () => {
+  console.log("item onclick ", props.data);
+};
+props.onAction.register("onFocus", onFocus);
+props.onAction.register("onBlur", onBlur);
+props.onAction.register("onClick", onClick);
+</script>
+
+<template>
+  <div
+    ref="divRef"
+    :style="{
+      width: data.width,
+      height: data.height,
+      fontSize: 30,
+      color: focused ? '#FF0000' : '#FFFFFF',
+      backgroundColor: data.color,
+    }"
+  >
+    {{ data.content }}
+  </div>
+</template>

package/samples/NinePatchDemo/App.vue

@@ -1,145 +1,101 @@
 <script setup>
-import {
-  jJsvRuntimeBridge,
-  MetroWidget,
-  HORIZONTAL,
-  JsvNinePatch,
-} from "jsview";
+import { MetroWidget, HORIZONTAL, JsvNinePatch, useFocusHub } from "jsview";
 import Item from "./Item.vue";
 import borderImageUrl from "./assets/border.png";
-import { ref, onMounted } from "vue";
-import { useRouter, useRoute } from "vue-router";
+import { reactive, provide, onMounted } from "vue";
 
-const router = useRouter();
+const focusHub = useFocusHub();
 
-const data = [
-  {
-    blocks: {
-      w: 160,
-      h: 160,
+const focusSize = reactive({
+  width: 0,
+  height: 0,
+  left: 0,
+  top: 0,
+});
+provide("focusSize", focusSize);
+
+const provideData = () => {
+  return [
+    {
+      width: 160,
+      height: 160,
+      color: "#FF9900",
+      content: 0,
     },
-    color: "#FF9900",
-    content: 0,
-  },
-  {
-    blocks: {
-      w: 300,
-      h: 300,
+    {
+      width: 300,
+      height: 300,
+      color: "#0099FF",
+      content: 1,
     },
-    color: "#0099FF",
-    content: 1,
-  },
-  {
-    blocks: {
-      w: 160,
-      h: 160,
+    {
+      width: 160,
+      height: 160,
+      color: "#FF9900",
+      content: 2,
     },
-    color: "#FF9900",
-    content: 2,
-  },
-];
-
-const framePosition = ref({
-  x: 0,
-  y: 0,
-  width: 50,
-  height: 50,
-});
-
-const _onFramePositionChanged = (new_x, new_y, new_width, new_height) => {
-  console.log(
-    `new x=${new_x} y=${new_y} width=${new_width} height=${new_height}`
-  );
-
-  framePosition.value = {
-    x: new_x,
-    y: new_y,
-    width: new_width,
-    height: new_height,
-  };
+  ];
 };
 
-const _measures = (item) => {
+const measures = (item) => {
   return {
-    width: item.blocks.w,
-    height: item.blocks.h,
+    width: item.width,
+    height: item.height,
     marginRight: 10,
-    marginTop: 10,
   };
 };
 
-const _onKeyDown = (ev) => {
-  // 8:Backspace, 27:Escape, 10000:盒子返回键
-  if (ev.keyCode == 8 || ev.keyCode == 27 || ev.keyCode == 10000) {
-    router?.go(-1); // 有router时，是从DemoHomepage进入，回退
-    return true;
-  }
-  return false;
-};
-
-const myFocusWidget = ref(null);
-
 onMounted(() => {
-  myFocusWidget.value.getFocusBlockRef().requestFocus();
-  jJsvRuntimeBridge.notifyPageLoaded();
+  focusHub.setFocus("myWidget");
 });
 </script>
 
 <template>
   <div :style="{ width: 1280, height: 720, backgroundColor: '#FFFFFF' }">
-    <jsv-focus-block ref="focusNode" :onKeyDown="_onKeyDown">
-      <div
-        :style="{
-          textAlign: 'center',
-          fontSize: 30,
-          lineHeight: 50,
-          color: '#ffffff',
-          left: 140,
-          top: 20,
-          width: 1000,
-          height: 50,
-          backgroundColor: 'rgba(27,38,151,0.8)',
-        }"
-      >
-        NinePatch展示,框的四个角的方形中心和项目的四个顶点严格对齐
-      </div>
-      <metro-widget
-        ref="myFocusWidget"
-        :top="100"
-        :left="250"
-        :width="1000"
-        :height="400"
-        :direction="HORIZONTAL"
-        :data="data"
-        :measures="_measures"
-        :padding="{ left: 50, right: 50, top: 50, height: 50 }"
-      >
-        <template #renderItem="{ data, query, onEdge, onAction }">
-          <item
-            :data="data"
-            :query="query"
-            :onEdge="onEdge"
-            :onAction="onAction"
-            :frameChanged="_onFramePositionChanged"
-          />
-        </template>
-      </metro-widget>
-      <div :style="{ top: 150, left: 300 }">
-        <jsv-nine-patch
-          :style="{
-            width: framePosition.width,
-            height: framePosition.height,
-            top: framePosition.y,
-            left: framePosition.x,
-          }"
-          :imageUrl="borderImageUrl"
-          :imageWidth="81"
-          :centerWidth="25"
-          :borderOutset="14"
-          :imageDspWidth="81"
-          :animTime="0.2"
-        ></jsv-nine-patch>
-      </div>
-    </jsv-focus-block>
+    <div
+      :style="{
+        textAlign: 'center',
+        fontSize: 30,
+        lineHeight: 50,
+        color: '#ffffff',
+        left: 140,
+        top: 20,
+        width: 1000,
+        height: 50,
+        backgroundColor: 'rgba(27,38,151,0.8)',
+      }"
+    >
+      NinePatch展示,框的四个角的方形中心和项目的四个顶点严格对齐
+    </div>
+    <metro-widget
+      name="myWidget"
+      :top="100"
+      :left="250"
+      :width="1000"
+      :height="400"
+      :direction="HORIZONTAL"
+      :provideData="provideData"
+      :measures="measures"
+      :padding="{ left: 50, right: 50, top: 50, height: 50 }"
+    >
+      <template #renderItem="{ data, onAction }">
+        <item :data="data" :onAction="onAction" />
+      </template>
+    </metro-widget>
+    <jsv-nine-patch
+      :style="{
+        width: focusSize.width,
+        height: focusSize.height,
+        top: focusSize.top,
+        left: focusSize.left,
+      }"
+      :imageUrl="borderImageUrl"
+      :imageWidth="81"
+      :centerWidth="25"
+      :borderOutset="14"
+      :imageDspWidth="81"
+      :animTime="0.2"
+      :waitForInit="true"
+    ></jsv-nine-patch>
   </div>
 </template>

package/samples/NinePatchDemo/Item.vue

@@ -1,37 +1,30 @@
 <script setup>
-import { ref, computed } from "vue";
+import { ref, inject } from "vue";
+
+const focusSize = inject("focusSize");
 
 const props = defineProps({
   data: Object,
-  query: Object,
-  onEdge: Function,
   onAction: Object,
-  frameChanged: Function,
 });
 
-let focused = ref(false);
-
-let styleValue = computed(() => {
-  return {
-    width: props.data.blocks.w,
-    height: props.data.blocks.h,
-    color: "#FFFFFF",
-    backgroundColor: props.data.color,
-  };
-});
+const focused = ref(false);
+const divRef = ref(null);
 
 const onFocus = () => {
   focused.value = true;
-  if (props.frameChanged) {
-    let pos = props.query.position(props.query.id);
-
-    // 焦点时套在放大的item外缘，所以要计算按照中心放大后的焦点框x,y,width,height
-    const new_x = pos.left + (pos.width - pos.width * 1.05) / 2;
-    const new_y = pos.top + (pos.height - pos.height * 1.05) / 2;
-    const new_width = pos.width * 1.05;
-    const new_height = pos.height * 1.05;
-
-    props.frameChanged(new_x, new_y, new_width, new_height);
+  if (focusSize) {
+    divRef.value?.getBoundingClientRect().then(
+      (data) => {
+        focusSize.width = data.width;
+        focusSize.height = data.height;
+        focusSize.left = data.left;
+        focusSize.top = data.top;
+      },
+      (error) => {
+        console.log("get absolute position failed", error);
+      }
+    );
   }
 };
 
@@ -40,7 +33,7 @@ const onBlur = () => {
 };
 
 const onClicked = () => {
-  onsole.log(`item ${props.query.id} clicked`);
+  console.log("item clicked", props.data);
 };
 
 props.onAction.register("onFocus", onFocus);
@@ -49,8 +42,17 @@ props.onAction.register("onClick", onClicked);
 </script>
 
 <template>
-  <div :class="focused ? 'focus' : 'blur'" :style="styleValue">
-    {{ "" + props.data.content + (testData != null ? testData.MyName : "") }}
+  <div
+    ref="divRef"
+    :class="focused ? 'focus' : 'blur'"
+    :style="{
+      width: data.width,
+      height: data.height,
+      color: '#FFFFFF',
+      backgroundColor: data.color,
+    }"
+  >
+    {{ data.content }}
   </div>
 </template>
 

package/samples/Preload/App.vue

@@ -11,7 +11,7 @@ import awesome from "./images/awesomeface.png";
 import cat from "./images/cat.jpg";
 import { data } from "./data.js";
 import Item from "./Item.vue";
-import { ref } from "vue";
+import { ref, shallowRef } from "vue";
 import { useRouter } from "vue-router";
 
 const name = "/preload";

package/samples/Preload/Item.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from "vue";
+import { ref, shallowRef } from "vue";
 const props = defineProps({
   data: Object,
   query: Object,

package/samples/QrcodeDemo/App.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { JsvQrcode } from "jsview";
-import { ref } from "vue";
+import { ref, shallowRef } from "vue";
 import { useRouter } from "vue-router";
 
 const router = useRouter();

package/samples/SoundPool/App.vue

@@ -10,7 +10,7 @@ import coin from "./coin.mp3";
 import lose from "./lose.mp3";
 import bgmusic from "./bgmusic.mp3";
 import { JsvSoundPool, jJsvRuntimeBridge } from "jsview";
-import { onMounted, onBeforeUnmount, ref } from "vue";
+import { onMounted, onBeforeUnmount, shallowRef } from "vue";
 import { useRouter } from "vue-router";
 
 const router = useRouter();
@@ -19,7 +19,7 @@ let coinController1 = null;
 let coinController2 = null;
 let loseController1 = null;
 let loseController2 = null;
-let bgm = ref(null);
+let bgm = shallowRef(null);
 const _onKeyDown = (ev) => {
   if (ev.keyCode == 8 || ev.keyCode == 27 || ev.keyCode == 10000) {
     router.go(-1); // 有router时，是从DemoHomepage进入，回退
@@ -128,7 +128,7 @@ onBeforeUnmount(() => {
           `[确定]: 播放背景音乐\n[左]: 播放失败音乐1\n[右]: 播放失败音乐2\n[上]: 播放硬币音乐1\n[下]: 播放硬币音乐2`
         }}
       </div>
-      <audiotrack ref="bgm" :src="bgmusic" loop="loop" />
+      <jsv-audiotrack ref="bgm" :src="bgmusic" loop="loop" />
     </div>
   </jsv-focus-block>
 </template>

package/samples/SpriteImage/App.vue

@@ -110,6 +110,11 @@ export default {
     :onAction="{
       onKeyDown: onKeyDown,
     }"
+    :style="{
+      width:1280,
+      height:720,
+      backgroundColor:'#000000'
+    }"
   >
     <div
       :style="{