@fonixtree/magic-design 1.0.124 → 1.0.125

package/es/utils/androidUtil.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.sendToJs = exports.sendToIos = exports.sendToApp = exports.sendToAndroid = exports.iosSendToJs = exports.goToLoginApp = exports.connectWebViewJavascriptBridge = exports.browserVersion = void 0;
 
+var _commonUtil = require("./commonUtil");
+
 // 判断访问终端
 var browserVersion = function browserVersion() {
   var u = navigator.userAgent;
@@ -139,9 +141,15 @@ exports.sendToApp = sendToApp;
 
 var goToLoginApp = function goToLoginApp() {
   if (browserVersion().ditoAndroidApp) {
-    window.dito.goToLogin();
+    var deviceInfo = JSON.parse(window.dito.ocSetDeviceInfo());
+
+    if ((0, _commonUtil.compareVersion)(deviceInfo.AppVersion, '2.11.22') < 0) {
+      window.dito.goToLogin();
+    } else {
+      window.dito.goToLogin('');
+    }
   } else if (browserVersion().ditoIosApp) {
-    window.dito.goToLogin();
+    window.dito.goToLogin(window.location.href);
   }
 };
 

package/es/utils/commonUtil.js

@@ -7,7 +7,7 @@ exports.addZero = exports.addUrlQuery = void 0;
 exports.asyncDataURLtoImage = asyncDataURLtoImage;
 exports.checkLogin = exports.checkFileName = exports.calcLastTime = exports.asyncNextTick = void 0;
 exports.commonFetch = commonFetch;
-exports.convertCount = exports.compatibleNewPageData = void 0;
+exports.convertCount = exports.compatibleNewPageData = exports.compareVersion = void 0;
 exports.convertImageUrl = convertImageUrl;
 exports.convertToRem = void 0;
 exports.copy2ClipBoard = copy2ClipBoard;
@@ -546,9 +546,31 @@ function convertImageUrl(imageObj, type) {
     return encodeURI(imageObj[typeMap] || imageObj.url);
   }, '');
 }
+
+var compareVersion = function compareVersion(v1, v2) {
+  // 将两个版本号拆成数组
+  var arr1 = v1.split('.');
+  var arr2 = v2.split('.');
+  var minLength = Math.min(arr1.length, arr2.length); // 依次比较版本号每一位大小
+
+  for (var i = 0; i < minLength; i += 1) {
+    if (parseInt(arr1[i], 10) !== parseInt(arr2[i], 10)) {
+      return parseInt(arr1[i], 10) > parseInt(arr2[i], 10) ? 1 : -1;
+    }
+  } // 若前几位分隔相同，则按分隔数比较。
+
+
+  if (arr1.length === arr2.length) {
+    return 0;
+  }
+
+  return arr1.length > arr2.length ? 1 : -1;
+};
 /** 序列化 style对象 */
 
 
+exports.compareVersion = compareVersion;
+
 var styleStringify = function styleStringify(style, _a) {
   var _b = (_a === void 0 ? {} : _a).suffix,
       suffix = _b === void 0 ? 'px' : _b;

package/lib/utils/androidUtil.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.sendToJs = exports.sendToIos = exports.sendToApp = exports.sendToAndroid = exports.iosSendToJs = exports.goToLoginApp = exports.connectWebViewJavascriptBridge = exports.browserVersion = void 0;
 
+var _commonUtil = require("./commonUtil");
+
 // 判断访问终端
 var browserVersion = function browserVersion() {
   var u = navigator.userAgent;
@@ -139,9 +141,15 @@ exports.sendToApp = sendToApp;
 
 var goToLoginApp = function goToLoginApp() {
   if (browserVersion().ditoAndroidApp) {
-    window.dito.goToLogin();
+    var deviceInfo = JSON.parse(window.dito.ocSetDeviceInfo());
+
+    if ((0, _commonUtil.compareVersion)(deviceInfo.AppVersion, '2.11.22') < 0) {
+      window.dito.goToLogin();
+    } else {
+      window.dito.goToLogin('');
+    }
   } else if (browserVersion().ditoIosApp) {
-    window.dito.goToLogin();
+    window.dito.goToLogin(window.location.href);
   }
 };
 

package/lib/utils/commonUtil.js

@@ -7,7 +7,7 @@ exports.addZero = exports.addUrlQuery = void 0;
 exports.asyncDataURLtoImage = asyncDataURLtoImage;
 exports.checkLogin = exports.checkFileName = exports.calcLastTime = exports.asyncNextTick = void 0;
 exports.commonFetch = commonFetch;
-exports.convertCount = exports.compatibleNewPageData = void 0;
+exports.convertCount = exports.compatibleNewPageData = exports.compareVersion = void 0;
 exports.convertImageUrl = convertImageUrl;
 exports.convertToRem = void 0;
 exports.copy2ClipBoard = copy2ClipBoard;
@@ -546,9 +546,31 @@ function convertImageUrl(imageObj, type) {
     return encodeURI(imageObj[typeMap] || imageObj.url);
   }, '');
 }
+
+var compareVersion = function compareVersion(v1, v2) {
+  // 将两个版本号拆成数组
+  var arr1 = v1.split('.');
+  var arr2 = v2.split('.');
+  var minLength = Math.min(arr1.length, arr2.length); // 依次比较版本号每一位大小
+
+  for (var i = 0; i < minLength; i += 1) {
+    if (parseInt(arr1[i], 10) !== parseInt(arr2[i], 10)) {
+      return parseInt(arr1[i], 10) > parseInt(arr2[i], 10) ? 1 : -1;
+    }
+  } // 若前几位分隔相同，则按分隔数比较。
+
+
+  if (arr1.length === arr2.length) {
+    return 0;
+  }
+
+  return arr1.length > arr2.length ? 1 : -1;
+};
 /** 序列化 style对象 */
 
 
+exports.compareVersion = compareVersion;
+
 var styleStringify = function styleStringify(style, _a) {
   var _b = (_a === void 0 ? {} : _a).suffix,
       suffix = _b === void 0 ? 'px' : _b;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "1.0.124",
+  "version": "1.0.125",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",