mix-public 1.1.0 → 1.1.2

package/README.md

@@ -15,10 +15,8 @@
     // pnpm
     pnpm i mix-public
   ```
-### 调用方式
-  
+### 初始化方式
   ```javascript
-
     // 布局使用(入口文件)
     import mixRender from "mix-public"
 
@@ -32,7 +30,7 @@
     import 'mix-public/mixRender.css'; // 引入web端app基础样式
     mixPublicLib // 为原生基础调用方法，可在页面使用
 
-    // 方法使用
+    // 单独方法使用
     import mixRender from "mix-public"
     const PublicLib = mixRender({
       mixJustMethod: true,
@@ -40,6 +38,34 @@
     });
   ```
 
+### 生命周期
+  ```javascript
+    // 页面加载时
+    OnloadPage((op)=>{
+      // op为页面参数，包含上一个页面参数
+    })
+
+    //页面退回
+    //immediate:是否立即执行
+    OnStartLoad(()=>{
+      // 添加当前方法，在页面退回时执行
+    },{immediate:false})
+  ```
+
+### 方法使用方式
+  ```javascript
+
+    // 调用类型
+    //1.直接调用类
+    mixPublicLib.putCookieInfo('key','value')
+    //2.同步返回类
+    const result = mixPublicLib. getCookieInfo('key')
+    //1.异步返回类
+    mixPublicLib.UploadPhoto({PhotoCount:1, isCut:true, Quality:1}).then(file=>{
+      console.log(file)
+    })
+  ```
+
   
 ### 更新记录
 - v1.0.0 项目初始化
@@ -52,4 +78,6 @@
 - v1.0.7 整体依赖调用方式调整/优化目录结构
 - v1.0.8 依赖引用调整
 - v1.0.9 依赖引用调整
-- v1.1.0 获取页面路径参数修复/扫码方法修复
+- v1.1.0 方法包调用方式整体调整
+- v1.1.1 添加OnloadPage生命周期/调整 goto 方法参数
+- v1.1.2 修复方法环境变量/添加 a 标签捕获自定义站内跳转

package/customMethod/cachPictureForWeb.js

@@ -0,0 +1,60 @@
+export default (op) => { 
+    var indexedDB =
+        window.indexedDB ||
+        window.mozIndexedDB ||
+        window.webkitIndexedDB ||
+        window.msIndexedDB
+    var dataBase = null
+    dataBase = indexedDB.open("MIXAPPCachePicture", 1)
+    dataBase.onupgradeneeded = function (e) {
+        var active = dataBase.result
+        var objectDb = active.createObjectStore("seasidecity", {
+        keyPath: "id",
+        })
+        objectDb.createIndex("index_base64", "base64", {
+        unique: false,
+        })
+    }
+    dataBase.onsuccess = function (e) {
+        var transaction = dataBase.result.transaction(["seasidecity"])
+        var objectStore = transaction.objectStore("seasidecity")
+        var request = objectStore.get(md5(op.Picurl))
+        request.onerror = function (event) {}
+        request.onsuccess = function (event) {
+        if (request.result) {
+            setTimeout(function () {
+            if (document.getElementById(op.Domid))
+                document.getElementById(op.Domid).src = request.result.base64
+            }, 300)
+        } else {
+            setTimeout(function () {
+            if (document.getElementById(op.Domid))
+                document.getElementById(op.Domid).src = op.Picurl
+            }, 300)
+            var img = document.createElement("img")
+            img.setAttribute("crossOrigin", "anonymous")
+            img.src = op.Picurl
+            img.onload = function () {
+            var canvas = document.createElement("canvas")
+            canvas.width = img.width
+            canvas.height = img.height
+            var ctx = canvas.getContext("2d")
+            ctx.drawImage(img, 0, 0, img.width, img.height)
+            var dataURL = canvas.toDataURL("image/png")
+
+            var active = dataBase.result
+            var data = active.transaction(["seasidecity"], "readwrite")
+            var objectDb = data.objectStore("seasidecity")
+            var request = objectDb.put({
+                id: md5(op.Picurl),
+                base64: dataURL,
+            })
+            request.onerror = function (e) {}
+
+            data.oncomplete = function (e) {}
+            }
+        }
+        }
+    }
+    dataBase.onerror = function (e) {}
+}

package/customMethod/formatColor.js

@@ -0,0 +1,14 @@
+export default (str)=>{
+    return str ? str.startsWith("#") ? str : "#" + str : ""
+}
+
+export const togglePageGrayscale = (enable = false) => {
+  const body = document.querySelector('body');
+  if (body) {
+    if (enable) {
+      body.classList.add('grayscale-mode');
+    } else {
+      body.classList.remove('grayscale-mode');
+    }
+  }
+};

package/customMethod/imageFormat.js

@@ -164,7 +164,9 @@ export async function formatImage(imgPath, formatConfig){
             })
         }else{
             compressImage(imgPath, formatConfig.Quality).then(blob=>{
-                resolve(new File([blob], "mix_app_image.png", { type: blob.type }))
+              resolve(new File([blob], "mix_app_image.png", { type: blob.type }))
+            }).catch(err=>{
+              reject(err)
             })
         }
     })

package/customMethod/pageParams.js

@@ -0,0 +1,12 @@
+/* 获取url上的query参数以对象的方式返回 */
+function getUrlQuery(url) {
+  const urlSearch = url.replace(/^[^?=]*\?/g, "")
+  const obj = {}
+  const searchURL = new URLSearchParams(urlSearch)
+  searchURL.forEach((value, key) => {
+    obj[key] = value
+  })
+  return obj
+}
+
+export { getUrlQuery }

package/customMethod/publicLogic.js

@@ -1,32 +1,57 @@
-export const returnMethod = (op) => {
-  var isWeb = op.isWeb || false;
-  var isAndroid = op.isAndroid || false;
-  var isIOS = op.isIOS || false;
+export function mixJsonParse(str) {
+  try {
+    return JSON.parse(str)
+  } catch (e) {
+    return str
+  }
+}
+export function mixJsonStringify(val) {
+  try {
+    return JSON.stringify(val)
+  } catch (e) {
+    return str
+  }
+}
+export function isPromise(obj) {
+    return obj && Object.prototype.toString.call(obj) === '[object Promise]';
+}
+export const asyncReturnMethod = (op) => {
+  var environment = {
+    isWeb:  op?.environment?.isWeb || false,
+    isHarmony:  op?.environment?.isHarmony || false,
+    isAndroid:  op?.environment?.isAndroid || false,
+    isIOS:  op?.environment?.isIOS || false
+  }
   var webMethod = op.webMethod || false;
+  var androidMethod = op.androidMethod || false;
+  var iosMethod = op.iosMethod || false;
   var callBackMethod = op.callBackMethod || false;
   var params = op.params || {};
   var methodName = op.methodName || "";
   var callBackMethodName = "MIX_APP_" + methodName
   params.MethodName = callBackMethodName
   callMethod({
-    isWeb,
-    isAndroid,
-    isIOS,
+    environment,
     methodName,
-    webMethod: ()=>{webMethod().then(data=>{window[callBackMethodName](data)})},
+    androidMethod: ()=>{androidMethod().then(data=>{window[callBackMethodName](data)}).catch(err=>{window[callBackMethodName](err)})},
+    iosMethod: ()=>{iosMethod().then(data=>{window[callBackMethodName](data)}).catch(err=>{window[callBackMethodName](err)})},
+    webMethod: ()=>{webMethod().then(data=>{window[callBackMethodName](data)}).catch(err=>{window[callBackMethodName](err)})},
     params
   })
   return new Promise((resolve, reject) => {
     window[callBackMethodName] = (data)=>{
-      callBackMethod && data ? callBackMethod(data,resolve) : resolve()
+      callBackMethod && data ? callBackMethod(data).then(formatData=>{resolve(formatData)}).catch(err=>{reject(err)}) : resolve(data)
     }
   });
 };
 export const callMethod = (op) => {
-  var isWeb = op.isWeb;
-  var isAndroid = op.isAndroid;
-  var isIOS = op.isIOS;
-  var webMethod = op.webMethod;
+  var isWeb = op?.environment?.isWeb || false;
+  var isHarmony = op?.environment?.isHarmony || false;
+  var isAndroid = op?.environment?.isAndroid || false;
+  var isIOS = op?.environment?.isIOS || false;
+  var webMethod = op.webMethod || false;
+  var androidMethod = op.androidMethod || false;
+  var iosMethod = op.iosMethod || false;
   var params = op.params || {};
   var methodName = op.methodName;
   for (var key in params) {
@@ -36,12 +61,80 @@ export const callMethod = (op) => {
   if (isWeb) {
     webMethod && webMethod();
   } else {
-    if (isAndroid) {
-      Func[methodName](JSON.stringify(row));
+    if (isAndroid || isHarmony) {
+      androidMethod ? androidMethod() : Func[methodName](mixJsonStringify(params));
     } else if (isIOS) {
-      window.webkit.messageHandlers[methodName].postMessage(
-        JSON.stringify(row)
+      iosMethod ? iosMethod() : window.webkit.messageHandlers[methodName].postMessage(
+        mixJsonStringify(params)
       );
     }
   }
 };
+export const syncReturnMethod = (op) => {
+  var isWeb = op?.environment?.isWeb || false;
+  var isHarmony = op?.environment?.isHarmony || false;
+  var isAndroid = op?.environment?.isAndroid || false;
+  var isIOS = op?.environment?.isIOS || false;
+  var webMethod = op.webMethod || false;
+  var asyncReturn = op.asyncReturn || false;
+  var androidMethod = op.androidMethod || false;
+  var iosMethod = op.iosMethod || false;
+  var params = op.params || {};
+  var methodName = op.methodName;
+  var singleField = op.singleField || false;
+  var singleParam = ""
+  for (var key in params) {
+    if (!Object.hasOwn(params, key)) continue;
+    params[key] = params[key].toString();
+    if(singleField){
+      singleParam = params[key];
+    }
+  }
+  var result = "";
+  if (isWeb) {
+    webMethod && (result = webMethod());
+  } else {
+    if (isAndroid || isHarmony) {
+      if(asyncReturn){
+        result = new Promise((resolve, reject) => {
+          try {
+            params.MethodName = "MIX_APP_" + methodName
+            window["MIX_APP_" + methodName] = (data)=>{
+              resolve(data)
+            }
+            androidMethod ? resolve(androidMethod()) : Func[methodName](mixJsonStringify(params))
+          } catch (error) {
+            reject(error)
+          }
+        })
+      }else{
+        result = androidMethod ? androidMethod() : Func[methodName](mixJsonStringify(params));
+      }
+    } else if (isIOS) {
+      if(asyncReturn){
+        result = new Promise((resolve, reject) => {
+          try {
+            params.MethodName = "MIX_APP_" + methodName
+            window["MIX_APP_" + methodName] = (data)=>{
+              resolve(data)
+            }
+            if(singleField){
+              result = iosMethod ? resolve(iosMethod()) : decodeURIComponent(window.prompt(methodName, singleParam))
+            }else{
+              result = iosMethod ? resolve(iosMethod()) : decodeURIComponent(window.prompt(methodName, mixJsonStringify(params)))
+            }
+          } catch (error) {
+            reject(error)
+          }
+        })
+      }else{
+        if(singleField){
+          result = iosMethod ? iosMethod() : decodeURIComponent(window.prompt(methodName, singleParam))
+        }else{
+          result = iosMethod ? iosMethod() : decodeURIComponent(window.prompt(methodName, mixJsonStringify(params)))
+        }
+      }
+    }
+  }
+  return mixJsonParse(result);
+};