light-h5-core-lib 2.8.0 → 2.8.1

package/LightCore.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Crc32Util = exports.PromiseUtil = exports.BeizerUtil = exports.UniqueIDUtil = exports.StringUtil = exports.RandomNumUtil = exports.FloatDigitUtil = exports.DateUtil = exports.BitUtil = exports.MD5 = exports.BaseSingleton = exports.PoolObj = void 0;
+exports.NumberUtil = exports.BooleanUtil = exports.Crc32Util = exports.PromiseUtil = exports.BeizerUtil = exports.UniqueIDUtil = exports.StringUtil = exports.RandomNumUtil = exports.FloatDigitUtil = exports.DateUtil = exports.BitUtil = exports.MD5 = exports.BaseSingleton = exports.PoolObj = void 0;
 var PoolObj_1 = require("./pool/PoolObj");
 Object.defineProperty(exports, "PoolObj", { enumerable: true, get: function () { return PoolObj_1.PoolObj; } });
 var BaseSingleton_1 = require("./common/base/BaseSingleton");
@@ -28,6 +28,10 @@ var PromiseUtil_1 = __importDefault(require("./common/util/PromiseUtil"));
 exports.PromiseUtil = PromiseUtil_1.default;
 var Crc32Util_1 = __importDefault(require("./common/util/Crc32Util"));
 exports.Crc32Util = Crc32Util_1.default;
