Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小浣熊撸代码
uni-app
提交
726b8024
U
uni-app
项目概览
小浣熊撸代码
/
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,发现更多精彩内容 >>
提交
726b8024
编写于
10月 19, 2022
作者:
DCloud-WZF
💬
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(location update): 修复回调及监听事件触发错误并调整默认坐标系为gcj02
上级
0043093b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
60 addition
and
54 deletion
+60
-54
packages/uni-api/src/protocols/location/locationChange.ts
packages/uni-api/src/protocols/location/locationChange.ts
+1
-1
packages/uni-app-plus/src/service/api/location/locationChange.ts
...s/uni-app-plus/src/service/api/location/locationChange.ts
+25
-29
packages/uni-h5/src/service/api/location/locationChange.ts
packages/uni-h5/src/service/api/location/locationChange.ts
+34
-24
未找到文件。
packages/uni-api/src/protocols/location/locationChange.ts
浏览文件 @
726b8024
...
...
@@ -25,7 +25,7 @@ export const StartLocationUpdateOptions: ApiOptions<API_TYPE_START_LOCATION_UPDA
type
(
value
,
params
)
{
value
=
(
value
||
''
).
toLowerCase
()
if
(
coordTypes
.
indexOf
(
value
)
===
-
1
)
{
params
.
type
=
coordTypes
[
0
]
params
.
type
=
coordTypes
[
1
]
}
else
{
params
.
type
=
value
}
...
...
packages/uni-app-plus/src/service/api/location/locationChange.ts
浏览文件 @
726b8024
...
...
@@ -18,66 +18,62 @@ import {
API_ON_LOCATION_CHANGE_ERROR
,
}
from
'
@dcloudio/uni-api
'
let
started
=
false
let
watchId
:
number
=
0
/**
* 开始更新定位
*/
export
const
startLocationUpdate
=
defineAsyncApi
<
API_TYPE_START_LOCATION_UPDATE
>
(
API_START_LOCATION_UPDATE
,
(
_
,
{
resolve
,
reject
})
=>
{
if
(
plus
.
geolocation
&&
watchId
===
0
)
{
watchId
=
plus
.
geolocation
.
watchPosition
(
(
options
,
{
resolve
,
reject
})
=>
{
watchId
=
watchId
||
plus
.
geolocation
.
watchPosition
(
(
res
)
=>
{
started
=
true
UniServiceJSBridge
.
invokeOnCallback
(
API_ON_LOCATION_CHANGE
,
res
.
coords
)
resolve
()
},
(
error
)
=>
{
reject
(
error
.
message
)
if
(
!
started
)
{
reject
(
error
.
message
)
started
=
true
}
UniServiceJSBridge
.
invokeOnCallback
(
API_ON_LOCATION_CHANGE_ERROR
,
{
errMsg
:
`onLocationChange:fail
${
error
.
message
}
`
,
})
},
{
coordsType
:
_
?.
type
,
coordsType
:
options
?.
type
,
}
)
}
else
{
UniServiceJSBridge
.
invokeOnCallback
(
API_ON_LOCATION_CHANGE_ERROR
,
'
onLocationChange:fail
'
)
}
resolve
()
setTimeout
(
resolve
,
100
)
},
StartLocationUpdateProtocol
,
StartLocationUpdateOptions
)
export
const
onLocationChange
=
defineOnApi
<
API_TYPE_ON_LOCATION_CHANGE
>
(
API_ON_LOCATION_CHANGE
,
()
=>
{}
)
export
const
stopLocationUpdate
=
defineAsyncApi
<
API_TYPE_STOP_LOCATION_UPDATE
>
(
API_STOP_LOCATION_UPDATE
,
(
_
,
{
resolve
,
reject
})
=>
{
(
_
,
{
resolve
})
=>
{
if
(
watchId
)
{
plus
.
geolocation
.
clearWatch
(
watchId
)
started
=
false
watchId
=
0
resolve
()
}
else
{
reject
(
'
stopLocationUpdate:fail
'
)
}
resolve
()
}
)
export
const
onLocationChange
=
defineOnApi
<
API_TYPE_ON_LOCATION_CHANGE
>
(
API_ON_LOCATION_CHANGE
,
()
=>
{}
)
export
const
offLocationChange
=
defineOffApi
<
API_TYPE_OFF_LOCATION_CHANGE
>
(
API_OFF_LOCATION_CHANGE
,
()
=>
{
stopLocationUpdate
()
}
()
=>
{}
)
export
const
onLocationChangeError
=
...
...
@@ -87,7 +83,7 @@ export const onLocationChangeError =
)
export
const
offLocationChangeError
=
defineO
n
Api
<
API_TYPE_OFF_LOCATION_CHANGE_ERROR
>
(
defineO
ff
Api
<
API_TYPE_OFF_LOCATION_CHANGE_ERROR
>
(
API_OFF_LOCATION_CHANGE_ERROR
,
()
=>
{}
)
packages/uni-h5/src/service/api/location/locationChange.ts
浏览文件 @
726b8024
...
...
@@ -19,19 +19,24 @@ import {
}
from
'
@dcloudio/uni-api
'
import
{
translateGeo
}
from
'
../../../helpers/location
'
let
started
=
false
let
watchId
:
number
=
0
/**
* 开始更新定位
*/
export
const
startLocationUpdate
=
defineAsyncApi
<
API_TYPE_START_LOCATION_UPDATE
>
(
API_START_LOCATION_UPDATE
,
(
_
,
{
resolve
,
reject
})
=>
{
if
(
navigator
.
geolocation
&&
watchId
===
0
)
{
watchId
=
navigator
.
geolocation
.
watchPosition
(
(
options
,
{
resolve
,
reject
})
=>
{
if
(
!
navigator
.
geolocation
)
{
reject
()
return
}
watchId
=
watchId
||
navigator
.
geolocation
.
watchPosition
(
(
res
)
=>
{
translateGeo
(
_
?.
type
,
res
.
coords
)
started
=
true
translateGeo
(
options
?.
type
,
res
.
coords
)
.
then
((
coords
)
=>
{
UniServiceJSBridge
.
invokeOnCallback
(
API_ON_LOCATION_CHANGE
,
...
...
@@ -40,43 +45,48 @@ export const startLocationUpdate =
resolve
()
})
.
catch
((
error
)
=>
{
reject
(
error
.
message
)
UniServiceJSBridge
.
invokeOnCallback
(
API_ON_LOCATION_CHANGE_ERROR
,
{
errMsg
:
`onLocationChange:fail
${
error
.
message
}
`
}
)
})
},
(
error
)
=>
{
reject
(
error
.
message
)
if
(
!
started
)
{
reject
(
error
.
message
)
started
=
true
}
UniServiceJSBridge
.
invokeOnCallback
(
API_ON_LOCATION_CHANGE_ERROR
,
{
errMsg
:
`onLocationChange:fail
${
error
.
message
}
`
,
})
}
)
}
resolve
()
setTimeout
(
resolve
,
100
)
},
StartLocationUpdateProtocol
,
StartLocationUpdateOptions
)
export
const
onLocationChange
=
defineOnApi
<
API_TYPE_ON_LOCATION_CHANGE
>
(
API_ON_LOCATION_CHANGE
,
()
=>
{}
)
export
const
stopLocationUpdate
=
defineAsyncApi
<
API_TYPE_STOP_LOCATION_UPDATE
>
(
API_STOP_LOCATION_UPDATE
,
(
_
,
{
resolve
,
reject
})
=>
{
(
_
,
{
resolve
})
=>
{
if
(
watchId
)
{
navigator
.
geolocation
.
clearWatch
(
watchId
)
started
=
false
watchId
=
0
resolve
()
}
else
{
reject
(
'
stopLocationUpdate:fail
'
)
}
resolve
()
}
)
export
const
onLocationChange
=
defineOnApi
<
API_TYPE_ON_LOCATION_CHANGE
>
(
API_ON_LOCATION_CHANGE
,
()
=>
{}
)
export
const
offLocationChange
=
defineOffApi
<
API_TYPE_OFF_LOCATION_CHANGE
>
(
API_OFF_LOCATION_CHANGE
,
()
=>
{
stopLocationUpdate
()
}
()
=>
{}
)
export
const
onLocationChangeError
=
...
...
@@ -86,7 +96,7 @@ export const onLocationChangeError =
)
export
const
offLocationChangeError
=
defineO
n
Api
<
API_TYPE_OFF_LOCATION_CHANGE_ERROR
>
(
defineO
ff
Api
<
API_TYPE_OFF_LOCATION_CHANGE_ERROR
>
(
API_OFF_LOCATION_CHANGE_ERROR
,
()
=>
{}
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录