Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qianlong66
uni-app
提交
a4c64908
U
uni-app
项目概览
qianlong66
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
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,发现更多精彩内容 >>
提交
a4c64908
编写于
8月 16, 2021
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(h5): getSystemInfo deviceId
上级
171690ab
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
40 addition
and
4 deletion
+40
-4
packages/uni-h5/dist/uni-h5.es.js
packages/uni-h5/dist/uni-h5.es.js
+19
-2
packages/uni-h5/src/helpers/uuid.ts
packages/uni-h5/src/helpers/uuid.ts
+14
-0
packages/uni-h5/src/service/api/device/getSystemInfoSync.ts
packages/uni-h5/src/service/api/device/getSystemInfoSync.ts
+7
-2
未找到文件。
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @
a4c64908
...
...
@@ -15412,6 +15412,20 @@ const makePhoneCall = /* @__PURE__ */ defineAsyncApi(API_MAKE_PHONE_CALL, ({ pho
window.location.href = `tel:${phoneNumber}`;
return resolve();
}, MakePhoneCallProtocol);
const UUID_KEY = "__DC_STAT_UUID";
const storage = window.localStorage || window.sessionStorage || {};
let deviceId;
function deviceId$1() {
deviceId = deviceId || storage[UUID_KEY];
if (!deviceId) {
deviceId = Date.now() + "" + Math.floor(Math.random() * 1e7);
try {
storage[UUID_KEY] = deviceId;
} catch (error) {
}
}
return deviceId;
}
const getSystemInfoSync = /* @__PURE__ */ defineSyncApi("getSystemInfoSync", () => {
const pixelRatio2 = window.devicePixelRatio;
const screenFix = getScreenFix();
...
...
@@ -15424,7 +15438,7 @@ const getSystemInfoSync = /* @__PURE__ */ defineSyncApi("getSystemInfoSync", ()
const statusBarHeight = out.top;
let osname;
let osversion;
let model;
let model
= ""
;
if (isIOS$1) {
osname = "iOS";
const osversionFind = ua.match(/OS\s([\w_]+)\slike/);
...
...
@@ -15563,7 +15577,10 @@ const getSystemInfoSync = /* @__PURE__ */ defineSyncApi("getSystemInfoSync", ()
right: out.right,
bottom: out.bottom,
left: out.left
}
},
version: "",
SDKVersion: "",
deviceId: deviceId$1()
};
});
const getSystemInfo = /* @__PURE__ */ defineAsyncApi("getSystemInfo", (_args, { resolve }) => {
...
...
packages/uni-h5/src/helpers/uuid.ts
0 → 100644
浏览文件 @
a4c64908
const
UUID_KEY
=
'
__DC_STAT_UUID
'
const
storage
=
window
.
localStorage
||
window
.
sessionStorage
||
{}
let
deviceId
:
string
export
default
function
()
{
deviceId
=
deviceId
||
storage
[
UUID_KEY
]
if
(
!
deviceId
)
{
deviceId
=
Date
.
now
()
+
''
+
Math
.
floor
(
Math
.
random
()
*
1
e7
)
try
{
storage
[
UUID_KEY
]
=
deviceId
}
catch
(
error
)
{}
}
return
deviceId
}
packages/uni-h5/src/service/api/device/getSystemInfoSync.ts
浏览文件 @
a4c64908
...
...
@@ -19,6 +19,8 @@ import {
getScreenHeight
,
}
from
'
../base/getBaseSystemInfo
'
import
deviceId
from
'
../../../helpers/uuid
'
/**
* 获取系统信息-同步
*/
...
...
@@ -44,7 +46,7 @@ export const getSystemInfoSync = defineSyncApi<typeof uni.getSystemInfoSync>(
const
statusBarHeight
=
safeAreaInsets
.
top
let
osname
let
osversion
let
model
let
model
=
''
if
(
isIOS
)
{
osname
=
'
iOS
'
...
...
@@ -200,6 +202,9 @@ export const getSystemInfoSync = defineSyncApi<typeof uni.getSystemInfoSync>(
bottom
:
safeAreaInsets
.
bottom
,
left
:
safeAreaInsets
.
left
,
},
}
as
UniApp
.
GetSystemInfoResult
version
:
''
,
SDKVersion
:
''
,
deviceId
:
deviceId
(),
}
}
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录