Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wkj001
uni-app
提交
f464c78c
U
uni-app
项目概览
wkj001
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f464c78c
编写于
9月 12, 2019
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: App 端 websocket 支持 arraybuffer,支持创建多个连接
上级
1b29984b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
55 addition
and
26 deletion
+55
-26
src/platforms/app-plus/service/api/network/socket.js
src/platforms/app-plus/service/api/network/socket.js
+48
-24
src/platforms/app-plus/service/bridge.js
src/platforms/app-plus/service/bridge.js
+7
-2
未找到文件。
src/platforms/app-plus/service/api/network/socket.js
浏览文件 @
f464c78c
import
{
unpack
,
publish
,
requireNativePlugin
requireNativePlugin
,
base64ToArrayBuffer
,
arrayBufferToBase64
}
from
'
../../bridge
'
let
socketTaskId
=
0
const
socketTasks
=
{}
const
publishStateChange
=
(
res
)
=>
{
publish
(
'
onSocketTaskStateChange
'
,
res
)
}
const
createSocketTaskById
=
function
(
socketTaskId
,
{
url
,
data
,
header
,
method
,
protocols
}
=
{})
{
// fixed by hxy 需要测试是否支持 arraybuffer
const
socket
=
requireNativePlugin
(
'
webSocket
'
)
socket
.
WebSocket
(
url
,
Array
.
isArray
(
protocols
)
?
protocols
.
join
(
'
,
'
)
:
protocols
)
// socket.binaryType = 'arraybuffer'
socketTasks
[
socketTaskId
]
=
socket
let
socket
function
getSocket
()
{
if
(
socket
)
{
return
socket
}
socket
=
requireNativePlugin
(
'
uni-webSocket
'
)
socket
.
onopen
(
function
(
e
)
{
publishStateChange
({
socketTaskId
,
socketTaskId
:
e
.
id
,
state
:
'
open
'
})
})
socket
.
onmessage
(
function
(
e
)
{
const
data
=
e
.
data
publishStateChange
({
socketTaskId
,
socketTaskId
:
e
.
id
,
state
:
'
message
'
,
data
:
e
.
data
data
:
typeof
data
===
'
object
'
?
base64ToArrayBuffer
(
data
.
base64
)
:
data
})
})
socket
.
onerror
(
function
(
e
)
{
publishStateChange
({
socketTaskId
,
socketTaskId
:
e
.
id
,
state
:
'
error
'
,
errMsg
:
e
.
message
errMsg
:
e
.
data
})
})
socket
.
onclose
(
function
(
e
)
{
const
socketTaskId
=
e
.
id
delete
socketTasks
[
socketTaskId
]
publishStateChange
({
socketTaskId
,
state
:
'
close
'
})
})
return
socket
}
const
createSocketTaskById
=
function
(
socketTaskId
,
{
url
,
data
,
header
,
method
,
protocols
}
=
{})
{
const
socket
=
getSocket
()
socket
.
WebSocket
({
id
:
socketTaskId
,
url
,
protocol
:
Array
.
isArray
(
protocols
)
?
protocols
.
join
(
'
,
'
)
:
protocols
})
socketTasks
[
socketTaskId
]
=
socket
return
{
socketTaskId
,
errMsg
:
'
createSocketTask:ok
'
...
...
@@ -58,13 +71,14 @@ const createSocketTaskById = function (socketTaskId, {
}
export
function
createSocketTask
(
args
)
{
return
createSocketTaskById
(
++
socketTaskId
,
args
)
return
createSocketTaskById
(
String
(
Date
.
now
())
,
args
)
}
export
function
operateSocketTask
(
args
)
{
const
{
operationType
,
code
,
reason
,
data
,
socketTaskId
}
=
unpack
(
args
)
...
...
@@ -77,13 +91,23 @@ export function operateSocketTask (args) {
switch
(
operationType
)
{
case
'
send
'
:
if
(
data
)
{
socket
.
send
(
data
)
socket
.
send
({
id
:
socketTaskId
,
data
:
typeof
data
===
'
object
'
?
{
'
@type
'
:
'
binary
'
,
base64
:
arrayBufferToBase64
(
data
)
}
:
data
})
}
return
{
errMsg
:
'
operateSocketTask:ok
'
}
case
'
close
'
:
socket
.
close
(
code
)
socket
.
close
({
id
:
socketTaskId
,
code
,
reason
})
delete
socketTasks
[
socketTaskId
]
return
{
errMsg
:
'
operateSocketTask:ok
'
...
...
@@ -92,4 +116,4 @@ export function operateSocketTask (args) {
return
{
errMsg
:
'
operateSocketTask:fail
'
}
}
}
src/platforms/app-plus/service/bridge.js
浏览文件 @
f464c78c
import
{
decode
decode
,
encode
}
from
'
base64-arraybuffer
'
export
{
...
...
@@ -56,7 +57,7 @@ export function isTabBarPage (path = '') {
return
false
}
return
page
.
$page
.
meta
.
isTabBar
}
}
const
route
=
__uniRoutes
.
find
(
route
=>
route
.
path
.
slice
(
1
)
===
path
)
return
route
&&
route
.
meta
.
isTabBar
}
catch
(
e
)
{
...
...
@@ -70,3 +71,7 @@ export function isTabBarPage (path = '') {
export
function
base64ToArrayBuffer
(
data
)
{
return
decode
(
data
)
}
export
function
arrayBufferToBase64
(
data
)
{
return
encode
(
data
)
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录