Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
anyefeiyu
uni-app
提交
950695e1
U
uni-app
项目概览
anyefeiyu
/
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,发现更多精彩内容 >>
提交
950695e1
编写于
2月 20, 2020
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(v3): getRedirectInfo
上级
0bb98176
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
143 addition
and
34 deletion
+143
-34
packages/uni-app-plus/dist/index.v3.js
packages/uni-app-plus/dist/index.v3.js
+123
-22
src/platforms/app-plus/service/framework/app.js
src/platforms/app-plus/service/framework/app.js
+20
-12
未找到文件。
packages/uni-app-plus/dist/index.v3.js
浏览文件 @
950695e1
...
@@ -71,7 +71,8 @@ var serviceContext = (function () {
...
@@ -71,7 +71,8 @@ var serviceContext = (function () {
'
saveVideoToPhotosAlbum
'
,
'
saveVideoToPhotosAlbum
'
,
'
createVideoContext
'
,
'
createVideoContext
'
,
'
createCameraContext
'
,
'
createCameraContext
'
,
'
createLivePlayerContext
'
'
createLivePlayerContext
'
,
'
createLivePusherContext
'
];
];
const
device
=
[
const
device
=
[
...
@@ -3542,6 +3543,84 @@ var serviceContext = (function () {
...
@@ -3542,6 +3543,84 @@ var serviceContext = (function () {
:
operateVideoPlayer
(
videoId
,
pageVm
,
type
,
data
);
:
operateVideoPlayer
(
videoId
,
pageVm
,
type
,
data
);
}
}
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
)
}
}
function
createLivePusherContext
(
id
,
vm
)
{
if
(
!
vm
)
{
return
console
.
warn
(
'
uni.createLivePusherContext 必须传入第二个参数,即当前 vm 对象(this)
'
)
}
const
elm
=
findElmById
(
id
,
vm
);
if
(
!
elm
)
{
return
console
.
warn
(
'
Can not find `
'
+
id
+
'
`
'
)
}
return
new
LivePusherContext
(
id
,
elm
)
}
function
createLivePusherContext$1
(
id
,
vm
)
{
return
createLivePusherContext
(
id
,
vm
)
}
let
watchAccelerationId
=
false
;
let
watchAccelerationId
=
false
;
let
isWatchAcceleration
=
false
;
let
isWatchAcceleration
=
false
;
...
@@ -4883,7 +4962,9 @@ var serviceContext = (function () {
...
@@ -4883,7 +4962,9 @@ var serviceContext = (function () {
tabBar
&&
tabBar
.
showTabBar
({
tabBar
&&
tabBar
.
showTabBar
({
animation
animation
});
});
}
}
let
maskClickCallback
=
[];
var
tabBar$1
=
{
var
tabBar$1
=
{
id
:
'
0
'
,
id
:
'
0
'
,
...
@@ -4895,7 +4976,12 @@ var serviceContext = (function () {
...
@@ -4895,7 +4976,12 @@ var serviceContext = (function () {
tabBar
=
requireNativePlugin
(
'
uni-tabview
'
);
tabBar
=
requireNativePlugin
(
'
uni-tabview
'
);
}
catch
(
error
)
{
}
catch
(
error
)
{
console
.
log
(
`uni.requireNativePlugin("uni-tabview") error
${
error
}
`
);
console
.
log
(
`uni.requireNativePlugin("uni-tabview") error
${
error
}
`
);
}
}
tabBar
.
onMaskClick
(()
=>
{
maskClickCallback
.
forEach
((
callback
)
=>
{
callback
();
});
});
tabBar
&&
tabBar
.
onClick
(({
index
})
=>
{
tabBar
&&
tabBar
.
onClick
(({
index
})
=>
{
clickCallback
(
config
.
list
[
index
],
index
);
clickCallback
(
config
.
list
[
index
],
index
);
});
});
...
@@ -4961,8 +5047,12 @@ var serviceContext = (function () {
...
@@ -4961,8 +5047,12 @@ var serviceContext = (function () {
color
:
mask
color
:
mask
});
});
},
},
addEventListener
(
name
,
callback
)
{
addEventListener
(
name
,
callback
)
{
tabBar
.
onMaskClick
(
callback
);
maskClickCallback
.
push
(
callback
);
},
removeEventListener
(
name
,
callback
)
{
let
callbackIndex
=
maskClickCallback
.
indexOf
(
callback
);
maskClickCallback
.
splice
(
callbackIndex
,
1
);
}
}
};
};
...
@@ -6243,7 +6333,7 @@ var serviceContext = (function () {
...
@@ -6243,7 +6333,7 @@ var serviceContext = (function () {
statusCode
:
0
,
statusCode
:
0
,
errMsg
:
'
timeout
'
errMsg
:
'
timeout
'
});
});
},
timeout
);
},
(
timeout
+
200
));
// TODO +200 发消息到原生层有时间开销,以后考虑由原生层回调超时
}
}
const
options
=
{
const
options
=
{
method
,
method
,
...
@@ -8919,6 +9009,7 @@ var serviceContext = (function () {
...
@@ -8919,6 +9009,7 @@ var serviceContext = (function () {
base64ToTempFilePath
:
base64ToTempFilePath
,
base64ToTempFilePath
:
base64ToTempFilePath
,
operateMapPlayer
:
operateMapPlayer$2
,
operateMapPlayer
:
operateMapPlayer$2
,
operateVideoPlayer
:
operateVideoPlayer$2
,
operateVideoPlayer
:
operateVideoPlayer$2
,
createLivePusherContext
:
createLivePusherContext$1
,
enableAccelerometer
:
enableAccelerometer
,
enableAccelerometer
:
enableAccelerometer
,
addPhoneContact
:
addPhoneContact
,
addPhoneContact
:
addPhoneContact
,
openBluetoothAdapter
:
openBluetoothAdapter
,
openBluetoothAdapter
:
openBluetoothAdapter
,
...
@@ -12228,19 +12319,27 @@ var serviceContext = (function () {
...
@@ -12228,19 +12319,27 @@ var serviceContext = (function () {
}
}
function
initEntryPage
()
{
function
initEntryPage
()
{
const
argsJsonStr
=
plus
.
runtime
.
arguments
;
if
(
!
argsJsonStr
)
{
return
}
let
entryPagePath
;
let
entryPagePath
;
let
entryPageQuery
;
let
entryPageQuery
;
try
{
const
weexPlus
=
weex
.
requireModule
(
'
plus
'
);
const
args
=
JSON
.
parse
(
argsJsonStr
);
entryPagePath
=
args
.
path
||
args
.
pathName
;
if
(
weexPlus
.
getRedirectInfo
)
{
entryPageQuery
=
(
args
.
query
?
(
'
?
'
+
args
.
query
)
:
''
);
const
info
=
weexPlus
.
getRedirectInfo
()
||
{};
}
catch
(
e
)
{}
entryPagePath
=
info
.
path
;
entryPageQuery
=
info
.
query
?
(
'
?
'
+
info
.
query
)
:
''
;
}
else
{
const
argsJsonStr
=
plus
.
runtime
.
arguments
;
if
(
!
argsJsonStr
)
{
return
}
try
{
const
args
=
JSON
.
parse
(
argsJsonStr
);
entryPagePath
=
args
.
path
||
args
.
pathName
;
entryPageQuery
=
args
.
query
?
(
'
?
'
+
args
.
query
)
:
''
;
}
catch
(
e
)
{}
}
if
(
!
entryPagePath
||
entryPagePath
===
__uniConfig
.
entryPagePath
)
{
if
(
!
entryPagePath
||
entryPagePath
===
__uniConfig
.
entryPagePath
)
{
return
return
}
}
...
@@ -12267,8 +12366,8 @@ var serviceContext = (function () {
...
@@ -12267,8 +12366,8 @@ var serviceContext = (function () {
if
(
process
.
env
.
NODE_ENV
!==
'
production
'
)
{
if
(
process
.
env
.
NODE_ENV
!==
'
production
'
)
{
console
.
log
(
`[uni-app] registerApp`
);
console
.
log
(
`[uni-app] registerApp`
);
}
}
appCtx
=
appVm
;
appCtx
=
appVm
;
appCtx
.
$vm
=
appVm
;
appCtx
.
$vm
=
appVm
;
Object
.
assign
(
appCtx
,
defaultApp
);
// 拷贝默认实现
Object
.
assign
(
appCtx
,
defaultApp
);
// 拷贝默认实现
...
@@ -13212,16 +13311,18 @@ var serviceContext = (function () {
...
@@ -13212,16 +13311,18 @@ var serviceContext = (function () {
Vue
.
prototype
.
$nextTick
=
function
nextTick
(
cb
)
{
Vue
.
prototype
.
$nextTick
=
function
nextTick
(
cb
)
{
const
renderWatcher
=
this
.
_watcher
;
const
renderWatcher
=
this
.
_watcher
;
const
callback
=
typeof
cb
===
'
function
'
;
if
(
if
(
renderWatcher
&&
renderWatcher
&&
this
.
_$queue
.
find
(
watcher
=>
renderWatcher
===
watcher
)
this
.
_$queue
.
find
(
watcher
=>
renderWatcher
===
watcher
)
)
{
)
{
vdSyncCallbacks
.
push
(
cb
.
bind
(
this
));
const
result
=
new
Promise
((
resolve
)
=>
{
vdSyncCallbacks
.
push
(
callback
?
cb
.
bind
(
this
)
:
resolve
);
});
return
callback
?
result
:
undefined
}
else
{
}
else
{
// $nextTick bind vm context
// $nextTick bind vm context
Vue
.
nextTick
(()
=>
{
return
Vue
.
nextTick
(
callback
?
()
=>
cb
.
call
(
this
)
:
undefined
)
cb
.
call
(
this
);
});
}
}
};
};
}
}
...
...
src/platforms/app-plus/service/framework/app.js
浏览文件 @
950695e1
...
@@ -141,19 +141,27 @@ function initTabBar () {
...
@@ -141,19 +141,27 @@ function initTabBar () {
}
}
function
initEntryPage
()
{
function
initEntryPage
()
{
const
argsJsonStr
=
plus
.
runtime
.
arguments
if
(
!
argsJsonStr
)
{
return
}
let
entryPagePath
let
entryPagePath
let
entryPageQuery
let
entryPageQuery
try
{
const
weexPlus
=
weex
.
requireModule
(
'
plus
'
)
const
args
=
JSON
.
parse
(
argsJsonStr
)
entryPagePath
=
args
.
path
||
args
.
pathName
if
(
weexPlus
.
getRedirectInfo
)
{
entryPageQuery
=
(
args
.
query
?
(
'
?
'
+
args
.
query
)
:
''
)
const
info
=
weexPlus
.
getRedirectInfo
()
||
{}
}
catch
(
e
)
{}
entryPagePath
=
info
.
path
entryPageQuery
=
info
.
query
?
(
'
?
'
+
info
.
query
)
:
''
}
else
{
const
argsJsonStr
=
plus
.
runtime
.
arguments
if
(
!
argsJsonStr
)
{
return
}
try
{
const
args
=
JSON
.
parse
(
argsJsonStr
)
entryPagePath
=
args
.
path
||
args
.
pathName
entryPageQuery
=
args
.
query
?
(
'
?
'
+
args
.
query
)
:
''
}
catch
(
e
)
{}
}
if
(
!
entryPagePath
||
entryPagePath
===
__uniConfig
.
entryPagePath
)
{
if
(
!
entryPagePath
||
entryPagePath
===
__uniConfig
.
entryPagePath
)
{
return
return
}
}
...
@@ -180,8 +188,8 @@ export function registerApp (appVm) {
...
@@ -180,8 +188,8 @@ export function registerApp (appVm) {
if
(
process
.
env
.
NODE_ENV
!==
'
production
'
)
{
if
(
process
.
env
.
NODE_ENV
!==
'
production
'
)
{
console
.
log
(
`[uni-app] registerApp`
)
console
.
log
(
`[uni-app] registerApp`
)
}
}
appCtx
=
appVm
appCtx
=
appVm
appCtx
.
$vm
=
appVm
appCtx
.
$vm
=
appVm
Object
.
assign
(
appCtx
,
defaultApp
)
// 拷贝默认实现
Object
.
assign
(
appCtx
,
defaultApp
)
// 拷贝默认实现
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录