Commit 5add2379 by haojie

解决恢复音量无效的问题

parent 9208f384
...@@ -208,7 +208,6 @@ onMounted(() => { ...@@ -208,7 +208,6 @@ onMounted(() => {
// 全局function // 全局function
injectWindow('lowerVideoVolume', lowerVideoVolume); injectWindow('lowerVideoVolume', lowerVideoVolume);
injectWindow('videoVolumeRestoration', videoVolumeRestoration); injectWindow('videoVolumeRestoration', videoVolumeRestoration);
console.log(window.pyEvent);
}); });
onBeforeUnmount(() => { onBeforeUnmount(() => {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
import { onBeforeUnmount, onMounted, ref } from 'vue'; import { onBeforeUnmount, onMounted, ref } from 'vue';
import { show_message } from '@/utils/tool'; import { show_message } from '@/utils/tool';
import { testRequest } from '@/utils/api/userApi'; import { testRequest } from '@/utils/api/userApi';
import { initPyqtToWindow, injectWindow } from '@/utils/pyqt'; import { injectWindow } from '@/utils/pyqt';
const py_text = ref('你好'); const py_text = ref('你好');
const token = ref('null'); const token = ref('null');
...@@ -49,7 +49,6 @@ const sendToken = (value: string) => { ...@@ -49,7 +49,6 @@ const sendToken = (value: string) => {
}; };
onMounted(() => { onMounted(() => {
initPyqtToWindow();
injectWindow('sendToken', sendToken); injectWindow('sendToken', sendToken);
injectWindow('py_receive', py_receive); injectWindow('py_receive', py_receive);
// 请求接口测试 // 请求接口测试
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
import { onBeforeUnmount, onMounted, ref } from 'vue'; import { onBeforeUnmount, onMounted, ref } from 'vue';
import Human from './components/human.vue'; import Human from './components/human.vue';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import { callPyjsInWindow, initPyqtToWindow, injectWindow } from '@/utils/pyqt'; import { callPyjsInWindow, injectWindow } from '@/utils/pyqt';
import { getliveTaskReply, getUserCookie } from '@/utils/api/userApi'; import { getliveTaskReply, getUserCookie } from '@/utils/api/userApi';
import { useStore } from 'vuex'; import { useStore } from 'vuex';
...@@ -160,7 +160,6 @@ const mergeCallback = (params: any) => { ...@@ -160,7 +160,6 @@ const mergeCallback = (params: any) => {
}; };
onMounted(async () => { onMounted(async () => {
initPyqtToWindow();
// 将通知方法注入window // 将通知方法注入window
injectWindow('mergeCallback', mergeCallback); injectWindow('mergeCallback', mergeCallback);
// 传递用户token // 传递用户token
......
...@@ -10,7 +10,7 @@ import Video from './components/video.vue'; ...@@ -10,7 +10,7 @@ import Video from './components/video.vue';
import { getLiveDetail } from '@/utils/api/userApi'; import { getLiveDetail } from '@/utils/api/userApi';
import { useRoute, useRouter } from 'vue-router'; import { useRoute, useRouter } from 'vue-router';
import { show_message, isDev } from '@/utils/tool'; import { show_message, isDev } from '@/utils/tool';
import { callPyjsInWindow, initPyqtToWindow, injectWindow } from '@/utils/pyqt'; import { callPyjsInWindow, injectWindow } from '@/utils/pyqt';
import { getliveTaskReply, getUserCookie } from '@/utils/api/userApi'; import { getliveTaskReply, getUserCookie } from '@/utils/api/userApi';
import routerConfig from '@/router/tool'; import routerConfig from '@/router/tool';
import { useStore } from 'vuex'; import { useStore } from 'vuex';
...@@ -214,7 +214,6 @@ const mergeCallback = (params: any) => { ...@@ -214,7 +214,6 @@ const mergeCallback = (params: any) => {
}; };
onMounted(async () => { onMounted(async () => {
initPyqtToWindow();
// 将通知方法注入window // 将通知方法注入window
injectWindow('mergeCallback', mergeCallback); injectWindow('mergeCallback', mergeCallback);
// 传递用户token // 传递用户token
...@@ -224,12 +223,12 @@ onMounted(async () => { ...@@ -224,12 +223,12 @@ onMounted(async () => {
console.error('没有pyjs'); console.error('没有pyjs');
} }
if (isDev()) { // if (isDev()) {
mergeCallback({ // mergeCallback({
// video: imgs.mp4, // // video: imgs.mp4,
video: 'http://yunyi-live.oss-cn-hangzhou.aliyuncs.com/live/output/87.mp4', // video: 'http://yunyi-live.oss-cn-hangzhou.aliyuncs.com/live/output/87.mp4',
}); // });
} // }
// 打开定时任务 // 打开定时任务
startLiveInterval(); startLiveInterval();
openInterval(); openInterval();
......
...@@ -68,7 +68,7 @@ import routerConfig from '@/router/tool'; ...@@ -68,7 +68,7 @@ import routerConfig from '@/router/tool';
import { onUpdateLiveTask } from '@/service/Common'; import { onUpdateLiveTask } from '@/service/Common';
import { getLiveTask, deleteLiveTask } from '@/utils/api/userApi'; import { getLiveTask, deleteLiveTask } from '@/utils/api/userApi';
import { isDev, show_message } from '@/utils/tool'; import { isDev, show_message } from '@/utils/tool';
import { callPyjsInWindow, initPyqtToWindow, injectWindow } from '@/utils/pyqt'; import { callPyjsInWindow, injectWindow } from '@/utils/pyqt';
const props = withDefaults( const props = withDefaults(
defineProps<{ defineProps<{
...@@ -216,7 +216,6 @@ const nameChange = async (id: any, value: string) => { ...@@ -216,7 +216,6 @@ const nameChange = async (id: any, value: string) => {
}; };
onMounted(() => { onMounted(() => {
initPyqtToWindow();
// 刷新方法 // 刷新方法
injectWindow('getLiveTask', getList); injectWindow('getLiveTask', getList);
getList(); getList();
......
...@@ -17,7 +17,7 @@ import Human from './components/human.vue'; ...@@ -17,7 +17,7 @@ import Human from './components/human.vue';
import { getLiveDetail } from '@/utils/api/userApi'; import { getLiveDetail } from '@/utils/api/userApi';
import { useRoute, useRouter } from 'vue-router'; import { useRoute, useRouter } from 'vue-router';
import { show_message } from '@/utils/tool'; import { show_message } from '@/utils/tool';
import { callPyjsInWindow, initPyqtToWindow, injectWindow } from '@/utils/pyqt'; import { callPyjsInWindow, injectWindow } from '@/utils/pyqt';
import { getliveTaskReply, getLiveTask, getUserCookie } from '@/utils/api/userApi'; import { getliveTaskReply, getLiveTask, getUserCookie } from '@/utils/api/userApi';
import routerConfig from '@/router/tool'; import routerConfig from '@/router/tool';
import { useStore } from 'vuex'; import { useStore } from 'vuex';
...@@ -279,7 +279,6 @@ const mergeCallback = (params: any) => { ...@@ -279,7 +279,6 @@ const mergeCallback = (params: any) => {
}; };
onMounted(async () => { onMounted(async () => {
initPyqtToWindow();
// 将通知方法注入window // 将通知方法注入window
injectWindow('mergeCallback', mergeCallback); injectWindow('mergeCallback', mergeCallback);
// 传递用户token // 传递用户token
......
import { show_message } from './tool';
export const initPyqtToWindow = (key: string = '') => { export const initPyqtToWindow = (key: string = '') => {
if (key) { if (key) {
window[key] = {}; window[key] = {};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment