@fonixtree/magic-design 0.1.75 → 0.1.77
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/es/utils/androidUtil.js
CHANGED
|
@@ -21,7 +21,8 @@ var browserVersion = function browserVersion() {
|
|
|
21
21
|
webApp: u.indexOf('Safari') == -1,
|
|
22
22
|
weixin: u.indexOf('MicroMessenger') > -1,
|
|
23
23
|
qq: u.match(/\sQQ/i) == ' qq',
|
|
24
|
-
isApp: u.indexOf('app/CYLON-APP') > -1
|
|
24
|
+
isApp: u.indexOf('app/CYLON-APP') > -1,
|
|
25
|
+
isAshitaApp: u.indexOf('app/ASHITA-APP') > -1
|
|
25
26
|
};
|
|
26
27
|
};
|
|
27
28
|
|
package/es/utils/commonUtil.js
CHANGED
|
@@ -749,7 +749,7 @@ var convertToRem = function convertToRem(value) {
|
|
|
749
749
|
}
|
|
750
750
|
|
|
751
751
|
var baseFont = ensure(function () {
|
|
752
|
-
return window.getComputedStyle(document.getElementsByTagName('html')[0]).fontSize.replace('px');
|
|
752
|
+
return window.getComputedStyle(document.getElementsByTagName('html')[0]).fontSize.replace('px', '');
|
|
753
753
|
}, 50);
|
|
754
754
|
var pxValue = parseFloat(value);
|
|
755
755
|
var remValue = pxValue / baseFont; // 假设1rem = 50px
|
package/es/utils/coreUtil.js
CHANGED
|
@@ -304,7 +304,7 @@ var clickUrl = function clickUrl(url) {
|
|
|
304
304
|
var _b = data.params,
|
|
305
305
|
params = _b === void 0 ? {} : _b;
|
|
306
306
|
|
|
307
|
-
if ((0, _androidUtil.browserVersion)().
|
|
307
|
+
if ((0, _androidUtil.browserVersion)().isAshitaApp) {
|
|
308
308
|
(0, _androidUtil.sendToApp)(data);
|
|
309
309
|
} else {
|
|
310
310
|
// 视频
|
package/lib/utils/androidUtil.js
CHANGED
|
@@ -21,7 +21,8 @@ var browserVersion = function browserVersion() {
|
|
|
21
21
|
webApp: u.indexOf('Safari') == -1,
|
|
22
22
|
weixin: u.indexOf('MicroMessenger') > -1,
|
|
23
23
|
qq: u.match(/\sQQ/i) == ' qq',
|
|
24
|
-
isApp: u.indexOf('app/CYLON-APP') > -1
|
|
24
|
+
isApp: u.indexOf('app/CYLON-APP') > -1,
|
|
25
|
+
isAshitaApp: u.indexOf('app/ASHITA-APP') > -1
|
|
25
26
|
};
|
|
26
27
|
};
|
|
27
28
|
|
package/lib/utils/commonUtil.js
CHANGED
|
@@ -749,7 +749,7 @@ var convertToRem = function convertToRem(value) {
|
|
|
749
749
|
}
|
|
750
750
|
|
|
751
751
|
var baseFont = ensure(function () {
|
|
752
|
-
return window.getComputedStyle(document.getElementsByTagName('html')[0]).fontSize.replace('px');
|
|
752
|
+
return window.getComputedStyle(document.getElementsByTagName('html')[0]).fontSize.replace('px', '');
|
|
753
753
|
}, 50);
|
|
754
754
|
var pxValue = parseFloat(value);
|
|
755
755
|
var remValue = pxValue / baseFont; // 假设1rem = 50px
|
package/lib/utils/coreUtil.js
CHANGED
|
@@ -304,7 +304,7 @@ var clickUrl = function clickUrl(url) {
|
|
|
304
304
|
var _b = data.params,
|
|
305
305
|
params = _b === void 0 ? {} : _b;
|
|
306
306
|
|
|
307
|
-
if ((0, _androidUtil.browserVersion)().
|
|
307
|
+
if ((0, _androidUtil.browserVersion)().isAshitaApp) {
|
|
308
308
|
(0, _androidUtil.sendToApp)(data);
|
|
309
309
|
} else {
|
|
310
310
|
// 视频
|