@pisell/utils 2.0.1 → 2.0.2

package/lib/index.js

@@ -2,6 +2,10 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -15,6 +19,10 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 
 // src/index.ts
 var src_exports = {};
+__export(src_exports, {
+  getPisellUtilsConfig: () => getPisellUtilsConfig,
+  setPisellUtilsConfig: () => setPisellUtilsConfig
+});
 module.exports = __toCommonJS(src_exports);
 __reExport(src_exports, require("./otherUtils"), module.exports);
 __reExport(src_exports, require("./typeUtils"), module.exports);
@@ -29,8 +37,21 @@ __reExport(src_exports, require("./jsBridge"), module.exports);
 __reExport(src_exports, require("./image"), module.exports);
 __reExport(src_exports, require("./locales"), module.exports);
 __reExport(src_exports, require("./arrayUtils"), module.exports);
+var setPisellUtilsConfig = (config) => {
+  globalThis.pisellUtilsConfig = {
+    ...globalThis.pisellUtilsConfig || {},
+    ...config || {}
+  };
+  console.log("PisellUtilsConfig_set>>>>", config, globalThis);
+};
+var getPisellUtilsConfig = () => {
+  console.log("PisellUtilsConfig_get>>>>", globalThis);
+  return globalThis.pisellUtilsConfig || {};
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getPisellUtilsConfig,
+  setPisellUtilsConfig,
   ...require("./otherUtils"),
   ...require("./typeUtils"),
   ...require("./document"),

package/lib/jsBridge/index.d.ts

@@ -1,106 +1,22 @@
-declare type LanguageNumber = {
-    en: number;
-    zh_CN: number;
-    zh_HK: number;
-};
-declare type LanguageString = {
-    en: string;
-    zh_CN: string;
-    zh_HK: string;
-} | string;
+import { WebPrintParams, DataManagerParams, WebPaymentParams } from './types';
 /**
- * 打印小票
+ * webView页面中调用打印机打印
+ * 此api暂时只支持native app平台下ios手机
+ * @param params
+ * @param callback
  */
-declare type WebPrint0 = {
-    /**
-     * 打印类型
-     * 0: 小票
-     * 1：ITS备货单/划菜单
-     * 2：手环
-     */
-    type: "0";
-    data: {
-        /** 订单ID */
-        order_id: string;
-    };
-    /** 打印语言对应的数量 */
-    language: LanguageNumber;
-};
+export declare function webPrint(params: WebPrintParams, callback: (...arg: any) => void, onError?: (error: any) => void): void;
 /**
- * 打印ITS备货单/划菜单
+ * webView页面中调用APP内的数据
+ * 此api暂时只支持native app平台下ios手机
+ * @param params
+ * @param callback
  */
-declare type WebPrint1 = {
-    /**
-     * 打印类型
-     * 0: 小票
-     * 1：ITS备货单/划菜单
-     * 2：手环
-     */
-    type: "1";
-    data: {
-        /** 0:备货 1：划单 */
-        mode: "0" | "1";
-        resource: LanguageString;
-        /** 订单备注 */
-        order_note: string;
-        /** 订单时间或商品下单时间 */
-        time: string;
-        /** 订单编号 */
-        order_number?: string;
-        /** 商品 */
-        products: {
-            /** 商品名称 */
-            product_title: LanguageString;
-            /** 商品规格 */
-            product_option_string: LanguageString;
-            /** 商品备注 */
-            product_note: string;
-            /** 商品数量 */
-            product_quantity: number;
-            /** 加菜标识 待定 */
-            is_append?: boolean;
-            /** 退菜标识 待定 */
-            is_removed?: boolean;
-        }[];
-    };
-    /** 打印语言对应的数量 */
-    language: LanguageNumber;
-};
-declare type WebPrint2 = {
-    /**
-     * 打印类型
-     * 0: 小票
-     * 1：ITS备货单/划菜单
-     * 2：手环
-     */
-    type: "2";
-    data: {
-        /** 0: 普通票 1:成人票 2:免费成人票 */
-        type: "0" | "1" | "2";
-        /** 发行编码 */
-        encoded: string;
-        /** 编码 */
-        code: string;
-        /** 到期时间 */
-        expire_date: string;
-        areas: {
-            /** 区域名字 */
-            area_name: string;
-            /** 区域代码 */
-            area_code: string;
-            /** 可用次数 */
-            limit_num: number;
-            /**  已用次数 */
-            used_num: number;
-        }[];
-    };
-};
-declare type WebPrintParams = WebPrint0 | WebPrint1 | WebPrint2;
+export declare function dataManager(params: DataManagerParams, callback: (...arg: any) => void, onError: () => void): void;
 /**
- * webView页面中调用打印机打印
- * 此api暂时只支持native app平台下ios手机
+ * webView页面中调用APP内的支付
+ * 此api暂时只支持native app平台下ios
  * @param params
  * @param callback
  */
-export declare function webPrint(params: WebPrintParams, callback: (...arg: any) => void): void;
-export {};
+export declare function webPayment(params: WebPaymentParams, callback: (...arg: any) => void, onError?: (error: any) => void): void;

package/lib/jsBridge/index.js

@@ -29,11 +29,13 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/jsBridge/index.ts
 var jsBridge_exports = {};
 __export(jsBridge_exports, {
+  dataManager: () => dataManager,
+  webPayment: () => webPayment,
   webPrint: () => webPrint
 });
 module.exports = __toCommonJS(jsBridge_exports);
 var import_regDeviceApi = __toESM(require("./regDeviceApi"));
-function webPrint(params, callback) {
+function webPrint(params, callback, onError) {
   (0, import_regDeviceApi.default)().then((jsBridge) => {
     jsBridge.callDeviceApi({
       apiName: "webPrint",
@@ -42,9 +44,39 @@ function webPrint(params, callback) {
         callback && callback(...arg);
       }
     });
+  }).catch((err) => {
+    onError == null ? void 0 : onError(err);
+    console.error("webPrint", err);
+  });
+}
+function dataManager(params, callback, onError) {
+  (0, import_regDeviceApi.default)().then((jsBridge) => {
+    jsBridge.callDeviceApi({
+      apiName: "dataManager",
+      params,
+      callback: (...arg) => {
+        callback && callback(...arg);
+      }
+    });
+  }).catch(onError);
+}
+function webPayment(params, callback, onError) {
+  (0, import_regDeviceApi.default)().then((jsBridge) => {
+    jsBridge.callDeviceApi({
+      apiName: "webPayment",
+      params,
+      callback: (...arg) => {
+        callback && callback(...arg);
+      }
+    });
+  }).catch((err) => {
+    onError == null ? void 0 : onError(err);
+    console.error("webPayment", err);
   });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  dataManager,
+  webPayment,
   webPrint
 });

package/lib/jsBridge/regDeviceApi.js

@@ -60,8 +60,7 @@ function regAndroidJsBridge(extraInit) {
     (event) => {
       const { bridge } = event;
       window._jsBridge = bridge;
-      if (!bridge)
-        return;
+      if (!bridge) return;
       bridge.init((message, responseCallback) => {
         if (responseCallback) {
           responseCallback("init responseCallback");
@@ -86,27 +85,20 @@ function getComposedBridge(deviceType) {
         } catch (error) {
           console.log(`error ${apiName}`, error);
         }
-        if (result.code || result.code === 0) {
-          result.code = `${result.code}`;
-        }
         inCb(result, ...args);
       };
       if (deviceType === "iphone") {
         iosBridge.callHandler(apiName, params, callback, (e) => {
-          console.log(e, "--- \u8C03\u7528ios api\u62A5\u9519\uFF1A", apiName);
+          console.log(e, "--- 调用ios api报错：", apiName);
           if (onError) {
             onError(e);
           }
         });
       } else if (deviceType === "android") {
-        androidBridge.callHandler(apiName, params, callback, (e) => {
-          console.log(e, "--- \u8C03\u7528android api\u62A5\u9519\uFF1A", apiName);
-          if (onError) {
-            onError(e);
-          }
-        });
+        const res = androidBridge.callHandler(apiName, JSON.stringify(params));
+        callback(res);
       } else {
-        console.log("--- \u6CA1\u83B7\u53D6\u5230js bridge ---");
+        console.log("--- 没获取到js bridge ---");
       }
     },
     // 被设备调用的方法

package/lib/jsBridge/types.js

@@ -0,0 +1,17 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/jsBridge/types.ts
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/lib/locales.js

@@ -50,7 +50,6 @@ var init = (_localeMaps, _locale) => {
   }
   localeMaps = allLocales;
   localeMap = localeMaps[locale];
-  console.log("\u591A\u8BED\u8A00\u6CE8\u5165\u6210\u529F, \u5F53\u524D\u8BED\u8A00\u4E3A:" + locale);
 };
 var getText = (id) => {
   return localeMap[id] || id;

package/lib/log.js

@@ -22,6 +22,7 @@ __export(log_exports, {
   sendWarningLog: () => sendWarningLog
 });
 module.exports = __toCommonJS(log_exports);
+var import_index = require("./index");
 var import_constants = require("./constants");
 var createFeishuMessageContent = (contentArr) => {
   return JSON.stringify(
@@ -35,7 +36,15 @@ var createFeishuMessageContent = (contentArr) => {
 };
 var sendWarningLog = async ({ title, content }) => {
   const contentStr = createFeishuMessageContent(content);
-  const response = await fetch(import_constants.webHookApi.warning_log, {
+  let apiUrl = "";
+  const config = (0, import_index.getPisellUtilsConfig)();
+  console.log("PISELL_UTILS_CONFIG>>>>", config);
+  if ((config == null ? void 0 : config.env) === "dev" || (config == null ? void 0 : config.env) === "pre" || (config == null ? void 0 : config.env) === "release") {
+    apiUrl = import_constants.webHookApi.warning_log.test;
+  } else {
+    apiUrl = import_constants.webHookApi.warning_log.prod;
+  }
+  const response = await fetch(apiUrl, {
     headers: {
       "Content-Type": "application/json"
     },

package/package.json

@@ -1,6 +1,10 @@
 {
   "name": "@pisell/utils",
-  "version": "2.0.1",
+  "version": "2.0.2",
+  "scripts": {
+    "build": "father build",
+    "dev": "father dev"
+  },
   "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./es/index.js",
@@ -24,9 +28,5 @@
   ],
   "publishConfig": {
     "access": "public"
-  },
-  "scripts": {
-    "build": "father build",
-    "dev": "father dev"
   }
 }

package/es/constants/index.d.ts

@@ -1,4 +0,0 @@
-declare const webHookApi: {
-    warning_log: string;
-};
-export { webHookApi };

package/es/locales.d.ts

@@ -1,12 +0,0 @@
-export declare const locales: {
-    init: (_localeMaps: any, _locale: string) => void;
-    getText: (id: string) => any;
-    locale: string;
-    localeMap: any;
-    localeMaps: {
-        en: {};
-        'zh-CN': {};
-        'zh-HK': {};
-    };
-    formatLocale: (_locale: string) => string;
-};

package/lib/constants/index.d.ts

@@ -1,4 +0,0 @@
-declare const webHookApi: {
-    warning_log: string;
-};
-export { webHookApi };

package/lib/locales.d.ts

@@ -1,12 +0,0 @@
-export declare const locales: {
-    init: (_localeMaps: any, _locale: string) => void;
-    getText: (id: string) => any;
-    locale: string;
-    localeMap: any;
-    localeMaps: {
-        en: {};
-        'zh-CN': {};
-        'zh-HK': {};
-    };
-    formatLocale: (_locale: string) => string;
-};