Skip to content

Commit b8fa80f

Browse files
authored
Merge pull request #332 from Ezviz-OpenBiz/develop
fixed: token and bug
2 parents ab75095 + d9d3212 commit b8fa80f

File tree

15 files changed

+328
-258
lines changed

15 files changed

+328
-258
lines changed

demos/base-demo/ezuikit.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demos/nginx-demo/html/ezuikit.js

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demos/with-vue2.6/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
"lint": "vue-cli-service lint"
1010
},
1111
"dependencies": {
12-
"ezuikit-js": "^8.1.10",
1312
"core-js": "^3.18.1",
14-
"vue": "2.6.14"
13+
"ezuikit-js": "8.1.10-beta.6",
14+
"vue": "2.6.14",
15+
"vue-router": "3"
1516
},
1617
"devDependencies": {
1718
"@vue/cli-plugin-babel": "4.5.13",

demos/with-vue2.6/pnpm-lock.yaml

Lines changed: 15 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demos/with-vue2.6/src/App.vue

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
<template>
2-
<div id="app">
3-
<Player />
4-
</div>
2+
<div id="app">
3+
<router-view></router-view>
4+
</div>
55
</template>
6-
<script>
7-
import Player from "./components/Multi.vue";
8-
9-
export default {
10-
name: "App",
11-
components: {
12-
Player,
13-
},
14-
};
15-
</script>
166
<style>
7+
html,
8+
body {
9+
padding: 0;
10+
margin: 0;
11+
}
12+
1713
#app {
1814
font-family: Avenir, Helvetica, Arial, sans-serif;
1915
-webkit-font-smoothing: antialiased;

demos/with-vue2.6/src/components/Multi.vue

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

demos/with-vue2.6/src/components/Player.vue

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,12 @@ export default {
9595
9696
// 首帧渲染成功
9797
// first frame display
98-
player.eventEmitter.on(
99-
EZUIKitPlayer.EVENTS.firstFrameDisplay,
100-
() => {
101-
console.log("firstFrameDisplay ");
102-
}
103-
);
104-
player.eventEmitter.on(
105-
EZUIKitPlayer.EVENTS.streamInfoCB,
106-
(info) => {
107-
console.log("streamInfoCB ", info);
108-
}
109-
);
98+
player.eventEmitter.on(EZUIKitPlayer.EVENTS.firstFrameDisplay, () => {
99+
console.log("firstFrameDisplay ");
100+
});
101+
player.eventEmitter.on(EZUIKitPlayer.EVENTS.streamInfoCB, (info) => {
102+
console.log("streamInfoCB ", info);
103+
});
110104
111105
window.player = player;
112106
},

demos/with-vue2.6/src/main.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import Vue from "vue";
2+
import router from "./router";
23
import App from "./App.vue";
34

4-
Vue.config.productionTip = false
5+
Vue.config.productionTip = false;
56

67
new Vue({
8+
router,
79
render: (h) => h(App),
810
}).$mount("#app");
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<template>
2+
<div class="page">
3+
<div style="padding-bottom: 30px">
4+
<Player />
5+
</div>
6+
<router-link to="/multi">多屏实例(Multi screen)</router-link>
7+
</div>
8+
</template>
9+
10+
<script>
11+
import Player from "../components/Player.vue";
12+
13+
export default {
14+
name: "Home",
15+
components: {
16+
Player,
17+
},
18+
mounted: () => {
19+
console.group("mounted 组件挂载完毕状态===============》");
20+
},
21+
methods: {},
22+
};
23+
</script>

0 commit comments

Comments
 (0)