@foundbyte/uni-libs 1.0.6 → 1.0.7

package/es/utils/pages/food/index.js

@@ -1,5 +1,4 @@
 import { query2url } from "../../common/index.js";
-
 //#region src/utils/pages/food/index.ts
 /**
 * 店铺
@@ -29,6 +28,5 @@ const getFoodPackagePage = (domain, storeId, packageId, storePrecedentType) => {
 		storePrecedentType
 	}, { encode: false })}`;
 };
-
 //#endregion
-export { getFoodPackagePage, getFoodStorePage };
+export { getFoodPackagePage, getFoodStorePage };

package/es/utils/pages/movie/index.js

@@ -1,5 +1,4 @@
 import { query2url } from "../../common/index.js";
-
 //#region src/utils/pages/movie/index.ts
 /**
 * 电影票地址
@@ -10,6 +9,5 @@ const getMoviePage = (domain, movie_id) => {
 		movie_id
 	}, { encode: false })}`;
 };
-
 //#endregion
-export { getMoviePage };
+export { getMoviePage };

package/es/utils/pages/webview/index.js

@@ -1,10 +1,8 @@
 import { routes } from "../../../constants/routes/index.js";
 import { query2url } from "../../common/index.js";
-
 //#region src/utils/pages/webview/index.ts
 function getWebviewPage(params) {
 	return `${routes.webView}${query2url(params)}`;
 }
-
 //#endregion
-export { getWebviewPage };
+export { getWebviewPage };

package/es/utils/uni-env/index.d.ts

@@ -1,61 +1,11 @@
 //#region src/utils/uni-env/index.d.ts
-/**
- * 是否是支付宝小程序
- * @returns
- */
 declare const isAlipayEnv: () => boolean;
-/**
- * 是否是web环境
- * @returns
- */
 declare const isH5Env: () => boolean;
-/**
- * 是否是微信小程序
- * @returns
- */
 declare const isWeixinEnv: () => boolean;
-/**
- * 是否是鸿蒙
- * @returns
- */
-declare const isHarmonyEnv: () => boolean;
-/**
- * 是否是app
- * @returns
- */
+declare const isToutiaoEnv: () => boolean;
 declare const isAppEnv: () => boolean;
-/**
- * 是否是安卓
- * @returns
- */
+declare const isHarmonyEnv: () => boolean;
 declare const isAndroidEnv: () => boolean;
-/**
- * 是否是iOS
- * @returns
- */
 declare const isiOSEnv: () => boolean;
-declare function getSystemInfoSync(): UniApp.GetSystemInfoResult | {
-  pixelRatio: number;
-  screenWidth: number;
-  screenHeight: number;
-  windowWidth: number;
-  windowHeight: number;
-  statusBarHeight: number;
-  windowTop: number;
-  windowBottom: number;
-  safeArea: UniApp.SafeArea;
-  safeAreaInsets: UniApp.SafeAreaInsets;
-  screenTop: number;
-  deviceBrand?: string;
-  deviceModel: string;
-  deviceId: string;
-  deviceType: string;
-  devicePixelRatio: number;
-  deviceOrientation: "portrait" | "landscape";
-  brand?: string;
-  model: string;
-  system: string;
-  platform: string;
-};
 //#endregion
-export { getSystemInfoSync, isAlipayEnv, isAndroidEnv, isAppEnv, isH5Env, isHarmonyEnv, isWeixinEnv, isiOSEnv };
+export { isAlipayEnv, isAndroidEnv, isAppEnv, isH5Env, isHarmonyEnv, isToutiaoEnv, isWeixinEnv, isiOSEnv };

package/es/utils/uni-env/index.js

@@ -1,64 +1,12 @@
-import { EUniPlatform } from "../../enums/platform/index.js";
-
+import { isAlipay, isAndroid, isApp, isH5, isHarmony, isToutiao, isWeixin, isiOS } from "@foundbyte/uni-hooks";
 //#region src/utils/uni-env/index.ts
