Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
live-management-web
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haojie
live-management-web
Commits
5add2379
Commit
5add2379
authored
Jul 31, 2023
by
haojie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决恢复音量无效的问题
parent
9208f384
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
19 deletions
+11
-19
src/components/AddVideoPlay.vue
+0
-1
src/components/pyqtTemplate.vue
+1
-2
src/pages/InteractiveResponse/index.vue
+1
-2
src/pages/OnlyVideoLive/index.vue
+7
-8
src/pages/home/components/myDigtalPeople.vue
+1
-2
src/pages/startLive/index.vue
+1
-2
src/utils/pyqt.ts
+0
-2
No files found.
src/components/AddVideoPlay.vue
View file @
5add2379
...
...
@@ -208,7 +208,6 @@ onMounted(() => {
// 全局function
injectWindow
(
'lowerVideoVolume'
,
lowerVideoVolume
);
injectWindow
(
'videoVolumeRestoration'
,
videoVolumeRestoration
);
console
.
log
(
window
.
pyEvent
);
});
onBeforeUnmount
(()
=>
{
...
...
src/components/pyqtTemplate.vue
View file @
5add2379
...
...
@@ -12,7 +12,7 @@
import
{
onBeforeUnmount
,
onMounted
,
ref
}
from
'vue'
;
import
{
show_message
}
from
'@/utils/tool'
;
import
{
testRequest
}
from
'@/utils/api/userApi'
;
import
{
in
itPyqtToWindow
,
in
jectWindow
}
from
'@/utils/pyqt'
;
import
{
injectWindow
}
from
'@/utils/pyqt'
;
const
py_text
=
ref
(
'你好'
);
const
token
=
ref
(
'null'
);
...
...
@@ -49,7 +49,6 @@ const sendToken = (value: string) => {
};
onMounted
(()
=>
{
initPyqtToWindow
();
injectWindow
(
'sendToken'
,
sendToken
);
injectWindow
(
'py_receive'
,
py_receive
);
// 请求接口测试
...
...
src/pages/InteractiveResponse/index.vue
View file @
5add2379
...
...
@@ -11,7 +11,7 @@
import
{
onBeforeUnmount
,
onMounted
,
ref
}
from
'vue'
;
import
Human
from
'./components/human.vue'
;
import
{
useRoute
}
from
'vue-router'
;
import
{
callPyjsInWindow
,
in
itPyqtToWindow
,
in
jectWindow
}
from
'@/utils/pyqt'
;
import
{
callPyjsInWindow
,
injectWindow
}
from
'@/utils/pyqt'
;
import
{
getliveTaskReply
,
getUserCookie
}
from
'@/utils/api/userApi'
;
import
{
useStore
}
from
'vuex'
;
...
...
@@ -160,7 +160,6 @@ const mergeCallback = (params: any) => {
};
onMounted
(
async
()
=>
{
initPyqtToWindow
();
// 将通知方法注入window
injectWindow
(
'mergeCallback'
,
mergeCallback
);
// 传递用户token
...
...
src/pages/OnlyVideoLive/index.vue
View file @
5add2379
...
...
@@ -10,7 +10,7 @@ import Video from './components/video.vue';
import
{
getLiveDetail
}
from
'@/utils/api/userApi'
;
import
{
useRoute
,
useRouter
}
from
'vue-router'
;
import
{
show_message
,
isDev
}
from
'@/utils/tool'
;
import
{
callPyjsInWindow
,
in
itPyqtToWindow
,
in
jectWindow
}
from
'@/utils/pyqt'
;
import
{
callPyjsInWindow
,
injectWindow
}
from
'@/utils/pyqt'
;
import
{
getliveTaskReply
,
getUserCookie
}
from
'@/utils/api/userApi'
;
import
routerConfig
from
'@/router/tool'
;
import
{
useStore
}
from
'vuex'
;
...
...
@@ -214,7 +214,6 @@ const mergeCallback = (params: any) => {
};
onMounted
(
async
()
=>
{
initPyqtToWindow
();
// 将通知方法注入window
injectWindow
(
'mergeCallback'
,
mergeCallback
);
// 传递用户token
...
...
@@ -224,12 +223,12 @@ onMounted(async () => {
console
.
error
(
'没有pyjs'
);
}
if
(
isDev
())
{
mergeCallback
({
// video: imgs.mp4,
video
:
'http://yunyi-live.oss-cn-hangzhou.aliyuncs.com/live/output/87.mp4'
,
});
}
//
if (isDev()) {
//
mergeCallback({
//
// video: imgs.mp4,
//
video: 'http://yunyi-live.oss-cn-hangzhou.aliyuncs.com/live/output/87.mp4',
//
});
//
}
// 打开定时任务
startLiveInterval
();
openInterval
();
...
...
src/pages/home/components/myDigtalPeople.vue
View file @
5add2379
...
...
@@ -68,7 +68,7 @@ import routerConfig from '@/router/tool';
import
{
onUpdateLiveTask
}
from
'@/service/Common'
;
import
{
getLiveTask
,
deleteLiveTask
}
from
'@/utils/api/userApi'
;
import
{
isDev
,
show_message
}
from
'@/utils/tool'
;
import
{
callPyjsInWindow
,
in
itPyqtToWindow
,
in
jectWindow
}
from
'@/utils/pyqt'
;
import
{
callPyjsInWindow
,
injectWindow
}
from
'@/utils/pyqt'
;
const
props
=
withDefaults
(
defineProps
<
{
...
...
@@ -216,7 +216,6 @@ const nameChange = async (id: any, value: string) => {
};
onMounted
(()
=>
{
initPyqtToWindow
();
// 刷新方法
injectWindow
(
'getLiveTask'
,
getList
);
getList
();
...
...
src/pages/startLive/index.vue
View file @
5add2379
...
...
@@ -17,7 +17,7 @@ import Human from './components/human.vue';
import
{
getLiveDetail
}
from
'@/utils/api/userApi'
;
import
{
useRoute
,
useRouter
}
from
'vue-router'
;
import
{
show_message
}
from
'@/utils/tool'
;
import
{
callPyjsInWindow
,
in
itPyqtToWindow
,
in
jectWindow
}
from
'@/utils/pyqt'
;
import
{
callPyjsInWindow
,
injectWindow
}
from
'@/utils/pyqt'
;
import
{
getliveTaskReply
,
getLiveTask
,
getUserCookie
}
from
'@/utils/api/userApi'
;
import
routerConfig
from
'@/router/tool'
;
import
{
useStore
}
from
'vuex'
;
...
...
@@ -279,7 +279,6 @@ const mergeCallback = (params: any) => {
};
onMounted
(
async
()
=>
{
initPyqtToWindow
();
// 将通知方法注入window
injectWindow
(
'mergeCallback'
,
mergeCallback
);
// 传递用户token
...
...
src/utils/pyqt.ts
View file @
5add2379
import
{
show_message
}
from
'./tool'
;
export
const
initPyqtToWindow
=
(
key
:
string
=
''
)
=>
{
if
(
key
)
{
window
[
key
]
=
{};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment