Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
tomleePHP
uni-app
提交
6b4ebb60
U
uni-app
项目概览
tomleePHP
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6b4ebb60
编写于
6月 03, 2019
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of github.com:dcloudio/uni-app into dev
上级
2294e8a8
ed63d83d
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
149 addition
and
3 deletion
+149
-3
packages/uni-app-plus/dist/index.js
packages/uni-app-plus/dist/index.js
+2
-1
packages/uni-app-plus/package.json
packages/uni-app-plus/package.json
+1
-1
src/core/service/plugins/index.js
src/core/service/plugins/index.js
+8
-0
src/platforms/app-plus-nvue/services/api/context/live-pusher.js
...atforms/app-plus-nvue/services/api/context/live-pusher.js
+76
-0
src/platforms/app-plus-nvue/services/api/context/video.js
src/platforms/app-plus-nvue/services/api/context/video.js
+60
-0
src/platforms/app-plus/service/api/sub-nvue.js
src/platforms/app-plus/service/api/sub-nvue.js
+2
-1
未找到文件。
packages/uni-app-plus/dist/index.js
浏览文件 @
6b4ebb60
...
...
@@ -317,7 +317,8 @@ function wrapper$1 (webview) {
return
}
const
maskColor
=
webview
.
__uniapp_mask
;
const
maskWebview
=
plus
.
webview
.
getWebviewById
(
webview
.
__uniapp_mask_id
);
let
maskWebview
=
plus
.
webview
.
getWebviewById
(
webview
.
__uniapp_mask_id
);
maskWebview
=
maskWebview
.
parent
()
||
maskWebview
;
// 再次检测父
const
oldShow
=
webview
.
show
;
const
oldHide
=
webview
.
hide
;
const
oldClose
=
webview
.
close
;
...
...
packages/uni-app-plus/package.json
浏览文件 @
6b4ebb60
{
"name"
:
"@dcloudio/uni-app-plus"
,
"version"
:
"0.0.24
0
"
,
"version"
:
"0.0.24
1
"
,
"description"
:
"uni-app app-plus"
,
"main"
:
"dist/index.js"
,
"scripts"
:
{
...
...
src/core/service/plugins/index.js
浏览文件 @
6b4ebb60
...
...
@@ -152,6 +152,14 @@ export default {
}
})
Vue
.
prototype
.
createSelectorQuery
=
function
createSelectorQuery
()
{
return
uni
.
createSelectorQuery
().
in
(
this
)
}
Vue
.
prototype
.
createIntersectionObserver
=
function
createIntersectionObserver
(
args
)
{
return
uni
.
createIntersectionObserver
(
this
,
args
)
}
Vue
.
use
(
VueRouter
)
}
...
...
src/platforms/app-plus-nvue/services/api/context/live-pusher.js
浏览文件 @
6b4ebb60
import
{
findRefById
,
invokeVmMethod
,
invokeVmMethodWithoutArgs
}
from
'
../util
'
class
LivePusherContext
{
constructor
(
id
,
ctx
)
{
this
.
id
=
id
this
.
ctx
=
ctx
}
start
(
cbs
)
{
return
invokeVmMethodWithoutArgs
(
this
.
ctx
,
'
start
'
,
cbs
)
}
stop
(
cbs
)
{
return
invokeVmMethodWithoutArgs
(
this
.
ctx
,
'
stop
'
,
cbs
)
}
pause
(
cbs
)
{
return
invokeVmMethodWithoutArgs
(
this
.
ctx
,
'
pause
'
,
cbs
)
}
resume
(
cbs
)
{
return
invokeVmMethodWithoutArgs
(
this
.
ctx
,
'
resume
'
,
cbs
)
}
switchCamera
(
cbs
)
{
return
invokeVmMethodWithoutArgs
(
this
.
ctx
,
'
switchCamera
'
,
cbs
)
}
snapshot
(
cbs
)
{
return
invokeVmMethodWithoutArgs
(
this
.
ctx
,
'
snapshot
'
,
cbs
)
}
toggleTorch
(
cbs
)
{
return
invokeVmMethodWithoutArgs
(
this
.
ctx
,
'
toggleTorch
'
,
cbs
)
}
playBGM
(
args
)
{
return
invokeVmMethod
(
this
.
ctx
,
'
playBGM
'
,
args
)
}
stopBGM
(
cbs
)
{
return
invokeVmMethodWithoutArgs
(
this
.
ctx
,
'
stopBGM
'
,
cbs
)
}
pauseBGM
(
cbs
)
{
return
invokeVmMethodWithoutArgs
(
this
.
ctx
,
'
pauseBGM
'
,
cbs
)
}
resumeBGM
(
cbs
)
{
return
invokeVmMethodWithoutArgs
(
this
.
ctx
,
'
resumeBGM
'
,
cbs
)
}
setBGMVolume
(
cbs
)
{
return
invokeVmMethod
(
this
.
ctx
,
'
setBGMVolume
'
,
cbs
)
}
startPreview
(
cbs
)
{
return
invokeVmMethodWithoutArgs
(
this
.
ctx
,
'
startPreview
'
,
cbs
)
}
stopPreview
(
args
)
{
return
invokeVmMethodWithoutArgs
(
this
.
ctx
,
'
stopPreview
'
,
args
)
}
}
export
function
createLivePusherContext
(
id
,
vm
)
{
const
ref
=
findRefById
(
id
,
vm
)
if
(
!
ref
)
{
global
.
nativeLog
(
'
Can not find `
'
+
id
+
'
`
'
,
'
__WARN
'
)
}
return
new
LivePusherContext
(
id
,
vm
.
$refs
[
ref
])
}
src/platforms/app-plus-nvue/services/api/context/video.js
浏览文件 @
6b4ebb60
import
{
findRefById
,
invokeVmMethod
,
invokeVmMethodWithoutArgs
}
from
'
../util
'
class
VideoContext
{
constructor
(
id
,
ctx
)
{
this
.
id
=
id
this
.
ctx
=
ctx
}
play
()
{
return
invokeVmMethodWithoutArgs
(
this
.
ctx
,
'
play
'
)
}
pause
()
{
return
invokeVmMethodWithoutArgs
(
this
.
ctx
,
'
pause
'
)
}
seek
(
args
)
{
return
invokeVmMethod
(
this
.
ctx
,
'
seek
'
,
args
)
}
stop
()
{
return
invokeVmMethodWithoutArgs
(
this
.
ctx
,
'
stop
'
)
}
sendDanmu
(
args
)
{
return
invokeVmMethod
(
this
.
ctx
,
'
sendDanmu
'
,
args
)
}
playbackRate
(
args
)
{
return
invokeVmMethod
(
this
.
ctx
,
'
playbackRate
'
,
args
)
}
requestFullScreen
(
args
)
{
return
invokeVmMethod
(
this
.
ctx
,
'
requestFullScreen
'
,
args
)
}
exitFullScreen
()
{
return
invokeVmMethodWithoutArgs
(
this
.
ctx
,
'
exitFullScreen
'
)
}
showStatusBar
()
{
return
invokeVmMethodWithoutArgs
(
this
.
ctx
,
'
showStatusBar
'
)
}
hideStatusBar
()
{
return
invokeVmMethodWithoutArgs
(
this
.
ctx
,
'
hideStatusBar
'
)
}
}
export
function
createVideoContext
(
id
,
vm
)
{
const
ref
=
findRefById
(
id
,
vm
)
if
(
!
ref
)
{
global
.
nativeLog
(
'
Can not find `
'
+
id
+
'
`
'
,
'
__WARN
'
)
}
return
new
VideoContext
(
id
,
vm
.
$refs
[
ref
])
}
src/platforms/app-plus/service/api/sub-nvue.js
浏览文件 @
6b4ebb60
...
...
@@ -19,7 +19,8 @@ function wrapper (webview) {
return
}
const
maskColor
=
webview
.
__uniapp_mask
const
maskWebview
=
plus
.
webview
.
getWebviewById
(
webview
.
__uniapp_mask_id
)
let
maskWebview
=
plus
.
webview
.
getWebviewById
(
webview
.
__uniapp_mask_id
)
maskWebview
=
maskWebview
.
parent
()
||
maskWebview
// 再次检测父
const
oldShow
=
webview
.
show
const
oldHide
=
webview
.
hide
const
oldClose
=
webview
.
close
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录