-/**
-* 是否是支付宝小程序
-* @returns
-*/
-const isAlipayEnv = () => {
-	return true;
-};
-/**
-* 是否是web环境
-* @returns
-*/
-const isH5Env = () => {
-	return true;
-};
-/**
-* 是否是微信小程序
-* @returns
-*/
-const isWeixinEnv = () => {
-	return true;
-};
-/**
-* 是否是鸿蒙
-* @returns
-*/
-const isHarmonyEnv = () => {
-	return true;
-};
-/**
-* 是否是app
-* @returns
-*/
-const isAppEnv = () => {
-	if (isHarmonyEnv()) return true;
-	return true;
-};
-/**
-* 是否是安卓
-* @returns
-*/
-const isAndroidEnv = () => {
-	if (isAppEnv() && getSystemInfoSync().platform === EUniPlatform.android) return true;
-	return false;
-};
-/**
-* 是否是iOS
-* @returns
-*/
-const isiOSEnv = () => {
-	if (isAppEnv() && getSystemInfoSync().platform === EUniPlatform.ios) return true;
-	return false;
-};
-function getSystemInfoSync() {
-	return {
-		...uni.getDeviceInfo(),
-		...uni.getWindowInfo()
-	};
-}
-
+const isAlipayEnv = isAlipay;
+const isH5Env = isH5;
+const isWeixinEnv = isWeixin;
+const isToutiaoEnv = isToutiao;
+const isAppEnv = isApp;
+const isHarmonyEnv = isHarmony;
+const isAndroidEnv = isAndroid;
+const isiOSEnv = isiOS;
 //#endregion
-export { getSystemInfoSync, isAlipayEnv, isAndroidEnv, isAppEnv, isH5Env, isHarmonyEnv, isWeixinEnv, isiOSEnv };
+export { isAlipayEnv, isAndroidEnv, isAppEnv, isH5Env, isHarmonyEnv, isToutiaoEnv, isWeixinEnv, isiOSEnv };

package/es/utils/web-view/index.js

@@ -1,6 +1,9 @@
+import { _asyncToGenerator } from "../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js";
+import { _objectWithoutProperties } from "../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectWithoutProperties.js";
+import { _objectSpread2 } from "../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import wx from "weixin-js-sdk";
-
 //#region src/utils/web-view/index.ts
+const _excluded = ["shareUrl"];
 const userAgent = navigator.userAgent.toLowerCase();
 /** 判断是否是iOS还是安卓 */
 const isIOSOrAndroid = !userAgent.includes("miniprogram") && (userAgent.includes("android") || userAgent.includes("iphone") || userAgent.includes("ipad"));
