@pisell/utils 1.0.41 → 1.0.43

package/es/jsBridge/index.js

@@ -6,7 +6,7 @@ import regDeviceApi from "./regDeviceApi";
  * @param callback
  */
 export function webPrint(params, _callback, onError) {
-  regDeviceApi().then(function (jsBridge) {
+  regDeviceApi(true).then(function (jsBridge) {
     jsBridge.callDeviceApi({
       apiName: "webPrint",
       params: params,

package/es/jsBridge/regDeviceApi.d.ts

@@ -10,6 +10,6 @@ type ComposedJSBridge = {
     calledByDevice: (a: { apiName: string; callback: Functon }) => void;
 };
 
-const regDeviceApi: () => Promise<ComposedJSBridge>;
+const regDeviceApi: (isWebPrint?: boolean) => Promise<ComposedJSBridge>;
 
 export default regDeviceApi;

package/es/jsBridge/regDeviceApi.js

@@ -4,10 +4,12 @@ var iosRegStatus = false;
 var androidBridge;
 var iosBridge;
 var composedBridge;
-function regIosJsBridge(callback) {
+function regIosJsBridge(callback, reject) {
   if (window.WebViewJavascriptBridge) {
     callback(window.WebViewJavascriptBridge);
     return;
+  } else {
+    reject();
   }
   if (window.WVJBCallbacks) {
     window.WVJBCallbacks.push(callback);
@@ -99,12 +101,8 @@ function getComposedBridge(deviceType) {
           onError === null || onError === void 0 ? void 0 : onError();
           return;
         }
-        androidBridge.callHandler(apiName, params, callback, function (e) {
-          console.log(e, '--- 调用android api报错：', apiName);
-          if (onError) {
-            onError === null || onError === void 0 ? void 0 : onError(e);
-          }
-        });
+        var res = androidBridge.callHandler(apiName, JSON.stringify(params));
+        callback(res);
       } else {
         onError === null || onError === void 0 ? void 0 : onError();
         console.log('--- 没获取到js bridge ---');
@@ -123,15 +121,23 @@ function getComposedBridge(deviceType) {
   };
   return composedBridge;
 }
-export default function regDeviceApi() {
+export default function regDeviceApi(isWebPrint) {
   return new Promise(function (resolve, reject) {
+    // 旧版本只能用WebPrint
+    var isOld = !navigator.userAgent.includes('jsBridge');
+    if (isOld) {
+      if (!isWebPrint) {
+        reject();
+        return;
+      }
+    }
     if (isIos() && !iosRegStatus) {
       regIosJsBridge(function (bridge) {
         iosRegStatus = true;
         iosBridge = bridge;
         var realBridge = getComposedBridge('iphone');
         resolve(realBridge);
-      });
+      }, reject);
     } else if (isIos() && iosRegStatus) {
       var realBridge = getComposedBridge('iphone');
       resolve(realBridge);

package/lib/jsBridge/index.js

@@ -35,7 +35,7 @@ __export(jsBridge_exports, {
 module.exports = __toCommonJS(jsBridge_exports);
 var import_regDeviceApi = __toESM(require("./regDeviceApi"));
 function webPrint(params, callback, onError) {
-  (0, import_regDeviceApi.default)().then((jsBridge) => {
+  (0, import_regDeviceApi.default)(true).then((jsBridge) => {
     jsBridge.callDeviceApi({
       apiName: "webPrint",
       params,

package/lib/jsBridge/regDeviceApi.d.ts

@@ -10,6 +10,6 @@ type ComposedJSBridge = {
     calledByDevice: (a: { apiName: string; callback: Functon }) => void;
 };
 
-const regDeviceApi: () => Promise<ComposedJSBridge>;
+const regDeviceApi: (isWebPrint?: boolean) => Promise<ComposedJSBridge>;
 
 export default regDeviceApi;

package/lib/jsBridge/regDeviceApi.js

@@ -28,10 +28,12 @@ var iosRegStatus = false;
 var androidBridge;
 var iosBridge;
 var composedBridge;
-function regIosJsBridge(callback) {
+function regIosJsBridge(callback, reject) {
   if (window.WebViewJavascriptBridge) {
     callback(window.WebViewJavascriptBridge);
     return;
+  } else {
+    reject();
   }
   if (window.WVJBCallbacks) {
     window.WVJBCallbacks.push(callback);
@@ -111,12 +113,8 @@ function getComposedBridge(deviceType) {
           onError == null ? void 0 : onError();
           return;
         }
-        androidBridge.callHandler(apiName, params, callback, (e) => {
-          console.log(e, "--- \u8C03\u7528android api\u62A5\u9519\uFF1A", apiName);
-          if (onError) {
-            onError == null ? void 0 : onError(e);
-          }
-        });
+        const res = androidBridge.callHandler(apiName, JSON.stringify(params));
+        callback(res);
       } else {
         onError == null ? void 0 : onError();
         console.log("--- \u6CA1\u83B7\u53D6\u5230js bridge ---");
@@ -133,15 +131,22 @@ function getComposedBridge(deviceType) {
   };
   return composedBridge;
 }
-function regDeviceApi() {
+function regDeviceApi(isWebPrint) {
   return new Promise((resolve, reject) => {
+    const isOld = !navigator.userAgent.includes("jsBridge");
+    if (isOld) {
+      if (!isWebPrint) {
+        reject();
+        return;
+      }
+    }
     if ((0, import_platform.isIos)() && !iosRegStatus) {
       regIosJsBridge((bridge) => {
         iosRegStatus = true;
         iosBridge = bridge;
         const realBridge = getComposedBridge("iphone");
         resolve(realBridge);
-      });
+      }, reject);
     } else if ((0, import_platform.isIos)() && iosRegStatus) {
       const realBridge = getComposedBridge("iphone");
       resolve(realBridge);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/utils",
-  "version": "1.0.41",
+  "version": "1.0.43",
   "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./es/index.js",