@foundbyte/uni-libs 0.0.13 → 0.0.15

package/es/entry.d.ts

@@ -1,16 +1,15 @@
 import { IOneTravelSDKConfig } from "./types/one-travel-service/index.js";
 import { GoodsService } from "./services/goods/service.js";
-import { NativeAppService } from "./services/native-app/service.js";
 import { IAppConfig } from "./configs/app/app.type.js";
 
 //#region src/entry.d.ts
+
 /**
  * 一码游SDK
  */
 declare class OneTravelSDK {
   private sdkConfig;
   readonly goodsService: GoodsService;
-  readonly nativeAppService: NativeAppService;
   constructor(config?: Partial<IOneTravelSDKConfig>);
   /**
    * 获取App配置信息

package/es/entry.js

@@ -2,7 +2,6 @@ import { EAppEnv } from "./enums/environment/index.js";
 import { ECaller } from "./enums/sdk/index.js";
 import { getAppConfig } from "./configs/app/index.js";
 import { GoodsService } from "./services/goods/service.js";
-import { NativeAppService } from "./services/native-app/service.js";
 
 //#region src/entry.ts
 /**
@@ -11,7 +10,6 @@ import { NativeAppService } from "./services/native-app/service.js";
 var OneTravelSDK = class {
 	sdkConfig;
 	goodsService;
-	nativeAppService;
 	constructor(config) {
 		const value = {
 			appEnv: EAppEnv.prod,
@@ -20,7 +18,6 @@ var OneTravelSDK = class {
 		};
 		this.sdkConfig = value;
 		this.goodsService = new GoodsService({ sdkConfig: value });
-		this.nativeAppService = new NativeAppService({ sdkConfig: value });
 	}
 	/**
 	* 获取App配置信息

package/es/enums/platform/index.d.ts

@@ -0,0 +1,8 @@
+//#region src/enums/platform/index.d.ts
+declare enum EUniPlatform {
+  android = "android",
+  ios = "ios",
+  harmony = "harmony",
+}
+//#endregion
+export { EUniPlatform };

package/es/enums/platform/index.js

@@ -0,0 +1,10 @@
+//#region src/enums/platform/index.ts
+let EUniPlatform = /* @__PURE__ */ function(EUniPlatform$1) {
+	EUniPlatform$1["android"] = "android";
+	EUniPlatform$1["ios"] = "ios";
+	EUniPlatform$1["harmony"] = "harmony";
+	return EUniPlatform$1;
+}({});
+
+//#endregion
+export { EUniPlatform };

package/es/index.d.ts

@@ -6,6 +6,7 @@ import { ECaller } from "./enums/sdk/index.js";
 import { EVenueSimpleTypes, EVenueTypes } from "./enums/sub/enjoy/index.js";
 import { EFoodPackageType, EFoodsModuleType } from "./enums/sub/foods/index.js";
 import { EHotelType } from "./enums/sub/hotel/index.js";
+import { EUniPlatform } from "./enums/platform/index.js";
 import { IOneTravelSDKConfig } from "./types/one-travel-service/index.js";
 import { getQueryParameters, isEmpty, query2url } from "./utils/common/index.js";
 import { ActivityCalendarDetailPageParams, getActivityCalendarDetailPage } from "./utils/pages/activity-calendar/index.js";
@@ -13,6 +14,7 @@ import { WebviewPageParams, getWebviewPage } from "./utils/pages/webview/index.j
 import { getFoodPackagePage, getFoodStorePage } from "./utils/pages/food/index.js";
 import { getMoviePage } from "./utils/pages/movie/index.js";
 import { EMessagesType, navigateBack, navigateTo, postMessage, redirectTo } from "./utils/web-view/index.js";
-import { isAndroid, isApp, isH5, isHarmony, isWeixin, isiOS } from "./utils/uni-env/index.js";
+import { getSystemInfoSync, isAndroid, isApp, isH5, isHarmony, isWeixin, isiOS } from "./utils/uni-env/index.js";
+import { checkAndRequestNativeAppPermission } from "./utils/native-app/index.js";
 import { OneTravelSDK } from "./entry.js";
-export { ActivityCalendarDetailPageParams, BusinessLineDict, EAppEnv, EBusinessLine, ECaller, EFoodPackageType, EFoodsModuleType, EHotelType, EMessagesType, ESubBizType, EVenueSimpleTypes, EVenueTypes, IOneTravelSDKConfig, OneTravelSDK, WebviewPageParams, app_permission, getActivityCalendarDetailPage, getFoodPackagePage, getFoodStorePage, getMoviePage, getQueryParameters, getWebviewPage, isAndroid, isApp, isEmpty, isH5, isHarmony, isWeixin, isiOS, navigateBack, navigateTo, postMessage, query2url, redirectTo, routePrefix, routes };
+export { ActivityCalendarDetailPageParams, BusinessLineDict, EAppEnv, EBusinessLine, ECaller, EFoodPackageType, EFoodsModuleType, EHotelType, EMessagesType, ESubBizType, EUniPlatform, EVenueSimpleTypes, EVenueTypes, IOneTravelSDKConfig, OneTravelSDK, WebviewPageParams, app_permission, checkAndRequestNativeAppPermission, getActivityCalendarDetailPage, getFoodPackagePage, getFoodStorePage, getMoviePage, getQueryParameters, getSystemInfoSync, getWebviewPage, isAndroid, isApp, isEmpty, isH5, isHarmony, isWeixin, isiOS, navigateBack, navigateTo, postMessage, query2url, redirectTo, routePrefix, routes };

package/es/index.js

@@ -6,13 +6,15 @@ import { ECaller } from "./enums/sdk/index.js";
 import { EVenueSimpleTypes, EVenueTypes } from "./enums/sub/enjoy/index.js";
 import { EFoodPackageType, EFoodsModuleType } from "./enums/sub/foods/index.js";
 import { EHotelType } from "./enums/sub/hotel/index.js";
+import { EUniPlatform } from "./enums/platform/index.js";
 import { getQueryParameters, isEmpty, query2url } from "./utils/common/index.js";
 import { getActivityCalendarDetailPage } from "./utils/pages/activity-calendar/index.js";
 import { getWebviewPage } from "./utils/pages/webview/index.js";
 import { getFoodPackagePage, getFoodStorePage } from "./utils/pages/food/index.js";
 import { getMoviePage } from "./utils/pages/movie/index.js";
 import { EMessagesType, navigateBack, navigateTo, postMessage, redirectTo } from "./utils/web-view/index.js";
-import { isAndroid, isApp, isH5, isHarmony, isWeixin, isiOS } from "./utils/uni-env/index.js";
+import { getSystemInfoSync, isAndroid, isApp, isH5, isHarmony, isWeixin, isiOS } from "./utils/uni-env/index.js";
+import { checkAndRequestNativeAppPermission } from "./utils/native-app/index.js";
 import { OneTravelSDK } from "./entry.js";
 
-export { BusinessLineDict, EAppEnv, EBusinessLine, ECaller, EFoodPackageType, EFoodsModuleType, EHotelType, EMessagesType, ESubBizType, EVenueSimpleTypes, EVenueTypes, OneTravelSDK, app_permission, getActivityCalendarDetailPage, getFoodPackagePage, getFoodStorePage, getMoviePage, getQueryParameters, getWebviewPage, isAndroid, isApp, isEmpty, isH5, isHarmony, isWeixin, isiOS, navigateBack, navigateTo, postMessage, query2url, redirectTo, routePrefix, routes };
+export { BusinessLineDict, EAppEnv, EBusinessLine, ECaller, EFoodPackageType, EFoodsModuleType, EHotelType, EMessagesType, ESubBizType, EUniPlatform, EVenueSimpleTypes, EVenueTypes, OneTravelSDK, app_permission, checkAndRequestNativeAppPermission, getActivityCalendarDetailPage, getFoodPackagePage, getFoodStorePage, getMoviePage, getQueryParameters, getSystemInfoSync, getWebviewPage, isAndroid, isApp, isEmpty, isH5, isHarmony, isWeixin, isiOS, navigateBack, navigateTo, postMessage, query2url, redirectTo, routePrefix, routes };

package/es/utils/native-app/index.d.ts

@@ -0,0 +1,15 @@
+import { app_permission } from "../../constants/permission/index.js";
+
+//#region src/utils/native-app/index.d.ts
+
+/**
+ * 检测并申请app权限
+ * @param options
+ */
+declare const checkAndRequestNativeAppPermission: (options: {
+  type: keyof typeof app_permission;
+  success?: () => void;
+  fail?: () => void;
+}) => void;
+//#endregion
+export { checkAndRequestNativeAppPermission };

package/es/utils/native-app/index.js

@@ -0,0 +1,115 @@
+import { app_permission } from "../../constants/permission/index.js";
+import { isH5, isHarmony, isWeixin, isiOS } from "../uni-env/index.js";
+
+//#region src/utils/native-app/index.ts
+let plusNativeObjView;
+/**
+* 关闭安卓提示弹框
+*/
+const closeAndroidTip = () => {
+	if (plusNativeObjView) {
+		plusNativeObjView.close();
+		plusNativeObjView = void 0;
+	}
+};
+/**
+* 显示安卓提示弹框
+* @param options
+*/
+const showAndroidTip = (options) => {
+	const { title, value } = options;
+	plusNativeObjView = new plus.nativeObj.View("per-modal", {
+		top: "0px",
+		left: "0px",
+		width: "100%",
+		backgroundColor: "rgba(0,0,0,0.2)"
+	});
+	plusNativeObjView.drawRect({
+		color: "#fff",
+		radius: "5px"
+	}, {
+		top: "45px",
+		left: "5%",
+		width: "90%",
+		height: "130px"
+	});
+	plusNativeObjView.drawText(title, {
+		top: "50px",
+		left: "8%",
+		height: "30px"
+	}, {
+		align: "left",
+		weight: "bold",
+		color: "#000"
+	});
+	plusNativeObjView.drawText(value, {
+		top: "75px",
+		height: "90px",
+		left: "8%",
+		width: "84%"
+	}, {
+		whiteSpace: "normal",
+		size: "14px",
+		align: "left",
+		color: "#656563"
+	});
+	plusNativeObjView.show();
+};
+/**
+* 检测并申请app权限
+* @param options
+*/
+const checkAndRequestNativeAppPermission = (options) => {
+	const { type, success, fail } = options || {};
+	if (isWeixin() || isH5() || isHarmony() || isiOS()) {
+		success?.();
+		return;
+	}
+	const ActivityCompat = plus.android.importClass("androidx.core.app.ActivityCompat");
+	const PackageManager = plus.android.importClass("android.content.pm.PackageManager");
+	const context = plus.android.runtimeMainActivity();
+	const detail = app_permission[type];
+	let hasPermission = false;
+	detail.permissionId.forEach((item) => {
+		if (ActivityCompat.checkSelfPermission(context, item) !== PackageManager.PERMISSION_GRANTED) {
+			hasPermission = true;
+			return;
+		}
+	});
+	if (!hasPermission) {
+		success?.();
+		return;
+	}
+	showAndroidTip(detail);
+	plus.android.requestPermissions(detail.permissionId, function(resultObj) {
+		if (resultObj.granted.length > 0) {
+			closeAndroidTip();
+			success?.();
+			return;
+		}
+		if (resultObj.deniedPresent.length > 0) {
+			closeAndroidTip();
+			fail?.();
+			return;
+		}
+		if (resultObj.deniedAlways.length > 0) {
+			uni.showModal({
+				title: "提示",
+				content: app_permission[type].denied,
+				confirmText: "去设置",
+				success: function(res) {
+					closeAndroidTip();
+					if (res.confirm) uni.openAppAuthorizeSetting({ success: () => fail?.() });
+					if (res.cancel) fail?.();
+				}
+			});
+			return;
+		}
+	}, function() {
+		closeAndroidTip();
+		fail?.();
+	});
+};
+
+//#endregion
+export { checkAndRequestNativeAppPermission };

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

@@ -29,5 +29,28 @@ declare const isAndroid: () => boolean;
  * @returns
  */
 declare const isiOS: () => 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 { isAndroid, isApp, isH5, isHarmony, isWeixin, isiOS };
+export { getSystemInfoSync, isAndroid, isApp, isH5, isHarmony, isWeixin, isiOS };

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

@@ -1,3 +1,5 @@
+import { EUniPlatform } from "../../enums/platform/index.js";
+
 //#region src/utils/uni-env/index.ts
 /**
 * 是否是web环境
@@ -33,15 +35,23 @@ const isApp = () => {
 * @returns
 */
 const isAndroid = () => {
-	return true;
+	if (isApp() && getSystemInfoSync().platform === EUniPlatform.android) return true;
+	return false;
 };
 /**
 * 是否是iOS
 * @returns
 */
 const isiOS = () => {
-	return true;
+	if (isApp() && getSystemInfoSync().platform === EUniPlatform.ios) return true;
+	return false;
 };
+function getSystemInfoSync() {
+	return {
+		...uni.getDeviceInfo(),
+		...uni.getWindowInfo()
+	};
+}
 
 //#endregion
-export { isAndroid, isApp, isH5, isHarmony, isWeixin, isiOS };
+export { getSystemInfoSync, isAndroid, isApp, isH5, isHarmony, isWeixin, isiOS };

package/package.json

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

package/es/services/native-app/service.d.ts

@@ -1,29 +0,0 @@
-import { app_permission } from "../../constants/permission/index.js";
-import { IOneTravelSDKConfig } from "../../types/one-travel-service/index.js";
-
-//#region src/services/native-app/service.d.ts
-type INativeAppServiceConfig = {
-  sdkConfig: IOneTravelSDKConfig;
-};
-declare class NativeAppService {
-  private nativeAppServiceConfig;
-  constructor(config: INativeAppServiceConfig);
-  /**
-   * 关闭安卓提示弹框
-   */
-  private closeAndroidTip;
-  /**
-   * 显示安卓提示弹框
-   * @param options
-   */
-  private showAndroidTip;
-  /**
-   * 检测并申请app权限
-   * @param type
-   * @param success
-   * @param fail
-   */
-  checkAndRequestNativeAppPermissions: (type: keyof typeof app_permission, success?: () => void, fail?: () => void) => void;
-}
-//#endregion
-export { NativeAppService };

package/es/services/native-app/service.js

@@ -1,123 +0,0 @@
-import { app_permission } from "../../constants/permission/index.js";
-import { isH5, isHarmony, isWeixin, isiOS } from "../../utils/uni-env/index.js";
-
-//#region src/services/native-app/service.ts
-let view;
-var NativeAppService = class {
-	nativeAppServiceConfig;
-	constructor(config) {
-		this.nativeAppServiceConfig = config;
-	}
-	/**
-	* 关闭安卓提示弹框
-	*/
-	closeAndroidTip = () => {
-		if (view) {
-			view.close();
-			view = void 0;
-		}
-	};
-	/**
-	* 显示安卓提示弹框
-	* @param options
-	*/
-	showAndroidTip = (options) => {
-		const { title, value } = options;
-		view = new plus.nativeObj.View("per-modal", {
-			top: "0px",
-			left: "0px",
-			width: "100%",
-			backgroundColor: "rgba(0,0,0,0.2)"
-		});
-		view.drawRect({
-			color: "#fff",
-			radius: "5px"
-		}, {
-			top: "45px",
-			left: "5%",
-			width: "90%",
-			height: "130px"
-		});
-		view.drawText(title, {
-			top: "50px",
-			left: "8%",
-			height: "30px"
-		}, {
-			align: "left",
-			weight: "bold",
-			color: "#000"
-		});
-		view.drawText(value, {
-			top: "75px",
-			height: "90px",
-			left: "8%",
-			width: "84%"
-		}, {
-			whiteSpace: "normal",
-			size: "14px",
-			align: "left",
-			color: "#656563"
-		});
-		view.show();
-	};
-	/**
-	* 检测并申请app权限
-	* @param type
-	* @param success
-	* @param fail
-	*/
-	checkAndRequestNativeAppPermissions = (type, success, fail) => {
-		let that = this;
-		if (isWeixin() || isH5() || isHarmony() || isiOS()) {
-			success?.();
-			return;
-		}
-		const ActivityCompat = plus.android.importClass("androidx.core.app.ActivityCompat");
-		const PackageManager = plus.android.importClass("android.content.pm.PackageManager");
-		const context = plus.android.runtimeMainActivity();
-		const detail = app_permission[type];
-		let hasPermission = false;
-		detail.permissionId.forEach((item) => {
-			if (ActivityCompat.checkSelfPermission(context, item) !== PackageManager.PERMISSION_GRANTED) {
-				hasPermission = true;
-				return;
-			}
-		});
-		if (!hasPermission) {
-			success?.();
-			return;
-		}
-		that.showAndroidTip(detail);
-		plus.android.requestPermissions(detail.permissionId, function(resultObj) {
-			if (resultObj.granted.length > 0) {
-				that.closeAndroidTip();
-				success?.();
-				return;
-			}
-			if (resultObj.deniedPresent.length > 0) {
-				that.closeAndroidTip();
-				fail?.();
-				return;
-			}
-			if (resultObj.deniedAlways.length > 0) {
-				uni.showModal({
-					title: "提示",
-					content: app_permission[type].denied,
-					confirmText: "去设置",
-					success: function(res) {
-						that.closeAndroidTip();
-						if (res.confirm) uni.openAppAuthorizeSetting({ success: () => fail?.() });
-						if (res.cancel) fail?.();
-					}
-				});
-				return;
-			}
-		}, function() {
-			that.closeAndroidTip();
-			fail?.();
-		});
-	};
-};
-
-//#endregion
-export { NativeAppService };