@@ -15,27 +18,33 @@ const isAndroid = !userAgent.includes("miniprogram") && userAgent.includes("andr
 /** 判断是否苹果APP */
 const isiOS = !userAgent.includes("miniprogram") && (userAgent.includes("iphone") || userAgent.includes("ipad"));
 let uni = {};
-async function loadWebview() {
-	if (isIOSOrAndroid) uni = (await import("../../assets/js/webview/uni.webview.1.5.6.js")).default;
-	else uni = (await import("../../assets/js/webview/uni.webview.1.5.5.js")).default;
-	if (isAlipay) {
-		const scriptTag = document.createElement("script");
-		scriptTag.src = "https://appx/web-view.min.js";
-		document.head.appendChild(scriptTag);
-	}
+function loadWebview() {
+	return _loadWebview.apply(this, arguments);
+}
+function _loadWebview() {
+	_loadWebview = _asyncToGenerator(function* () {
+		if (isIOSOrAndroid) uni = (yield import("../../assets/js/webview/uni.webview.1.5.6.js")).default;
+		else uni = (yield import("../../assets/js/webview/uni.webview.1.5.5.js")).default;
+		if (isAlipay) {
+			const scriptTag = document.createElement("script");
+			scriptTag.src = "https://appx/web-view.min.js";
+			document.head.appendChild(scriptTag);
+		}
+	});
+	return _loadWebview.apply(this, arguments);
 }
 loadWebview();
 document.addEventListener("UniAppJSBridgeReady", function() {
 	uni.webView.getEnv(function(_) {});
 });
-let EMessagesType = /* @__PURE__ */ function(EMessagesType$1) {
+let EMessagesType = /* @__PURE__ */ function(EMessagesType) {
 	/** app直接调用分享 */
-	EMessagesType$1["share"] = "share";
+	EMessagesType["share"] = "share";
 	/** 设置分享参数 */
-	EMessagesType$1["shareParam"] = "shareParam";
+	EMessagesType["shareParam"] = "shareParam";
 	/** 去支付 */
-	EMessagesType$1["pay"] = "pay";
-	return EMessagesType$1;
+	EMessagesType["pay"] = "pay";
+	return EMessagesType;
 }({});
 /**
 * 原生路由跳转
@@ -45,10 +54,11 @@ const navigateTo = (parameters) => {
 	const { src, params } = parameters;
 	const url = `${src}${params ? `?${objectToQueryString(params)}` : ""}`;
 	try {
-		uni?.webView?.navigateTo?.({ url });
+		var _uni$webView, _uni$webView$navigate, _my;
+		uni === null || uni === void 0 || (_uni$webView = uni.webView) === null || _uni$webView === void 0 || (_uni$webView$navigate = _uni$webView.navigateTo) === null || _uni$webView$navigate === void 0 || _uni$webView$navigate.call(_uni$webView, { url });
 		/** 不兼容上面的方法会自动往下执行 */
-		wx.miniProgram.navigateTo({ url });
-		my?.navigateTo({ url });
+		wx === null || wx === void 0 || wx.miniProgram.navigateTo({ url });
+		(_my = my) === null || _my === void 0 || _my.navigateTo({ url });
 	} catch (error) {
 		console.error(error);
 	}
@@ -61,10 +71,11 @@ const redirectTo = (parameters) => {
 	const { src, params } = parameters;
 	const url = `${src}${params ? `?${objectToQueryString(params)}` : ""}`;
 	try {
-		uni?.webView?.redirectTo?.({ url });
+		var _uni$webView2, _uni$webView2$redirec, _my2;
+		uni === null || uni === void 0 || (_uni$webView2 = uni.webView) === null || _uni$webView2 === void 0 || (_uni$webView2$redirec = _uni$webView2.redirectTo) === null || _uni$webView2$redirec === void 0 || _uni$webView2$redirec.call(_uni$webView2, { url });
 		/** 不兼容上面的方法会自动往下执行 */
-		wx.miniProgram.redirectTo({ url });
-		my?.redirectTo({ url });
+		wx === null || wx === void 0 || wx.miniProgram.redirectTo({ url });
+		(_my2 = my) === null || _my2 === void 0 || _my2.redirectTo({ url });
 	} catch (error) {
 		console.error(error);
 	}
@@ -75,10 +86,11 @@ const redirectTo = (parameters) => {
 */
 const navigateBack = (parameters) => {
 	try {
-		uni?.webView?.navigateBack?.(parameters);
+		var _uni$webView3, _uni$webView3$navigat, _my3;
+		uni === null || uni === void 0 || (_uni$webView3 = uni.webView) === null || _uni$webView3 === void 0 || (_uni$webView3$navigat = _uni$webView3.navigateBack) === null || _uni$webView3$navigat === void 0 || _uni$webView3$navigat.call(_uni$webView3, parameters);
 		/** 不兼容上面的方法会自动往下执行 */
-		wx.miniProgram.navigateBack(parameters);
-		my?.navigateBack(parameters);
+		wx === null || wx === void 0 || wx.miniProgram.navigateBack(parameters);
+		(_my3 = my) === null || _my3 === void 0 || _my3.navigateBack(parameters);
 	} catch (error) {
 		console.error(error);
 	}
@@ -98,11 +110,13 @@ const postMessage = (data) => {
 		}
 	}
 	try {
-		uni?.webView?.postMessage({ data });
-		wx.miniProgram.postMessage({ data });
-		my?.postMessage({ data });
+		var _uni$webView4, _my4;
+		uni === null || uni === void 0 || (_uni$webView4 = uni.webView) === null || _uni$webView4 === void 0 || _uni$webView4.postMessage({ data });
+		wx === null || wx === void 0 || wx.miniProgram.postMessage({ data });
+		(_my4 = my) === null || _my4 === void 0 || _my4.postMessage({ data });
 	} catch (error) {
-		if (error?.message?.includes("my is not defined")) return;
+		var _message;
+		if (error === null || error === void 0 || (_message = error.message) === null || _message === void 0 ? void 0 : _message.includes("my is not defined")) return;
 		console.error(error);
 	}
 };
@@ -111,12 +125,11 @@ const postMessage = (data) => {
 * @param data
 */
 const setShareParam = (data, businessType) => {
-	const { shareUrl, ...res } = data;
-	const params = { data: {
-		...res,
+	const { shareUrl } = data;
+	const params = { data: _objectSpread2(_objectSpread2({}, _objectWithoutProperties(data, _excluded)), {}, {
 		businessType,
 		shareUrl: encodeURIComponent(shareUrl || "")
-	} };
+	}) };
 	postMessage({
 		type: EMessagesType.shareParam,
 		params
@@ -141,6 +154,5 @@ function objectToQueryString(obj) {
 		return `${encodeURI(key)}=${encodeURI(value)}`;
 	}).join("&");
 }
-
 //#endregion
-export { EMessagesType, isAlipay, isAndroid, isHarmony, isIOSOrAndroid, isWeixin, isiOS, navigateBack, navigateTo, postMessage, redirectTo, setShareParam, toPay };
+export { EMessagesType, isAlipay, isAndroid, isHarmony, isIOSOrAndroid, isWeixin, isiOS, navigateBack, navigateTo, postMessage, redirectTo, setShareParam, toPay };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@foundbyte/uni-libs",
   "description": "FoundByte Uni Libs",
   "author": "yangshuai <704807396@qq.com>",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "private": false,
   "type": "module",
   "main": "es/index.js",