@hlw-uni/mp-vue 2.2.7 → 2.3.0

package/dist/index.js

@@ -410,6 +410,25 @@ var __publicField = (obj, key, value) => {
     });
     return current;
   }
+  function destroyRewardAd(adId) {
+    var _a;
+    const ad = adInstances.get(adId);
+    if (ad) {
+      try {
+        (_a = ad.destroy) == null ? void 0 : _a.call(ad);
+        console.log(`[Ad] Rewarded video destroyed: ${adId}`);
+      } catch (e) {
+        console.error("[Ad] Rewarded video destroy error:", e);
+      }
+      adInstances.delete(adId);
+    }
+    if (activeRewardId === adId) {
+      activeRewardId = "";
+      rewardCallback = void 0;
+      rewardResolve = null;
+      rewardPromise = null;
+    }
+  }
   function confirmRewardAd() {
     return new Promise((resolve) => {
       uni.showModal({
@@ -434,7 +453,8 @@ var __publicField = (obj, key, value) => {
       showPopupAd,
       setRewardAd,
       showRewardAd,
-      confirmRewardAd
+      confirmRewardAd,
+      destroyRewardAd
     };
   }
   function withQuery(url, qs) {
@@ -685,9 +705,9 @@ var __publicField = (obj, key, value) => {
     return {
       appid: getAppid(device),
       app_name: app.appName || "",
-      app_version: app.appVersion || "",
-      app_version_code: app.appVersionCode || "",
-      app_channel: app.appChannel || "",
+      version: app.appVersion || "",
+      version_code: app.appVersionCode || "",
+      channel: app.appChannel || "",
       device_brand: device.brand || "",
       device_model: device.model || "",
       device_id: device.deviceId || "",
@@ -709,8 +729,7 @@ var __publicField = (obj, key, value) => {
       host_language: app.hostLanguage || "",
       host_theme: app.hostTheme || "",
       platform: device.platform || "",
-      language: app.language || "",
-      version: app.version || ""
+      language: app.language || ""
     };
   }
   function getAppid(device) {
@@ -733,14 +752,14 @@ var __publicField = (obj, key, value) => {
       platform: info.platform,
       system: info.system,
       os: info.os,
-      version: info.version,
       sdk_version: info.sdk_version,
       host_name: info.host_name,
       host_version: info.host_version,
       host_language: info.host_language,
       language: info.language,
-      app_version: info.app_version,
-      app_version_code: info.app_version_code,
+      version: info.version,
+      version_code: info.version_code,
+      channel: info.channel,
       screen_width: info.screen_width,
       screen_height: info.screen_height
     };
@@ -1164,6 +1183,7 @@ var __publicField = (obj, key, value) => {
   exports2.confirmRewardAd = confirmRewardAd;
   exports2.copy = copy;
   exports2.cosAdapter = cosAdapter;
+  exports2.destroyRewardAd = destroyRewardAd;
   exports2.download = download;
   exports2.fontFamilyPresets = fontFamilyPresets;
   exports2.fontSizePresets = fontSizePresets;

package/dist/index.mjs

@@ -409,6 +409,25 @@ function showRewardAd(onShowSuccess) {
   });
   return current;
 }
+function destroyRewardAd(adId) {
+  var _a;
+  const ad = adInstances.get(adId);
+  if (ad) {
+    try {
+      (_a = ad.destroy) == null ? void 0 : _a.call(ad);
+      console.log(`[Ad] Rewarded video destroyed: ${adId}`);
+    } catch (e) {
+      console.error("[Ad] Rewarded video destroy error:", e);
+    }
+    adInstances.delete(adId);
+  }
+  if (activeRewardId === adId) {
+    activeRewardId = "";
+    rewardCallback = void 0;
+    rewardResolve = null;
+    rewardPromise = null;
+  }
+}
 function confirmRewardAd() {
   return new Promise((resolve) => {
     uni.showModal({
@@ -433,7 +452,8 @@ function useHlwAd() {
     showPopupAd,
     setRewardAd,
     showRewardAd,
-    confirmRewardAd
+    confirmRewardAd,
+    destroyRewardAd
   };
 }
 function withQuery(url, qs) {
@@ -684,9 +704,9 @@ function collectDevice() {
   return {
     appid: getAppid(device),
     app_name: app.appName || "",
-    app_version: app.appVersion || "",
-    app_version_code: app.appVersionCode || "",
-    app_channel: app.appChannel || "",
+    version: app.appVersion || "",
+    version_code: app.appVersionCode || "",
+    channel: app.appChannel || "",
     device_brand: device.brand || "",
     device_model: device.model || "",
     device_id: device.deviceId || "",
@@ -708,8 +728,7 @@ function collectDevice() {
     host_language: app.hostLanguage || "",
     host_theme: app.hostTheme || "",
     platform: device.platform || "",
-    language: app.language || "",
-    version: app.version || ""
+    language: app.language || ""
   };
 }
 function getAppid(device) {
@@ -732,14 +751,14 @@ function getQueryInfo(info) {
     platform: info.platform,
     system: info.system,
     os: info.os,
-    version: info.version,
     sdk_version: info.sdk_version,
     host_name: info.host_name,
     host_version: info.host_version,
     host_language: info.host_language,
     language: info.language,
-    app_version: info.app_version,
-    app_version_code: info.app_version_code,
+    version: info.version,
+    version_code: info.version_code,
+    channel: info.channel,
     screen_width: info.screen_width,
     screen_height: info.screen_height
   };
@@ -1164,6 +1183,7 @@ export {
   confirmRewardAd,
   copy,
   cosAdapter,
+  destroyRewardAd,
   download,
   fontFamilyPresets,
   fontSizePresets,

package/dist/utils/ad/index.d.ts

@@ -43,6 +43,12 @@ export declare function setRewardAd(adId: string, done?: (res: AdRes) => void):
  * @returns 返回 Promise<AdRes>，指示广告是否正常播放完毕
  */
 export declare function showRewardAd(onShowSuccess?: () => void): Promise<AdRes>;
+/**
+ * 销毁指定 Unit ID 的激励视频广告实例，释放内存与原生渲染层绑定并清除缓存。
+ *
+ * @param adId 广告单元 ID
+ */
+export declare function destroyRewardAd(adId: string): void;
 /**
  * 弹窗提示需要看完广告才有奖励。
  * 提供“继续观看”和“取消”按钮。
@@ -58,4 +64,5 @@ export declare function useHlwAd(): {
     setRewardAd: typeof setRewardAd;
     showRewardAd: typeof showRewardAd;
     confirmRewardAd: typeof confirmRewardAd;
+    destroyRewardAd: typeof destroyRewardAd;
 };

package/dist/utils/device/index.d.ts

@@ -7,11 +7,11 @@ export interface DeviceInfo {
     /** 应用名称 */
     app_name: string;
     /** 小程序版本号（版本名称） */
-    app_version: string;
+    version: string;
     /** 小程序版本号（版本号） */
-    app_version_code: string;
+    version_code: string;
     /** 小程序来源渠道 */
-    app_channel: string;
+    channel: string;
     /** 设备 brand。如：apple、huawei */
     device_brand: string;
     /** 设备型号 */
@@ -56,13 +56,11 @@ export interface DeviceInfo {
     platform: string;
     /** 客户端语言 */
     language: string;
-    /** 客户端版本号 */
-    version: string;
 }
 /**
  * 过滤后常用于接口公共请求 Query 的设备字段子集。
  */
-export type DeviceQueryInfo = Pick<DeviceInfo, "appid" | "device_brand" | "device_model" | "device_id" | "device_type" | "device_orientation" | "platform" | "system" | "os" | "version" | "sdk_version" | "host_name" | "host_version" | "host_language" | "language" | "app_version" | "app_version_code" | "screen_width" | "screen_height">;
+export type DeviceQueryInfo = Pick<DeviceInfo, "appid" | "device_brand" | "device_model" | "device_id" | "device_type" | "device_orientation" | "platform" | "system" | "os" | "sdk_version" | "host_name" | "host_version" | "host_language" | "language" | "version" | "version_code" | "channel" | "screen_width" | "screen_height">;
 /**
  * 获取缓存后的设备信息数据。
  */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hlw-uni/mp-vue",
-    "version": "2.2.7",
+    "version": "2.3.0",
     "description": "hlw-uni 小程序运行时 — Vue 组件 + composables + theme + http + 工具集（合并自原 mp-core）",
     "main": "dist/index.js",
     "module": "dist/index.mjs",

package/src/components/hlw-reward-ad/index.vue

@@ -5,8 +5,8 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, watch } from "vue";
-import { setRewardAd, showRewardAd, confirmRewardAd } from "../../utils/ad";
+import { ref, onMounted, watch, onUnmounted } from "vue";
+import { setRewardAd, showRewardAd, confirmRewardAd, destroyRewardAd } from "../../utils/ad";
 
 defineOptions({ name: "HlwRewardAd" });
 
@@ -18,7 +18,7 @@ interface Props {
 const props = defineProps<Props>();
 
 const emit = defineEmits<{
-    (e: "onHandle", res: { success: boolean; isEnded: boolean; err?: any }): void;
+    (e: "onHandle", res: { success: boolean; isEnded: boolean; loadFailed?: boolean; err?: any }): void;
 }>();
 
 // 点击锁定状态，防止连续多次点击重复触发广告
@@ -84,6 +84,7 @@ async function playRewardAdFlow(): Promise<void> {
             emit("onHandle", {
                 success: false,
                 isEnded: false,
+                loadFailed: true,
                 err: res.err,
             });
         } else {
@@ -105,6 +106,7 @@ async function playRewardAdFlow(): Promise<void> {
         emit("onHandle", {
             success: false,
             isEnded: false,
+            loadFailed: true,
             err: e,
         });
     }
@@ -146,6 +148,10 @@ defineExpose({
         }
     }
 });
+
+onUnmounted(() => {
+    destroyRewardAd(props.unitId);
+});
 </script>
 
 <style scoped>

package/src/utils/ad/index.ts

@@ -196,6 +196,30 @@ export function showRewardAd(onShowSuccess?: () => void): Promise<AdRes> {
     return current;
 }
 
+/**
+ * 销毁指定 Unit ID 的激励视频广告实例，释放内存与原生渲染层绑定并清除缓存。
+ * 
+ * @param adId 广告单元 ID
+ */
+export function destroyRewardAd(adId: string) {
+    const ad = adInstances.get(adId);
+    if (ad) {
+        try {
+            ad.destroy?.();
+            console.log(`[Ad] Rewarded video destroyed: ${adId}`);
+        } catch (e) {
+            console.error("[Ad] Rewarded video destroy error:", e);
+        }
+        adInstances.delete(adId);
+    }
+    if (activeRewardId === adId) {
+        activeRewardId = "";
+        rewardCallback = undefined;
+        rewardResolve = null;
+        rewardPromise = null;
+    }
+}
+
 /**
  * 弹窗提示需要看完广告才有奖励。
  * 提供“继续观看”和“取消”按钮。
@@ -230,5 +254,6 @@ export function useHlwAd() {
         setRewardAd,
         showRewardAd,
         confirmRewardAd,
+        destroyRewardAd,
     };
 }

package/src/utils/device/index.ts

@@ -13,11 +13,11 @@ export interface DeviceInfo {
     /** 应用名称 */
     app_name: string;
     /** 小程序版本号（版本名称） */
-    app_version: string;
+    version: string;
     /** 小程序版本号（版本号） */
-    app_version_code: string;
+    version_code: string;
     /** 小程序来源渠道 */
-    app_channel: string;
+    channel: string;
     /** 设备 brand。如：apple、huawei */
     device_brand: string;
     /** 设备型号 */
@@ -62,33 +62,14 @@ export interface DeviceInfo {
     platform: string;
     /** 客户端语言 */
     language: string;
-    /** 客户端版本号 */
-    version: string;
 }
 
 /**
  * 过滤后常用于接口公共请求 Query 的设备字段子集。
  */
-export type DeviceQueryInfo = Pick<DeviceInfo,
-    | "appid"
-    | "device_brand"
-    | "device_model"
-    | "device_id"
-    | "device_type"
-    | "device_orientation"
-    | "platform"
-    | "system"
-    | "os"
-    | "version"
-    | "sdk_version"
-    | "host_name"
-    | "host_version"
-    | "host_language"
-    | "language"
-    | "app_version"
-    | "app_version_code"
-    | "screen_width"
-    | "screen_height"
+export type DeviceQueryInfo = Pick<
+    DeviceInfo,
+    "appid" | "device_brand" | "device_model" | "device_id" | "device_type" | "device_orientation" | "platform" | "system" | "os" | "sdk_version" | "host_name" | "host_version" | "host_language" | "language" | "version" | "version_code" | "channel" | "screen_width" | "screen_height"
 >;
 
 let deviceCache: DeviceInfo | null = null;
@@ -126,9 +107,9 @@ function collectDevice(): DeviceInfo {
     return {
         appid: getAppid(device),
         app_name: (app.appName as string) || "",
-        app_version: (app.appVersion as string) || "",
-        app_version_code: (app.appVersionCode as string) || "",
-        app_channel: (app.appChannel as string) || "",
+        version: (app.appVersion as string) || "",
+        version_code: (app.appVersionCode as string) || "",
+        channel: (app.appChannel as string) || "",
         device_brand: (device.brand as string) || "",
         device_model: (device.model as string) || "",
         device_id: (device.deviceId as string) || "",
@@ -151,7 +132,6 @@ function collectDevice(): DeviceInfo {
         host_theme: (app.hostTheme as string) || "",
         platform: (device.platform as string) || "",
         language: (app.language as string) || "",
-        version: (app.version as string) || "",
     };
 }
 
@@ -181,14 +161,14 @@ function getQueryInfo(info: DeviceInfo): DeviceQueryInfo {
         platform: info.platform,
         system: info.system,
         os: info.os,
-        version: info.version,
         sdk_version: info.sdk_version,
         host_name: info.host_name,
         host_version: info.host_version,
         host_language: info.host_language,
         language: info.language,
-        app_version: info.app_version,
-        app_version_code: info.app_version_code,
+        version: info.version,
+        version_code: info.version_code,
+        channel: info.channel,
         screen_width: info.screen_width,
         screen_height: info.screen_height,
     };