p90524618
/
antv-l7
mirror of https://gitee.com/antv-l7/antv-l7
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/antvis/L7

This commit is contained in:
2912401452 2022-02-16 14:47:06 +08:00
parent 33300e0c8a 073794a586
commit d62ec8e248
6 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/package.json
View File

@ -32,7 +32,7 @@
"gl-matrix": "^3.1.0", "gl-matrix": "^3.1.0",
"inversify": "^5.0.1", "inversify": "^5.0.1",
"inversify-inject-decorators": "^3.1.0", "inversify-inject-decorators": "^3.1.0",
"l7-tiny-sdf": "^0.0.2", "l7-tiny-sdf": "^0.0.3",
"l7hammerjs": "^0.0.6", "l7hammerjs": "^0.0.6",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",

2
packages/renderer/package.json
View File

@ -29,7 +29,7 @@
"@antv/l7-core": "^2.7.13", "@antv/l7-core": "^2.7.13",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"inversify": "^5.0.1", "inversify": "^5.0.1",
"l7regl": "^0.0.16", "l7regl": "^0.0.17",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"reflect-metadata": "^0.1.13" "reflect-metadata": "^0.1.13"
}, },

7
packages/utils/src/mini-adapter/devicePixelRatio.ts
View File

@ -1,8 +1,11 @@
// @ts-nocheck // @ts-nocheck 判断时候是支付宝小程序环境 （ my.isFRM == true smallfish H5+ ）
import { globalWindow } from './global'; import { globalWindow } from './global';
export const isMiniAli = export const isMiniAli =
// @ts-ignore // @ts-ignore
typeof my !== 'undefined' && !!my && typeof my.showToast === 'function'; typeof my !== 'undefined' &&
!!my &&
typeof my.showToast === 'function' &&
my.isFRM !== true;
export default !isMiniAli export default !isMiniAli
? globalWindow.devicePixelRatio ? globalWindow.devicePixelRatio
: (my.getSystemInfoSync().pixelRatio as number); : (my.getSystemInfoSync().pixelRatio as number);

4
packages/utils/src/mini-adapter/index.ts
View File

@ -29,10 +29,10 @@ import { $XMLHttpRequest as $XMLHttpRequest2 } from './XMLHttpRequest';
import { globalWindow } from './global' import { globalWindow } from './global'
// 判断时候是支付宝小程序环境 // 判断时候是支付宝小程序环境 （ my.isFRM == true smallfish H5+ ）
export const isMiniAli = export const isMiniAli =
// @ts-ignore // @ts-ignore
typeof my !== 'undefined' && !!my && typeof my.showToast === 'function'; typeof my !== 'undefined' && !!my && typeof my.showToast === 'function' && my.isFRM !== true;
export const isWeChatMiniProgram = typeof wx !== 'undefined' && wx !== null && (typeof wx.request !== 'undefined' || typeof wx.miniProgram !== 'undefined'); export const isWeChatMiniProgram = typeof wx !== 'undefined' && wx !== null && (typeof wx.request !== 'undefined' || typeof wx.miniProgram !== 'undefined');

7
packages/utils/src/mini-adapter/navigator.ts
View File

@ -1,8 +1,11 @@
// @ts-nocheck // @ts-nocheck 判断时候是支付宝小程序环境 （ my.isFRM == true smallfish H5+ ）
import { globalWindow } from './global'; import { globalWindow } from './global';
export const isMiniAli = export const isMiniAli =
// @ts-ignore // @ts-ignore
typeof my !== 'undefined' && !!my && typeof my.showToast === 'function'; typeof my !== 'undefined' &&
!!my &&
typeof my.showToast === 'function' &&
my.isFRM !== true;
let system; let system;
let platform; let platform;
let language; let language;

7
packages/utils/src/mini-adapter/screen.ts
View File

@ -1,9 +1,12 @@
// @ts-nocheck // @ts-nocheck 判断时候是支付宝小程序环境 （ my.isFRM == true smallfish H5+ ）
import { globalWindow } from './global'; import { globalWindow } from './global';
// 判断时候是支付宝小程序环境 // 判断时候是支付宝小程序环境
export const isMiniAli = export const isMiniAli =
// @ts-ignore // @ts-ignore
typeof my !== 'undefined' && !!my && typeof my.showToast === 'function'; typeof my !== 'undefined' &&
!!my &&
typeof my.showToast === 'function' &&
my.isFRM !== true;
let screenWidth; let screenWidth;
let screenHeight; let screenHeight;
let windowWidth; let windowWidth;