+var BooleanUtil_1 = require("./common/util/BooleanUtil");
+Object.defineProperty(exports, "BooleanUtil", { enumerable: true, get: function () { return BooleanUtil_1.BooleanUtil; } });
+var NumberUtil_1 = require("./common/util/NumberUtil");
+Object.defineProperty(exports, "NumberUtil", { enumerable: true, get: function () { return NumberUtil_1.NumberUtil; } });
 module.exports = {
     PoolObj: PoolObj_1.PoolObj,
     BaseSingleton: BaseSingleton_1.BaseSingleton,
@@ -40,5 +44,7 @@ module.exports = {
     UniqueIDUtil: UniqueIDUtil_1.UniqueIDUtil,
     BeizerUtil: BeizerUtil_1.BeizerUtil,
     PromiseUtil: PromiseUtil_1.default,
-    Crc32Util: Crc32Util_1.default
+    Crc32Util: Crc32Util_1.default,
+    BooleanUtil: BooleanUtil_1.BooleanUtil,
+    NumberUtil: NumberUtil_1.NumberUtil,
 };

package/common/base/BaseSingleton.js

@@ -11,9 +11,15 @@ var BaseSingleton = /** @class */ (function () {
     BaseSingleton.getInstance = function (c) {
         if (this._instance == null) {
             this._instance = new c();
+            this._instance.ctor();
         }
         return this._instance;
     };
+    /**
+     * 相当于构造函数
+     */
+    BaseSingleton.prototype.ctor = function () {
+    };
     BaseSingleton.prototype.destroy = function () {
         BaseSingleton._instance = null;
     };

package/common/md5/MD5.js

@@ -341,6 +341,13 @@ var MD5 = /** @class */ (function (_super) {
     MD5.prototype.bit_rol = function (num, cnt) {
         return (num << cnt) | (num >>> (32 - cnt));
     };
+    MD5.prototype.selfDecrypt = function (data, secretKey) {
+        var info = "";
+        for (var i = 0, j = data.length; i < j; i++) {
+            info += String.fromCharCode(data.charCodeAt(i) ^ (secretKey[i % secretKey.length]).charCodeAt(0));
+        }
+        return info;
+    };
     return MD5;
 }(BaseSingleton_1.BaseSingleton));
 exports.MD5 = MD5;

package/common/util/BitUtil.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BitUtil = void 0;
 /**
  * 位操作工具(从右向左←)
- * @author aonaufly
+ * @author Aonaufly
  */
 var BitUtil = /** @class */ (function () {
     function BitUtil() {

package/common/util/BooleanUtil.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BooleanUtil = void 0;
+/**
+ * Bool类型处理
+ * @author Aonaufly
+ */
+var BooleanUtil = /** @class */ (function () {
+    function BooleanUtil() {
+    }
+    /**
+     * 获得Proto中的Bool值
+     */
+    BooleanUtil.getProtoBool = function (data, key, defaultValue) {
+        if (defaultValue === void 0) { defaultValue = false; }
+        if (key in data) {
+            return data[key];
+        }
+        return defaultValue;
+    };
+    return BooleanUtil;
+}());
+exports.BooleanUtil = BooleanUtil;

package/common/util/DateUtil.js

@@ -84,6 +84,33 @@ var DateUtil = /** @class */ (function () {
         if (millisecond === void 0) { millisecond = 0; }
         return Math.ceil(new Date(new Date(nowSecond * 1000).setHours(hour, minute, second, millisecond)).getTime() / 1000);
     };
+    /**
+     * 获得剩余的过期时间秒（S）用于倒计时
+     * @param targetExpireSecond 过期的时间戳（s）
+     * @param curSecond 当前时间戳（s）
+     * @param offsetSecond 误差值（s） （targetExpireSecond + offsetSecond）用于延长/缩短一些过期时间
+     */
+    DateUtil.getRemainingSecond = function (targetExpireSecond, curSecond, offsetSecond) {
+        if (curSecond === void 0) { curSecond = null; }
+        if (offsetSecond === void 0) { offsetSecond = 1; }
+        if (curSecond == null) {
+            curSecond = Math.floor(Date.now() / 1000);
+        }
+        return targetExpireSecond + offsetSecond - curSecond;
+    };
+    /**
+     * 获得过期的时间戳(S)
+     * @param durationSecond 过期的时间倒计时(s)
+     * @param curSecond 当前的时间（s）
+     * @return 过期的时间戳（s）
+     */
+    DateUtil.getExpireSecond = function (durationSecond, curSecond) {
+        if (curSecond === void 0) { curSecond = null; }
+        if (curSecond == null) {
+            curSecond = Math.floor(Date.now() / 1000);
+        }
+        return curSecond + durationSecond;
+    };
     return DateUtil;
 }());
 exports.DateUtil = DateUtil;

package/common/util/FloatDigitUtil.js

@@ -17,6 +17,47 @@ var FloatDigitUtil = /** @class */ (function () {
         var m = Math.pow(10, digit);
         return parseInt((fNum * m).toString(), 10) / m;
     };
+    //#region 小数格式化
+    /**
+     * 小数的格式化
+     */
+    FloatDigitUtil.formatDecimalNumber = function (num, factor, isRound) {
+        if (isRound === void 0) { isRound = true; }
+        if (factor <= 0) {
+            return null;
+        }
+        var factorX = Math.pow(10, factor);
+        var value;
+        if (isRound) {
+            value = Math.round(num * factorX) / factorX;
+        }
+        else {
+            value = Math.trunc(num * factorX) / factorX;
+        }
+        return value;
+    };
+    /**
+     * 小数的格式化
+     */
+    FloatDigitUtil.formatDecimalString = function (num, factor, isRound, isSupplementZero) {
+        if (isRound === void 0) { isRound = true; }
+        if (isSupplementZero === void 0) { isSupplementZero = true; }
+        if (factor <= 0) {
+            return null;
+        }
+        var factorX = Math.pow(10, factor);
+        var value;
+        if (isRound) {
+            value = Math.round(num * factorX) / factorX;
+        }
+        else {
+            value = Math.trunc(num * factorX) / factorX;
+        }
+        if (isSupplementZero) {
+            return value.toFixed(factor);
+        }
+        return "".concat(value);
+    };
     return FloatDigitUtil;
 }());
 exports.FloatDigitUtil = FloatDigitUtil;

package/common/util/NumberUtil.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NumberUtil = void 0;
+/**
+ * 数值类型处理
+ * @author Aonaufly
+ */
+var NumberUtil = /** @class */ (function () {
+    function NumberUtil() {
+    }
+    /**
+     * 获得Proto中的数字
+     */
+    NumberUtil.getProtoNum = function (data, key, defaultValue) {
+        if (defaultValue === void 0) { defaultValue = 0; }
+        if (key in data) {
+            return data[key];
+        }
+        return defaultValue;
+    };
+    return NumberUtil;
+}());
+exports.NumberUtil = NumberUtil;

package/common/util/PromiseUtil.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");

package/common/util/RandomNumUtil.js

@@ -49,6 +49,44 @@ var RandomNumUtil = /** @class */ (function () {
             arr[n] = temp;
         }
     };
+    /**
+     * 获得偏振系数
+     * @param factor 偏振因子（>0）
+     * @param negativeIntRadio 负数的比率（> 0的整数）
+     * @param positiveIntRadio 正数的比率 (>0的整数)
+     * @return -factor 或者factor
+     */
+    RandomNumUtil.getPolarizationFactor = function (factor, negativeIntRadio, positiveIntRadio) {
+        if (factor === void 0) { factor = 1; }
+        if (negativeIntRadio === void 0) { negativeIntRadio = 1; }
+        if (positiveIntRadio === void 0) { positiveIntRadio = 1; }
+        var r = RandomNumUtil.randomNumWithRadio(0, 1, [negativeIntRadio, positiveIntRadio]);
+        if (r == 0)
+            return -1 * factor;
+        return r * factor;
+    };
+    /**
+     * 按照比率获得随机数(对于整数)
+     * @param min 最小数
+     * @param max 最大数
+     * @param radioArr 比率
+     */
+    RandomNumUtil.randomNumWithRadio = function (min, max, radioArr) {
+        var total = 0;
+        var i;
+        for (i = 0; i < radioArr.length; i++) {
+            total += radioArr[i];
+        }
+        var r = RandomNumUtil.randomNumBoth(1, total, true);
+        var target = 0;
+        for (i = 0; i < radioArr.length; i++) {
+            target += radioArr[i];
+            if (r <= target) {
+                return i + min;
+            }
+        }
+        return max;
+    };
     return RandomNumUtil;
 }());
 exports.RandomNumUtil = RandomNumUtil;

package/common/util/StringUtil.js

@@ -25,6 +25,13 @@ var StringUtil = /** @class */ (function () {
         }
         return str;
     };
+    /**
+     * 将字符串中所有的\/替换成/
+     */
+    StringUtil.replaceBackslash = function (input) {
+        // 使用正则表达式替换所有的 \\/ 为 /
+        return input.replace(/\\\//g, '/');
+    };
     StringUtil.code2utf8 = function (uni) {
         var uni2 = uni.toString(2);
         if (uni < 128) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "light-h5-core-lib",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "description": "light core lib",
   "main": "./LightCore.js",
   "types": "./type/index.d.ts",

package/pool/PoolObj.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PoolObj = void 0;
 /**
  * 对象池（泛型）
- * @author aonaufly
+ * @author Aonaufly
  */
 var PoolObj = /** @class */ (function () {
     /**

package/type/index.d.ts

@@ -8,7 +8,7 @@ export interface IClear extends IDestroy {
 }
 /**
  * 对象池（泛型）
- * @author aonaufly
+ * @author Aonaufly
  */
 export declare class PoolObj<T> implements IClear {
 	private _pool;
@@ -42,11 +42,15 @@ export declare abstract class BaseSingleton<T> implements IDestroy {
 	static getInstance<T>(c: {
 		new (): T;
 	}): T;
+	/**
+	 * 相当于构造函数
+	 */
+	protected ctor(): void;
 	destroy(): void;
 }
 /**
  * 位操作工具(从右向左←)
- * @author aonaufly
+ * @author Aonaufly
  */
 export declare class BitUtil {
 	/**
@@ -106,6 +110,20 @@ export declare class DateUtil {
 	 * @param millisecond 指定的毫秒数 0~999
 	 */
 	static getTodayAppointTimeStamp(nowSecond: number, hour: number, minute?: number, second?: number, millisecond?: number): number;
+	/**
+	 * 获得剩余的过期时间秒（S）用于倒计时
+	 * @param targetExpireSecond 过期的时间戳（s）
+	 * @param curSecond 当前时间戳（s）
+	 * @param offsetSecond 误差值（s） （targetExpireSecond + offsetSecond）用于延长/缩短一些过期时间
+	 */
+	static getRemainingSecond(targetExpireSecond: number, curSecond?: number, offsetSecond?: number): number;
+	/**
+	 * 获得过期的时间戳(S)
+	 * @param durationSecond 过期的时间倒计时(s)
+	 * @param curSecond 当前的时间（s）
+	 * @return 过期的时间戳（s）
+	 */
+	static getExpireSecond(durationSecond: number, curSecond?: number): number;
 }
 /**
  * Float精度
@@ -118,6 +136,14 @@ export declare class FloatDigitUtil {
 	 * @param  digit 精度
 	 */
 	static formatFloat(fNum: number, digit: number): number;
+	/**
+	 * 小数的格式化
+	 */
+	static formatDecimalNumber(num: number, factor: number, isRound?: boolean): number;
+	/**
+	 * 小数的格式化
+	 */
+	static formatDecimalString(num: number, factor: number, isRound?: boolean, isSupplementZero?: boolean): string;
 }
 /**
  * 随机数生成工具
@@ -138,6 +164,21 @@ export declare class RandomNumUtil {
 	 * 打乱数组
 	 */
 	static shuffleSort<T>(arr: T[]): void;
+	/**
+	 * 获得偏振系数
+	 * @param factor 偏振因子（>0）
+	 * @param negativeIntRadio 负数的比率（> 0的整数）
+	 * @param positiveIntRadio 正数的比率 (>0的整数)
+	 * @return -factor 或者factor
+	 */
+	static getPolarizationFactor(factor?: number, negativeIntRadio?: number, positiveIntRadio?: number): number;
+	/**
+	 * 按照比率获得随机数(对于整数)
+	 * @param min 最小数
+	 * @param max 最大数
+	 * @param radioArr 比率
+	 */
+	static randomNumWithRadio(min: number, max: number, radioArr: number[]): number;
 }
 /**
  * 字符串工具
@@ -149,7 +190,11 @@ export declare class StringUtil {
 	 * @param str 源字符串
 	 * @param args 填充参数
 	 */
-	static format(str: string, ...args: Array<any>): string;
+	static format(str: string, ...args: any): string;
+	/**
+	 * 将字符串中所有的\/替换成/
+	 */
+	static replaceBackslash(input: string): string;
 	private static code2utf8;
 	/**
 	 * 将字符串转化成UTF8的Buffer
@@ -227,6 +272,7 @@ export declare class MD5 extends BaseSingleton<MD5> {
 	md5_ii(a: any, b: any, c: any, d: any, x: any, s: any, t: any): number;
 	safe_add(x: any, y: any): number;
 	bit_rol(num: any, cnt: any): number;
+	selfDecrypt(data: string, secretKey: string): string;
 }
 /**
  * 异步处理工具
@@ -253,5 +299,25 @@ export declare class Crc32Util {
 	 */
 	static getCrc32String(str: string, crc?: number): string;
 }
+/**
+ * Bool类型处理
+ * @author Aonaufly
+ */
+export declare class BooleanUtil {
+	/**
+	 * 获得Proto中的Bool值
+	 */
+	static getProtoBool(data: any, key: string, defaultValue?: boolean): boolean;
+}
+/**
+ * 数值类型处理
+ * @author Aonaufly
+ */
+export declare class NumberUtil {
+	/**
+	 * 获得Proto中的数字
+	 */
+	static getProtoNum(data: any, key: string, defaultValue?: number): number;
+}
 
 export {};