Merge remote-tracking branch 'origin/master'

entry/src/main/ets/alipay/OrderInfoUtil.ets

@@ -1,6 +1,16 @@
 import { DateUtil } from '@pura/harmony-utils';
 import { SignUtils } from './SignUtils';
 
+interface BizContent {
+  timeout_express: string;
+  product_code: string;
+  total_amount: string;
+  subject: string;
+  body: string;
+  out_trade_no: string;
+  passback_params: string;
+}
+
 export class OrderInfoUtil {
   static readonly APP_ID = '2019091067184257';//七梦支付宝appid
   static totalAmount = 0.01;
@@ -16,8 +26,9 @@ export class OrderInfoUtil {
    */
   static readonly RSA2_PRIVATE = 'MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCE9pDxmlrXJa2KH2vv7dqGKnepLD6eF6rJxQ/SCHmXBY93pzfXmu2KSscyrCl5OPZSgmQV5KSOFyIJmJyRDZAk5wTXUno2B9/P8xo05aMpijSIdJeWjX1xgZOddiicHjr3EKKwBzDkukw1gtcnuaGy/qzMG84VYbBoj75pG0AD+a0EdkDSf9XO4wy/1pMyzFeitNhCr9vKyl/W45GQZYgJsKOjlIwmdyNLZz/vsKJJeUYqlZ6wI8bY+P3+Gq80uMZoKi5xxCW3TPj8Y7gv5Nb3uWc1LZfKr8gAIi3yvaN8Tj5zHgBTjIYc9+0RhMvof96Cu2pIpc99ERjc0bbhD57nAgMBAAECggEARt1m+O2sdriFGnWOwIyDiDhAGHEVWosAopMd0HJl44C6Kyp7T7Up3yflrPMnE42xct4925FFxtk7cePdpk2VQqXB5cT2j694sMs/b2vony4iu4twc3QrpIBMHYMpN7PA94btPmZGv9Eu5uI6K9j6/nxPumUjXC/5pnDeKgS1BKibrDqZzR7tQ6tdUZfaAGV0247xHwO9BEKMz5Xrl4CxktbfAN9vmb0z0AHhbLAGgAyDRE7imQ8PBT0NfGcu1ubpNGc37Mg+Ss78tBRUHxBcAOJgBT0w8mj3gweRJ/Xy3/rcgnQTVJXRaIjvNUxAiG5pRQH+w9NfV/JnmLjSQ4Kd+QKBgQC/U2hx1abJtVAyZfoqxItH8qH58dYzrF6oQXdmFBqqrD4MuYsNEtzyZnr2yFS/PkQLFMThMFWmGQGCByFjTazBD4+rB34ZT3igPEPlGLPDbVa+qegtO15cNoF0cykOpwI5V8Sb9y/WFPOq/OERZlhcU5RzkC/BqfrOg7PFd9NS3QKBgQCx6K4iMLX/FhZyrjI//JF7cr6sZ5Q2dzWVXsVhB3px7E3hAam+r1zobAnGbULXf/Q0SPqmJiKw7UKncBzMERp8476T5By7xRVlgLKVAoFcAIsQj+xyQEQ1CBJW+7xI3BXvPd1+iSKAY6SolZ847ImTJepgFBT2pb5SaqUuP3mSkwKBgD0PraHHAjgV+cZb7X+AwsLvmOpgWHCdbohcfHLDr88Qsaz1+n7tqj5inpPsU7/Fa4nt0vfbqTodePG6vNkojR4AjWWUOpZxWpopIbIYNCcG2kx3hXYKII9lheNYbZ4Thw4uCL2OImI8xZeopVwcQc8VjadkORmh2j3WoqU/HN6xAoGAPjujdihN8Z47WgBfaYyjI2i/FDXjXa4Tm12cc9WW2nULxRK82wwi1ta8EKI1yIZk2UlSDH64keVc9I8+M5AkEN3l03vvJSvK0UfUsFVBBPrXqoJ99nVOprJdH/pNIbuDHL4qVdIItJqmhaZZHSN4+HVB6Dv+HU1bJx9RCr1/fGsCgYEAh5l2zfXPPyQ/IkLQxJXKsZdZpuGUtea9+RGnzWuEesoYT7puEx2PAXWidHpDf2SWkMVr4oHYBi8QI2uepORBA6ZJ8I8dW3xILzqfUUISKVjczNFqG7dJPmyaYuWWEYSVkhbXl3NMcX00FdMCCK+R68I10oAGiK/sugqitJ4Uoz4=';
 
-  static async getOrderInfo(price:number,appName:string): Promise<string> {
-    const keyValues = OrderInfoUtil.buildOrderParamMap(price,appName);
+  static async getOrderInfo(price: number, appName: string, userId: number, planId: string): Promise<string> {
+    const keyValues = OrderInfoUtil.buildOrderParamMap(price, appName, userId, planId);
+    console.log('Heanup alipay keyValues:'+JSON.stringify(keyValues))
     let orderParam = OrderInfoUtil.buildOrderParam(keyValues);
     let sign = await OrderInfoUtil.getSign(keyValues);
     return orderParam + '&sign=' + sign;
@@ -33,44 +44,50 @@ export class OrderInfoUtil {
   }
 
   static async getSign(keyValues: Map<string, string>): Promise<string> {
-    let mapEntries = Array.from(keyValues.keys());
-    mapEntries.sort((a, b) => {
-      return a[0].localeCompare(b[0]);
-    });
-    let sortedKeyValues = new Map<string, string>();
-    mapEntries.forEach(entry => {
-      sortedKeyValues.set(entry[0], entry[1]);
-    });
+    let mapKeys = Array.from(keyValues.keys());
+    mapKeys.sort();
     let param = '';
-    keyValues.forEach((value, key) => {
-      param += key + '=' + value + '&';
-    });
+    for (const key of mapKeys) {
+      param += `${key}=${keyValues.get(key)}&`;
+    }
     param = param.substring(0, param.length - 1);
     let oriSign = await SignUtils.sign(param, OrderInfoUtil.RSA2_PRIVATE);
     return encodeURIComponent(oriSign);
   }
 
-  static buildOrderParamMap(price:number,appName:string): Map<string, string> {
+  static buildOrderParamMap(price: number, appName: string, userId: number, planId: string): Map<string, string> {
     const keyValues = new Map<string, string>()
+    const bizContent: BizContent = {} as BizContent;
+    bizContent.timeout_express = "30m";
+    bizContent.product_code = "QUICK_MSECURITY_PAY";
+    bizContent.total_amount = `${price}`;
+    bizContent.subject = `${appName}`;
+    bizContent.body = `uid:${userId},planId:${planId}`;
+    bizContent.out_trade_no = `${OrderInfoUtil.getOutTradeNo(userId, planId)}`;
+    bizContent.passback_params = encodeURIComponent(`uid=${userId}&plan_id=${planId}`);
+
     keyValues.set('app_id', OrderInfoUtil.APP_ID);
-    // 不能包含中文，否则加密会有问题。。。。。。。。。。。。
-    keyValues.set('biz_content', `{"timeout_express":"30m","product_code":"QUICK_MSECURITY_PAY","total_amount":"${price}","subject":"${appName}","body":"xxx","out_trade_no":"${OrderInfoUtil.getOutTradeNo()}"}`);
+    keyValues.set('biz_content', JSON.stringify(bizContent));
     OrderInfoUtil.totalAmount = price + 0.01;
     keyValues.set('charset', 'utf-8');
     keyValues.set('method', 'alipay.trade.app.pay');
     keyValues.set('sign_type', 'RSA2');
     keyValues.set('timestamp', DateUtil.getTodayStr());
     keyValues.set('version', '1.0');
+    keyValues.set('notify_url', 'https://pay.ss5.xyz/alipay/notify');
     return keyValues;
   }
 
-  static getOutTradeNo() {
-    let date = new Date();
-    let key = (date.getMonth().toString() + date.getDate().toString() + date.getHours().toString() + date.getMinutes()
-      .toString() + date.getSeconds().toString()).toString();
-    let r = Math.random() * 10000000;
-    key = key + r;
-    key = key.substring(0, 15);
-    return key;
+  static getOutTradeNo(userId: number, planId: string): string {
+    const date = new Date();
+    const timeStr = date.getFullYear().toString() +
+      (date.getMonth() + 1).toString().padStart(2, '0') +
+      date.getDate().toString().padStart(2, '0') +
+      date.getHours().toString().padStart(2, '0') +
+      date.getMinutes().toString().padStart(2, '0') +
+      date.getSeconds().toString().padStart(2, '0');
+    const randomStr = Math.floor(Math.random() * 10000).toString().padStart(4, '0');
+    const tradeNo = `TTM-u${userId}-p${planId}-${timeStr}-${randomStr}`;
+    return tradeNo.substring(0, 64);
   }
 }

entry/src/main/ets/common/util/UserUtil.ets

@@ -0,0 +1,383 @@
+import { cryptoFramework } from "@kit.CryptoArchitectureKit";
+import { LogUtil, PreferencesUtil, StrUtil, ToastUtil } from "@pura/harmony-utils";
+import { CommonConstants } from "../constants/CommonConstants";
+import { http } from "@kit.NetworkKit";
+import { bundleManager } from "@kit.AbilityKit";
+import { BusinessError } from '@kit.BasicServicesKit';
+import { hilog } from "@kit.PerformanceAnalysisKit";
+
+// 用户相关接口定义
+export interface WechatUserInfo {
+  openid?: string;
+  nickname?: string;
+  sex?: number;
+  language?: string;
+  city?: string;
+  province?: string;
+  country?: string;
+  headimgurl?: string;
+  privilege?: string[];
+  unionid?: string;
+}
+
+export interface Subscription {
+  plan_id: string;
+  plan_name: string;
+  plan_description: string;
+  price: string;
+  start_date: string;
+  end_date: string;
+  status: string;
+  auto_renew: string;
+  features: string[];
+}
+
+export interface SubscriptionInfo {
+  has_active_subscription: boolean;
+  subscriptions: Subscription[];
+}
+
+export interface responseData {
+  token_info?: object;
+  user_info: WechatUserInfo;
+}
+
+export interface WechatUserInfoData {
+  token_info?: object;
+  user_info: WechatUserInfo;
+  system_info?: SystemInfo;
+  subscription_info?: SubscriptionInfo;
+}
+
+export interface WechatUserInfoApiResponse {
+  code: number;
+  msg: string;
+  data: WechatUserInfoData;
+}
+
+export interface HuaweiUserInfo {
+  openid: string;
+  unionid?: string;
+  nickname: string;
+  headimgurl: string;
+}
+
+export interface SystemInfo {
+  user_id: number | string;
+  token: string;
+}
+
+export interface HuaweiUserInfoApiData {
+  user_info: HuaweiUserInfo;
+  system_info?: SystemInfo;
+  subscription_info?: SubscriptionInfo;
+}
+
+export interface HuaweiUserInfoApiResponse {
+  code: number;
+  msg: string;
+  data: HuaweiUserInfoApiData;
+}
+
+export interface VipFeature {
+  icon: Resource;
+  title: string;
+  description: string;
+  isVipOnly: boolean;
+}
+
+export interface VipPlanApi {
+  id: string;
+  name: string;
+  description: string;
+  price: string;
+  duration: string;
+  features: string;
+  sort_order: string;
+  status: string;
+  created_at: string;
+  updated_at: string;
+}
+
+export interface VipPlanListApiData {
+  plans: VipPlanApi[];
+}
+
+export interface VipPlanListApiResponse {
+  code: number;
+  msg: string;
+  data: VipPlanListApiData;
+}
+
+export interface WeChatPrepayId {
+  prepay_id: string;
+}
+
+export interface UserInfoApiData {
+  user_info: WechatUserInfo;
+  system_info: SystemInfo;
+  subscription_info: SubscriptionInfo;
+}
+
+export interface UserInfoApiResponse {
+  code: number;
+  msg: string;
+  data: UserInfoApiData;
+}
+
+export default class UserUtil {
+  // 微信是否安装
+  static async isHasWX(): Promise<boolean> {
+    try {
+      let link = 'weixin://';
+      let data = bundleManager.canOpenLink(link);
+      if (data) {
+        return true;
+      } else {
+        ToastUtil.showToast('微信未安装');
+        return false;
+      }
+    } catch (err) {
+      let message = (err as BusinessError).message;
+      console.error('canOpenLink failed: %{public}s', message);
+      return false;
+    }
+  }
+
+  // 创建微信订单
+  static async createWeChatOrder(app_id: string, mch_id: string, description: string, amount: number, out_trade_no_pre: string, uid: number, plan_id: string): Promise<string> {
+    let requestUrl = CommonConstants.WX_PAY_API
+      + '?app_id=' + encodeURIComponent(app_id.trim())
+      + '&mch_id=' + encodeURIComponent(mch_id.trim())
+      + '&description=' + encodeURIComponent(description.trim())
+      + '&amount=' + encodeURIComponent(amount)
+      + '&uid=' + encodeURIComponent(uid)
+      + '&plan_id=' + encodeURIComponent(plan_id)
+      + '&out_trade_no_pre=' + encodeURIComponent(out_trade_no_pre);
+    const httpRequest: http.HttpRequest = http.createHttp();
+    const options: http.HttpRequestOptions = {
+      method: http.RequestMethod.GET,
+      readTimeout: 6000,
+      connectTimeout: 6000,
+    };
+    try {
+      const response: http.HttpResponse = await httpRequest.request(requestUrl, options);
+      if (response.responseCode === 200) {
+        let responseData: WeChatPrepayId;
+        if (typeof response.result === 'string') {
+          responseData = JSON.parse(response.result) as WeChatPrepayId;
+        } else if (response.result instanceof Object) {
+          responseData = response.result as WeChatPrepayId;
+        } else {
+          throw new Error('Unexpected response format');
+        }
+        const prepayId: string = responseData.prepay_id;
+        return prepayId;
+      } else {
+        ToastUtil.showToast('微信下单失败');
+        return '';
+      }
+    } catch (error) {
+      ToastUtil.showToast('微信下单异常');
+      return '';
+    }
+  }
+
+  // 构造签名串
+  static constructSignatureString(appId: string, timestamp: string, nonceStr: string, prepayId: string): string {
+    return `${appId}\n${timestamp}\n${nonceStr}\n${prepayId}\n`;
+  }
+
+  // 微信支付签名
+  static async rsaSign2048( message: string): Promise<Uint8Array> {
+
+    try {
+      let keyGen = cryptoFramework.createAsyKeyGenerator("RSA2048")
+      let key = keyGen.convertPemKeySync(null, CommonConstants.WX_PAY_RSA_PRIVATE_KEY)
+
+      let sign = cryptoFramework.createSign('RSA2048|PKCS1|SHA256');
+      let msgBlob: cryptoFramework.DataBlob = {data: StrUtil.strToUint8Array(message)}
+      sign.initSync(key.priKey)
+      let signature = await sign.sign(msgBlob)
+      return signature.data
+    } catch (error) {
+      console.error(error, `onecold error code: ${error.code}`)
+      return new Uint8Array()
+    }
+  }
+
+  // 通过code换取用户信息
+  static async getUserInfoByCode(code: string): Promise<UserInfoApiData |WechatUserInfoData| null> {
+    try {
+      const url = `https://pay.ss5.xyz/wechat/user_info?code=${encodeURIComponent(code)}`;
+      const httpRequest = http.createHttp();
+      const options: http.HttpRequestOptions = {
+        method: http.RequestMethod.GET,
+        readTimeout: 3000,
+        connectTimeout: 3000,
+      };
+      const response: http.HttpResponse = await httpRequest.request(url, options);
+      if (response.responseCode === 200) {
+        let res = response.result as string;
+        LogUtil.debug("getUserInfoByCode res =" + res)
+        let json: WechatUserInfoApiResponse = JSON.parse(res) as WechatUserInfoApiResponse;
+        if (json.code === 0 && json.data && json.data.user_info) {
+          const userId = json.data.system_info?.user_id ? Number(json.data.system_info?.user_id) : 0;
+          hilog.info(0x0000, 'UserUtil', `getUserInfoByCode: userId set to ${userId}`);
+          const userName = json.data.user_info.nickname || '微信用户';
+          const userAvatarUrl = json.data.user_info.headimgurl && json.data.user_info.headimgurl.length > 0 ? json.data.user_info.headimgurl : '';
+          // 解析订阅信息
+          const subInfo = json.data.subscription_info;
+          let hasActiveSubscription = false;
+          let subscriptionName = '';
+          let subscriptionEndDate = '';
+          if (subInfo && subInfo.has_active_subscription && subInfo.subscriptions && subInfo.subscriptions.length > 0) {
+            hasActiveSubscription = true;
+            subscriptionName = subInfo.subscriptions[0].plan_name;
+            subscriptionEndDate = subInfo.subscriptions[0].end_date;
+          }
+          // 保存登录状态和用户信息
+          PreferencesUtil.putSync('isLogin', true);
+          PreferencesUtil.putSync('userId', userId);
+          PreferencesUtil.putSync('userName', userName);
+          PreferencesUtil.putSync('userAvatarUrl', userAvatarUrl);
+          PreferencesUtil.putSync('subscriptionName', subscriptionName);
+          PreferencesUtil.putSync('subscriptionEndDate', subscriptionEndDate);
+          PreferencesUtil.putSync('hasActiveSubscription', hasActiveSubscription);
+          PreferencesUtil.putSync('userToken', json.data.system_info?.token || '');
+          ToastUtil.showToast('微信登录成功');
+          return json.data;
+        } else {
+          ToastUtil.showToast('用户信息解析失败');
+          return null;
+        }
+      } else {
+        ToastUtil.showToast('获取用户信息失败');
+        return null;
+      }
+    } catch (e) {
+      ToastUtil.showToast('登录失败' + (e && e.message ? (': ' + e.message) : ''));
+      return null;
+    }
+  }
+
+  // 通过华为账号信息换取用户信息和会员状态
+  static async getUserInfoByHuawei(openID: string, unionID: string, nickname: string, avatarUri: string): Promise<HuaweiUserInfoApiData | null> {
+    try {
+      const url = `https://pay.ss5.xyz/user/huawei?openID=${encodeURIComponent(openID)}&unionID=${encodeURIComponent(unionID)}&nickname=${encodeURIComponent(nickname)}&avatarUri=${encodeURIComponent(avatarUri)}`;
+      const httpRequest = http.createHttp();
+      const options: http.HttpRequestOptions = {
+        method: http.RequestMethod.GET,
+        readTimeout: 3000,
+        connectTimeout: 3000,
+      };
+      const response: http.HttpResponse = await httpRequest.request(url, options);
+      if (response.responseCode === 200) {
+        let res = response.result as string;
+        LogUtil.debug("getUserInfoByHuawei res =" + res)
+        let json: HuaweiUserInfoApiResponse = JSON.parse(res) as HuaweiUserInfoApiResponse;
+        if (json.code === 0 && json.data && json.data.user_info) {
+          const userId = json.data.system_info?.user_id ? Number(json.data.system_info?.user_id) : 0;
+          hilog.info(0x0000, 'UserUtil', `getUserInfoByHuawei: userId set to ${userId}`);
+          const userName = json.data.user_info.nickname || '华为用户';
+          const userAvatarUrl = json.data.user_info.headimgurl || '';
+          // 处理会员信息
+          const subInfo = json.data.subscription_info;
+          let hasActiveSubscription = false;
+          let subscriptionName = '';
+          let subscriptionEndDate = '';
+          if (subInfo && subInfo.has_active_subscription && subInfo.subscriptions && subInfo.subscriptions.length > 0) {
+            hasActiveSubscription = true;
+            subscriptionName = subInfo.subscriptions[0].plan_name;
+            subscriptionEndDate = subInfo.subscriptions[0].end_date;
+          }
+          // 保存登录状态
+          PreferencesUtil.putSync('isLogin', true);
+          PreferencesUtil.putSync('userId', userId);
+          PreferencesUtil.putSync('userName', userName);
+          PreferencesUtil.putSync('userAvatarUrl', userAvatarUrl);
+          PreferencesUtil.putSync('subscriptionName', subscriptionName);
+          PreferencesUtil.putSync('subscriptionEndDate', subscriptionEndDate);
+          PreferencesUtil.putSync('hasActiveSubscription', hasActiveSubscription);
+          PreferencesUtil.putSync('userToken', json.data.system_info?.token || '');
+          ToastUtil.showToast('华为登录成功');
+          return json.data;
+        } else {
+          ToastUtil.showToast('用户信息解析失败');
+          return null;
+        }
+      } else {
+        ToastUtil.showToast('获取用户信息失败');
+        return null;
+      }
+    } catch (e) {
+      ToastUtil.showToast('登录失败' + (e && e.message ? (': ' + e.message) : ''));
+      return null;
+    }
+  }
+
+  // 刷新用户信息
+  static async fetchUserInfo(token: string): Promise<UserInfoApiData | null> {
+    try {
+      const url = `https://pay.ss5.xyz/user/info?token=${encodeURIComponent(token)}`;
+      const httpRequest = http.createHttp();
+      const options: http.HttpRequestOptions = {
+        method: http.RequestMethod.GET,
+        readTimeout: 3000,
+        connectTimeout: 3000,
+      };
+      const response: http.HttpResponse = await httpRequest.request(url, options);
+      if (response.responseCode === 200) {
+        let res = response.result as string;
+        LogUtil.debug("fetchUserInfo res =" + res);
+        let json: UserInfoApiResponse = JSON.parse(res) as UserInfoApiResponse;
+        if (json.code === 0 && json.data) {
+          const userInfo = json.data.user_info;
+          const systemInfo = json.data.system_info;
+          const subInfo = json.data.subscription_info;
+          let hasActiveSubscription = false;
+          let subscriptionName = '';
+          let subscriptionEndDate = '';
+          if (subInfo && subInfo.has_active_subscription && subInfo.subscriptions && subInfo.subscriptions.length > 0) {
+            hasActiveSubscription = true;
+            subscriptionName = subInfo.subscriptions[0].plan_name;
+            subscriptionEndDate = subInfo.subscriptions[0].end_date;
+          }
+          // ToastUtil.showToast('用户信息已更新');
+          return json.data;
+        } else {
+          ToastUtil.showToast('刷新用户信息失败');
+          return null;
+        }
+      } else {
+        ToastUtil.showToast('获取用户信息失败');
+        return null;
+      }
+    } catch (e) {
+      ToastUtil.showToast('获取用户信息异常' + (e && e.message ? (': ' + e.message) : ''));
+      hilog.error(0x0000, 'UserUtil', `fetchUserInfo error: ${e.message}`);
+      return null;
+    }
+  }
+
+  // 华为登录错误处理
+  static dealHuaweiLoginError(error: BusinessError): void {
+    if (error.code === 1001) {
+      ToastUtil.showToast('未登录华为账号');
+    } else if (error.code === 1002) {
+      ToastUtil.showToast('网络异常');
+    } else if (error.code === 1003) {
+      ToastUtil.showToast('内部错误');
+    } else if (error.code === 1004) {
+      ToastUtil.showToast('用户取消授权');
+    } else if (error.code === 1005) {
+      ToastUtil.showToast('系统服务异常');
+    } else if (error.code === 1006) {
+      ToastUtil.showToast('请求被拒绝');
+    } else if (error.code === 1007) {
+      ToastUtil.showToast('无权限');
+    } else {
+      ToastUtil.showToast('登录失败');
+    }
+  }
+}

entry/src/main/ets/pages/UserCenter.ets

@@ -4,147 +4,24 @@ import { resourceManager } from '@kit.LocalizationKit';
 import { BreakpointTypeEnum } from '../common/util/BreakpointSystem';
 import * as wxopensdk from '@tencent/wechat_open_sdk';
 import { OnWXResp, WXApi, WXEventHandler } from '../common/util/WXApiWrap';
-import { bundleManager, common, UIAbility } from '@kit.AbilityKit';
+import { bundleManager, common, ConfigurationConstant, UIAbility } from '@kit.AbilityKit';
 import { ErrCode } from '@tencent/wechat_open_sdk';
 import { http } from '@kit.NetworkKit';
 import { authentication } from '@kit.AccountKit';
 import { hilog } from '@kit.PerformanceAnalysisKit';
 import { BusinessError } from '@kit.BasicServicesKit';
 import { util } from '@kit.ArkTS';
-import { DialogHelper } from '@pura/harmony-dialog';
+import { AnimationHelper, DialogHelper } from '@pura/harmony-dialog';
 import { Pay } from '@cashier_alipay/cashiersdk';
 import { OrderInfoUtil } from '../alipay/OrderInfoUtil';
 import { RandomUtil, Base64Util } from '@pura/harmony-utils';
 import { CommonConstants } from '../common/constants/CommonConstants';
 import { PayReq } from '@tencent/wechat_open_sdk';
 import { cryptoFramework } from '@kit.CryptoArchitectureKit';
+import json from '@ohos.util.json';
+import UserUtil, { VipFeature, VipPlanApi, VipPlanListApiResponse, WeChatPrepayId } from '../common/util/UserUtil';
 
 
-interface WechatUserInfo {
-  openid?: string;
-  nickname?: string;
-  sex?: number;
-  language?: string;
-  city?: string;
-  province?: string;
-  country?: string;
-  headimgurl?: string;
-  privilege?: string[];
-  unionid?: string;
-}
-
-interface Subscription {
-  plan_id: string;
-  plan_name: string;
-  plan_description: string;
-  price: string;
-  start_date: string;
-  end_date: string;
-  status: string;
-  auto_renew: string;
-  features: string[];
-}
-
-interface SubscriptionInfo {
-  has_active_subscription: boolean;
-  subscriptions: Subscription[];
-}
-
-interface responseData {
-  token_info?: object;
-  user_info: WechatUserInfo;
-}
-
-interface WechatUserInfoData {
-  token_info?: object;
-  user_info: WechatUserInfo;
-  system_info?: SystemInfo;
-  subscription_info?: SubscriptionInfo;
-}
-
-interface WechatUserInfoApiResponse {
-  code: number;
-  msg: string;
-  data: WechatUserInfoData;
-}
-
-interface HuaweiUserInfo {
-  openid: string;
-  unionid?: string;
-  nickname: string;
-  headimgurl: string;
-}
-
-interface SystemInfo {
-  user_id: number | string;
-  token: string;
-}
-
-interface HuaweiUserInfoApiData {
-  user_info: HuaweiUserInfo;
-  system_info?: SystemInfo;
-  subscription_info?: SubscriptionInfo;
-}
-
-interface HuaweiUserInfoApiResponse {
-  code: number;
-  msg: string;
-  data: HuaweiUserInfoApiData;
-}
-
-interface VipFeature {
-  icon: Resource;
-  title: string;
-  description: string;
-  isVipOnly: boolean;
-}
-
-interface VipPlanApi {
-  id: string;
-  name: string;
-  description: string;
-  price: string;
-  duration: string;
-  features: string;
-  sort_order: string;
-  status: string;
-  created_at: string;
-  updated_at: string;
-}
-
-interface VipPlanListApiData {
-  plans: VipPlanApi[];
-}
-
-interface VipPlanListApiResponse {
-  code: number;
-  msg: string;
-  data: VipPlanListApiData;
-}
-
-interface WeChatPrepayId {
-  prepay_id: string;
-}
-
-// user/info 接口的返回结构
-interface UserInfoApiData {
-  user_info: WechatUserInfo; // 可以复用 WechatUserInfo
-  system_info: SystemInfo;
-  subscription_info: SubscriptionInfo;
-}
-
-interface UserInfoApiResponse {
-  code: number;
-  msg: string;
-  data: UserInfoApiData;
-}
-
-// 自定义主题颜色
-
-// 支持传入主题，默认使用myTheme
-export interface UserCenterParams {
-  theme?: CustomTheme;
-}
 
 // 微信支付相关工具方法
 async function isHasWX(): Promise<boolean> {
@@ -241,15 +118,23 @@ export struct UserCenter {
   private wxEventHandler = WXEventHandler
   @StorageProp('currentBreakpoint') currentBreakpoint: string = BreakpointTypeEnum.MD;
   @State vipFeatures: VipFeature[] = [
-    { icon: $r('app.media.small_music'), title: '无损音质', description: '支持FLAC、WAV等无损格式', isVipOnly: true },
-    { icon: $r('app.media.small_music'), title: '歌词显示', description: '支持LRC歌词同步显示', isVipOnly: false },
-    { icon: $r('app.media.small_music'), title: '智能歌单', description: 'AI智能推荐歌单', isVipOnly: true },
-    { icon: $r('app.media.small_music'), title: '主题定制', description: '自定义播放器主题', isVipOnly: true }
+    { icon: $r('app.media.wusunyinzhi'), title: '无损音质', description: '专享无损音乐支持，让每个音符都完美呈现', isVipOnly: true },
+    // { icon: $r('app.media.lrc'), title: '歌词下载', description: '支持歌词API在线下载LRC歌词，实现完美同步', isVipOnly: true },
+    // { icon: $r('app.media.cover'), title: '封面API', description: '支持设置自动下载封面', isVipOnly: true },
+    { icon: $r('app.media.theme'), title: '主题定制', description: '自定义播放器主题，打造独一无二的个性风格', isVipOnly: true },
+    { icon: $r('app.media.car'), title: 'HiCAR播放', description: '专为驾车体验优化的音乐播放模式', isVipOnly: true },
+    { icon: $r('app.media.music_wave'), title: '参数均衡', description: '精准定制音效，带来极致听觉体验', isVipOnly: true },
   ];
   @State vipPlans: VipPlanApi[] = [];
   @State selectedPayPlan: VipPlanApi | null = null;
   @State payType: number = 0; // 0: 微信, 1: 支付宝
   @StorageProp('themeColor') themeColor: string = '#FF4081';
+  @State isDarkMode: boolean = false
+  @StorageProp('currentColorMode') @Watch('onColorModeChange') currentMode: number =
+    ConfigurationConstant.ColorMode.COLOR_MODE_LIGHT;
+  onColorModeChange() {
+    this.isDarkMode = this.currentMode === ConfigurationConstant.ColorMode.COLOR_MODE_DARK
+  }
 
   constructor() {
     super();
@@ -268,7 +153,8 @@ export struct UserCenter {
         // 微信支付成功回调
         ToastUtil.showToast('支付成功！');
         // 可在此处刷新会员状态或其他支付成功后的业务逻辑
-        this.fetchVipPlans(); // 刷新会员套餐信息
+        // this.fetchVipPlans(); // 刷新会员套餐信息
+        void this.fetchUserInfo(this.userToken);
       } else {
         // 其他类型的成功回调
         ToastUtil.showToast('操作成功！');
@@ -288,131 +174,21 @@ export struct UserCenter {
 
   // 通过code换取用户信息
   async getUserInfoByCode(code: string) {
-    try {
-      const url = `https://pay.ss5.xyz/wechat/user_info?code=${encodeURIComponent(code)}`;
-      const httpRequest = http.createHttp();
-      const options: http.HttpRequestOptions = {
-        method: http.RequestMethod.GET,
-        readTimeout: 3000,
-        connectTimeout: 3000,
-      };
-      const response: http.HttpResponse = await httpRequest.request(url, options);
-      if (response.responseCode === 200) {
-        let res = response.result as string;
-        LogUtil.debug("getUserInfoByCode res =" + res)
-        let json: WechatUserInfoApiResponse = JSON.parse(res) as WechatUserInfoApiResponse;
-        if (json.code === 0 && json.data && json.data.user_info) {
-          let userInfo: WechatUserInfo = json.data.user_info;
-          this.isLogin = true;
-          this.userId = json.data.system_info?.user_id ? Number(json.data.system_info?.user_id) : 0;
-          hilog.info(0x0000, 'UserCenter', `getUserInfoByCode: this.userId set to ${this.userId}`);
-          this.userName = userInfo.nickname || '微信用户';
-          if (userInfo.headimgurl && userInfo.headimgurl.length > 0) {
-            this.userAvatarUrl = userInfo.headimgurl;
-            this.userAvatar = $r('app.media.icon_person2');
-          } else {
-            this.userAvatarUrl = '';
-            this.userAvatar = $r('app.media.icon_person2');
-          }
-          // 解析订阅信息
-          const subInfo = json.data.subscription_info;
-          if (subInfo && subInfo.has_active_subscription && subInfo.subscriptions && subInfo.subscriptions.length > 0) {
-            this.hasActiveSubscription = true;
-            this.subscriptionName = subInfo.subscriptions[0].plan_name;
-            this.subscriptionEndDate = subInfo.subscriptions[0].end_date;
-          } else {
-            this.hasActiveSubscription = false;
-            this.subscriptionName = '';
-            this.subscriptionEndDate = '';
-          }
-          // 保存登录状态和用户信息
-          PreferencesUtil.putSync('isLogin', true);
-          PreferencesUtil.putSync('userId', this.userId);
-          PreferencesUtil.putSync('userName', this.userName);
-          PreferencesUtil.putSync('userAvatarUrl', this.userAvatarUrl);
-          PreferencesUtil.putSync('subscriptionName', this.subscriptionName);
-          PreferencesUtil.putSync('subscriptionEndDate', this.subscriptionEndDate);
-          PreferencesUtil.putSync('hasActiveSubscription', this.hasActiveSubscription);
-          PreferencesUtil.putSync('userToken', json.data.system_info?.token || '');
-          ToastUtil.showToast('微信登录成功');
-        } else {
-          ToastUtil.showToast('用户信息解析失败');
-        }
-      } else {
-        ToastUtil.showToast('获取用户信息失败');
-      }
-    } catch (e) {
-      ToastUtil.showToast('登录失败' + (e && e.message ? (': ' + e.message) : ''));
-    }
+    await UserUtil.getUserInfoByCode(code).then(()=>{
+      this.showUserInfo()
+    });
   }
 
   // 通过华为账号信息换取用户信息和会员状态
   async getUserInfoByHuawei(openID: string, unionID: string, nickname: string, avatarUri: string) {
-    try {
-      const url = `https://pay.ss5.xyz/user/huawei?openID=${encodeURIComponent(openID)}&unionID=${encodeURIComponent(unionID)}&nickname=${encodeURIComponent(nickname)}&avatarUri=${encodeURIComponent(avatarUri)}`;
-      const httpRequest = http.createHttp();
-      const options: http.HttpRequestOptions = {
-        method: http.RequestMethod.GET,
-        readTimeout: 3000,
-        connectTimeout: 3000,
-      };
-      const response: http.HttpResponse = await httpRequest.request(url, options);
-      if (response.responseCode === 200) {
-        let res = response.result as string;
-        LogUtil.debug("getUserInfoByHuawei res =" + res)
-        let json: HuaweiUserInfoApiResponse = JSON.parse(res) as HuaweiUserInfoApiResponse;
-        if (json.code === 0 && json.data && json.data.user_info) {
-          // 登录成功处理
-          this.isLogin = true;
-          this.userId = json.data.system_info?.user_id ? Number(json.data.system_info?.user_id) : 0;
-          hilog.info(0x0000, 'UserCenter', `getUserInfoByHuawei: this.userId set to ${this.userId}`);
-          this.userName = json.data.user_info.nickname || '华为用户';
-          this.userAvatarUrl = json.data.user_info.headimgurl || '';
-          // 处理会员信息
-          const subInfo = json.data.subscription_info;
-          if (subInfo && subInfo.has_active_subscription && subInfo.subscriptions && subInfo.subscriptions.length > 0) {
-            this.hasActiveSubscription = true;
-            this.subscriptionName = subInfo.subscriptions[0].plan_name;
-            this.subscriptionEndDate = subInfo.subscriptions[0].end_date;
-          } else {
-            this.hasActiveSubscription = false;
-            this.subscriptionName = '';
-            this.subscriptionEndDate = '';
-          }
-          // 保存登录状态
-          PreferencesUtil.putSync('isLogin', true);
-          PreferencesUtil.putSync('userId', this.userId);
-          PreferencesUtil.putSync('userName', this.userName);
-          PreferencesUtil.putSync('userAvatarUrl', this.userAvatarUrl);
-          PreferencesUtil.putSync('subscriptionName', this.subscriptionName);
-          PreferencesUtil.putSync('subscriptionEndDate', this.subscriptionEndDate);
-          PreferencesUtil.putSync('hasActiveSubscription', this.hasActiveSubscription);
-          PreferencesUtil.putSync('userToken', json.data.system_info?.token || '');
-          ToastUtil.showToast('华为登录成功');
-        } else {
-          ToastUtil.showToast('用户信息解析失败');
-        }
-      } else {
-        ToastUtil.showToast('获取用户信息失败');
-      }
-    } catch (e) {
-      ToastUtil.showToast('登录失败' + (e && e.message ? (': ' + e.message) : ''));
-    }
+    await UserUtil.getUserInfoByHuawei(openID, unionID, nickname, avatarUri);
   }
 
   aboutToAppear(): void {
     let themeColor = PreferencesUtil.getStringSync('THEME_COLOR', '#FF4081');
     AppStorage.setOrCreate('themeColor', themeColor);
     this.themeColor = themeColor;
-    // 自动恢复本地登录状态
-    this.isLogin = PreferencesUtil.getBooleanSync('isLogin', false);
-    this.userId = PreferencesUtil.getNumberSync('userId', 0);
-    this.userName = PreferencesUtil.getStringSync('userName', '未登录用户');
-    this.userAvatarUrl = PreferencesUtil.getStringSync('userAvatarUrl', '');
-    this.subscriptionName = PreferencesUtil.getStringSync('subscriptionName', '');
-    this.subscriptionEndDate = PreferencesUtil.getStringSync('subscriptionEndDate', '');
-    this.hasActiveSubscription = PreferencesUtil.getBooleanSync('hasActiveSubscription', false);
-    this.userToken = PreferencesUtil.getStringSync('userToken', '');
+    this.showUserInfo()
     this.wxEventHandler.registerOnWXRespCallback(this.onWXResp)
     this.fetchVipPlans();
     if (this.isLogin && this.userToken) {
@@ -423,6 +199,17 @@ export struct UserCenter {
   aboutToDisappear() {
     this.wxEventHandler.unregisterOnWXRespCallback(this.onWXResp)
   }
+  showUserInfo(){
+    // 自动恢复本地登录状态
+    this.isLogin = PreferencesUtil.getBooleanSync('isLogin', false);
+    this.userId = PreferencesUtil.getNumberSync('userId', 0);
+    this.userName = PreferencesUtil.getStringSync('userName', '未登录用户');
+    this.userAvatarUrl = PreferencesUtil.getStringSync('userAvatarUrl', '');
+    this.subscriptionName = PreferencesUtil.getStringSync('subscriptionName', '');
+    this.subscriptionEndDate = PreferencesUtil.getStringSync('subscriptionEndDate', '');
+    this.hasActiveSubscription = PreferencesUtil.getBooleanSync('hasActiveSubscription', false);
+    this.userToken = PreferencesUtil.getStringSync('userToken', '');
+  }
 
   build() {
     Column() {
@@ -431,14 +218,14 @@ export struct UserCenter {
         // 顶部安全区
         Blank()
           .height(this.isPhoneLan() ? 0 : px2vp(AppUtil.getStatusBarHeight()))
-          .backgroundColor(this.themeColor)
+          .backgroundColor(this.isDarkMode?$r('app.color.title_bar_bg'):this.themeColor)
           .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
         // 自定义标题栏（Stack实现绝对居中）
         Stack() {
           // 居中标题
           Text('用户中心')
-            .fontSize(20)
-            .fontColor($r('app.color.text_color'))
+            .fontSize(18)
+            .fontColor(Color.White)
             .align(Alignment.Center)
           // 左右按钮
           Row() {
@@ -474,10 +261,16 @@ export struct UserCenter {
       .scrollBar(BarState.Off)
       .edgeEffect(EdgeEffect.Spring)
       .layoutWeight(1)
+      .padding({
+        bottom:45
+      })
     }
     .backgroundColor(0xFFF6F7FA)
     .width('100%')
     .height('100%')
+    .layoutWeight(1)
+
+
   }
 
   // 用户信息卡片
@@ -540,6 +333,7 @@ export struct UserCenter {
                 .width(32)
                 .height(32)
                 .margin({ bottom: 8 })
+                .fillColor(this.themeColor)
               Text(feature.title)
                 .fontSize(16)
                 .fontWeight(FontWeight.Medium)
@@ -576,41 +370,72 @@ export struct UserCenter {
   @Builder
   payDialogContentBuilder(): void {
     Column() {
-      Text('请选择支付方式')
-        .fontSize(18)
-        .fontWeight(FontWeight.Bold)
-        .margin({ bottom: 16 })
       Row() {
-        Button('微信支付')
-          .fontColor(Color.White)
-          .backgroundColor('#FF4081')
-          .height(48)
-          .layoutWeight(1)
-          .onClick(() => {
-            this.payType = 0;
-            DialogHelper.closeDialog('payDialog');
-            if (this.selectedPayPlan) {
-              void this.doPay(this.selectedPayPlan);
+        Image($r('app.media.wx_logo'))
+          .width(22)
+          .height(22)
+          .alignSelf(ItemAlign.Center)
+          .margin({ left: 25 })
+        Text('微信支付')
+          .margin({ left: 10, right: 20 })
+          .fontSize(15)
+          .fontColor(Color.Gray)
+          .fontWeight(480)
+        Blank()
+        Checkbox()
+          .select(this.payType === 0)
+          .selectedColor(this.themeColor)
+          .onChange((checked: boolean) => {
+            if (checked) {
+              this.payType = 0
             }
           })
-        Blank().width(16)
-        Button('支付宝')
-          .fontColor(Color.White)
-          .backgroundColor('#FF4081')
-          .height(48)
-          .layoutWeight(1)
-          .onClick(() => {
-            this.payType = 1;
-            DialogHelper.closeDialog('payDialog');
-            if (this.selectedPayPlan) {
-              void this.doPay(this.selectedPayPlan);
+          .shape(CheckBoxShape.CIRCLE)
+          .margin({ left: 20, top: 8, bottom: 8, right: 20 })
+          .width(22)
+          .height(22)
+      }
+      .onClick(() => {
+        this.payType = 0
+      })
+      .width('100%')
+      .height(50)
+
+      Line().width('100%').height(0.3).backgroundColor($r('app.color.index_tab_unselected_font_color'))
+
+      Row() {
+        Image($r('app.media.alipay'))
+          .width(22)
+          .height(22)
+          .alignSelf(ItemAlign.Center)
+          .margin({ left: 25 })
+        Text('支付宝')
+          .margin({ left: 10, right: 20 })
+          .fontSize(15)
+          .fontColor(Color.Gray)
+          .fontWeight(480)
+        Blank()
+        Checkbox()
+          .select(this.payType === 1)
+          .selectedColor(this.themeColor)
+          .onChange((checked: boolean) => {
+            if (checked) {
+              this.payType = 1
             }
           })
+          .shape(CheckBoxShape.CIRCLE)
+          .margin({ left: 20, top: 8, bottom: 8, right: 20 })
+          .width(22)
+          .height(22)
       }
-      .margin({ top: 8, bottom: 8 })
+      .onClick(() => {
+        this.payType = 1
+      })
+      .width('100%')
+      .height(50)
     }
     .padding(24)
-    .width('80%')
+    .width('100%')
   }
 
   // 会员套餐选择
@@ -654,13 +479,32 @@ export struct UserCenter {
               }
               this.selectedPayPlan = plan;
               DialogHelper.showCustomContentDialog({
+                // backgroundColor:$r('app.color.xpopup_bg'),
                 dialogId: 'payDialog',
                 title: '请选择支付方式',
+                backgroundColor: Color.Grey,
+                transition: AnimationHelper.transitionInUp(555),
                 autoCancel: true,
                 contentBuilder: () => {
                   this.payDialogContentBuilder();
                 },
-                buttons: []
+                buttons: [
+                  {
+                    value:"取消",
+                    // background: $r('app.color.button_click'),
+                  },
+                  {
+                    value: '确认支付',
+                    // background: $r('app.color.button_click'),
+                    // background:this.themeColor,
+                    action:()=>{
+                      if (this.selectedPayPlan) {
+                        void this.doPay(this.selectedPayPlan);
+                      }
+                      DialogHelper.closeDialog('payDialog');
+                    }
+                  },
+                ]
               });
             })
         }
@@ -684,6 +528,7 @@ export struct UserCenter {
           return
         }
         // 跳转到收藏页面
+        ToastUtil.showToast('敬请期待')
       })
       Line().width('90%').height(0.5).backgroundColor(0xFFEFEFEF)
       this.menuItem($r('app.media.icon_history'), '播放历史', () => {
@@ -692,10 +537,14 @@ export struct UserCenter {
           return
         }
         // 跳转到历史记录页面
+        ToastUtil.showToast('敬请期待')
       })
       Line().width('90%').height(0.5).backgroundColor(0xFFEFEFEF)
-      this.menuItem($r('app.media.setting'), '设置', () => {
+      this.menuItem($r('app.media.setting_red'), '设置', () => {
         // 跳转到设置页面
+        router.pushUrl({
+          url: 'pages/SettingPage'
+        });
       })
     }
     .backgroundColor(Color.White)
@@ -926,10 +775,12 @@ export struct UserCenter {
 
   async doAliPay(plan: VipPlanApi) {
     const appName = PreferencesUtil.getStringSync('appName', 'TTMusic');
-    OrderInfoUtil.getOrderInfo(Number(plan.price), appName).then((orderInfo) => {
+    OrderInfoUtil.getOrderInfo(Number(plan.price), appName, this.userId, plan.id).then((orderInfo) => {
+      console.log('Heanup: alipay orderInfo = '+json.stringify(orderInfo))
       new Pay().pay(orderInfo, true).then(async (result) => {
         if (result.get('resultStatus') === '9000') {
           ToastUtil.showToast('支付成功！');
+          void this.fetchUserInfo(this.userToken);
           // 可在此处刷新会员状态
         } else {
           ToastUtil.showToast('取消支付！');
@@ -942,49 +793,6 @@ export struct UserCenter {
 
   // 每次进入页面时刷新用户数据
   async fetchUserInfo(token: string) {
-    try {
-      const url = `https://pay.ss5.xyz/user/info?token=${encodeURIComponent(token)}`;
-      const httpRequest = http.createHttp();
-      const options: http.HttpRequestOptions = {
-        method: http.RequestMethod.GET,
-        readTimeout: 3000,
-        connectTimeout: 3000,
-      };
-      const response: http.HttpResponse = await httpRequest.request(url, options);
-      if (response.responseCode === 200) {
-        let res = response.result as string;
-        LogUtil.debug("fetchUserInfo res =" + res);
-        let json: UserInfoApiResponse = JSON.parse(res) as UserInfoApiResponse;
-
-        if (json.code === 0 && json.data) {
-          const userInfo = json.data.user_info;
-          const systemInfo = json.data.system_info;
-          const subInfo = json.data.subscription_info;
-
-          this.isLogin = true;
-          this.userId = systemInfo.user_id ? Number(systemInfo.user_id) : 0;
-          this.userName = userInfo.nickname || '用户';
-          this.userAvatarUrl = userInfo.headimgurl || '';
-
-          if (subInfo && subInfo.has_active_subscription && subInfo.subscriptions && subInfo.subscriptions.length > 0) {
-            this.hasActiveSubscription = true;
-            this.subscriptionName = subInfo.subscriptions[0].plan_name;
-            this.subscriptionEndDate = subInfo.subscriptions[0].end_date;
-          } else {
-            this.hasActiveSubscription = false;
-            this.subscriptionName = '';
-            this.subscriptionEndDate = '';
-          }
-          ToastUtil.showToast('用户信息已更新');
-        } else {
-          ToastUtil.showToast('刷新用户信息失败');
-        }
-      } else {
-        ToastUtil.showToast('获取用户信息失败');
-      }
-    } catch (e) {
-      ToastUtil.showToast('获取用户信息异常' + (e && e.message ? (': ' + e.message) : ''));
-      hilog.error(0x0000, 'UserCenter', `fetchUserInfo error: ${e.message}`);
-    }
+    await UserUtil.fetchUserInfo(token);
   }
 }

entry/src/main/ets/pages/VipPage.ets

@@ -644,7 +644,7 @@ export  struct  VipPage{
       *
       * orderInfo 的获取必须来自服务端；
       */
-    OrderInfoUtil.getOrderInfo(this.payPrice,this.appName).then((orderInfo) => {
+    OrderInfoUtil.getOrderInfo(this.payPrice,this.appName,0,"0").then((orderInfo) => {
       new Pay().pay(orderInfo, true).then(async (result) => {
         let message =
           `resultStatus: ${result.get('resultStatus')} memo: ${result.get('memo')} result: ${result.get('result')}`;

entry/src/main/ets/viewmodel/MainViewModel.ets

@@ -67,7 +67,7 @@ export  class  MainViewModel{
   getDrawerData2(): Array<ItemData> {
     let drawerGridData: ItemData[] = [
       new ItemData($r('app.string.local_music'), { type: 'symbol', value: $r('sys.symbol.music') }, MainViewModel.MENU_MUSIC, false),
-      // new ItemData($r('app.string.user_center'), { type: 'symbol', value: $r('sys.symbol.person') }, MainViewModel.MENU_USER, false),
+      new ItemData($r('app.string.user_center'), { type: 'symbol', value: $r('sys.symbol.person') }, MainViewModel.MENU_USER, false),
       new ItemData($r('app.string.file_scan'), { type: 'symbol', value: $r('sys.symbol.doc_text_badge_magnifyingglass') },MainViewModel.MENU_FILE_SCAN,false),
       new ItemData($r('app.string.vip'), { type: 'symbol', value: $r('sys.symbol.vip_hand') }, MainViewModel.MENU_VIP, false),
       new ItemData($r('app.string.haoping'), { type: 'symbol', value: $r('sys.symbol.flower') },MainViewModel.MENU_HAOPING,false),

entry/src/main/resources/base/media/car.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1750695818088" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1633" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 1024a512 512 0 1 1 512-512 512 512 0 0 1-512 512z m256-736a32 32 0 0 0-32-32H256a32 32 0 0 0-32 32v288a32 32 0 0 0 32 32h288v-192a32 32 0 0 1 32-32h192V288z m64 192a32 32 0 0 0-32-32h-160a32 32 0 0 0-32 32v320a32 32 0 0 0 32 32h160a32 32 0 0 0 32-32V480z m-192 256h160v32h-160v-32z m0-256h96l-96 96v-96z m-96-192v96h-96z" p-id="1634"></path></svg>

entry/src/main/resources/base/media/cover.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1750694990412" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4149" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.7 367.2c-13.4-13.1-34.7-13.1-48.2-0.1L60.6 597.7v185.6c0 20.7 16.5 37.4 37 37.4H816L348.7 367.2z" fill="#FDC844" p-id="4150"></path><path d="M926.5 820.8c20.4 0 37-16.7 37-37.4V611.5l-140-135.9c-13.4-13.1-34.7-13.1-48.2-0.1L416 820.8h510.5z" fill="#FDC844" p-id="4151"></path><path d="M706.5 339.3m-49.6 0a49.6 49.6 0 1 0 99.2 0 49.6 49.6 0 1 0-99.2 0Z" fill="#FDC844" p-id="4152"></path><path d="M896.6 170.3H127.4c-47.3 0-85.8 38.5-85.8 85.8v511.8c0 47.3 38.5 85.8 85.8 85.8h769.2c47.3 0 85.8-38.5 85.8-85.8V256.1c0-47.3-38.5-85.8-85.8-85.8z m31.9 549.4v44c0 19.9-16.2 36.1-36.1 36.1H131.6c-19.9 0-36.1-16.2-36.1-36.1V260.3c0-19.9 16.2-36.1 36.1-36.1h760.8c19.9 0 36.1 16.2 36.1 36.1v459.4z" fill="#FDC844" p-id="4153"></path></svg>

entry/src/main/resources/base/media/lrc.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1750694340641" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1485" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 64a448 448 0 1 1 0 896A448 448 0 0 1 512 64z m0 64a384 384 0 1 0 0 768A384 384 0 0 0 512 128z m236.032 162.688v464H611.968v-48h88.064v-368H451.968v-48h296z m-368 144v218.048l24.576-20.48 30.72 36.864-96 80-35.328-31.744 28.032-41.984V482.624h-56v-48h104z m256 64v176h-192v-176h192z m-48 48h-96v80h96v-80z m71.936-144v48h-224v-48h224zM344 269.312l64 96-40 26.624-64-96 40-26.688z" p-id="1486"></path></svg>

entry/src/main/resources/base/media/music_wave.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1750695914210" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1515" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M704 42.666667a42.666667 42.666667 0 0 1 42.666667 42.666666v853.333334a42.666667 42.666667 0 1 1-85.333334 0V85.333333a42.666667 42.666667 0 0 1 42.666667-42.666666zM512 192a42.666667 42.666667 0 0 1 42.666667 42.666667v554.666666a42.666667 42.666667 0 1 1-85.333334 0v-554.666666a42.666667 42.666667 0 0 1 42.666667-42.666667zM170.666667 234.666667a42.666667 42.666667 0 0 0-85.333334 0v554.666666a42.666667 42.666667 0 1 0 85.333334 0v-554.666666zM896 277.333333a42.666667 42.666667 0 0 1 42.666667 42.666667v384a42.666667 42.666667 0 1 1-85.333334 0v-384a42.666667 42.666667 0 0 1 42.666667-42.666667zM362.666667 384a42.666667 42.666667 0 0 0-85.333334 0v256a42.666667 42.666667 0 1 0 85.333334 0V384z" fill="#333333" p-id="1516"></path></svg>

entry/src/main/resources/base/media/zngd.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1750694517329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8303" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M1000.442905 188.191841h-100.39785v100.382567c0 8.73202-7.05592 15.793035-15.736995 15.793035h-20.026587a15.767562 15.767562 0 0 1-15.74209-15.793035V188.191841h-100.387662a15.762468 15.762468 0 0 1-15.782845-15.747184v-20.021493a15.752279 15.752279 0 0 1 15.782845-15.7319h100.387662V36.298507a15.762468 15.762468 0 0 1 15.74209-15.78794h20.026587a15.757373 15.757373 0 0 1 15.736995 15.78794v100.392757h100.39785a15.752279 15.752279 0 0 1 15.777752 15.736995v20.021492a15.762468 15.762468 0 0 1-15.777752 15.74209M511.607721 745.920318s-205.008876-136.895045-205.008875-287.025671c0-63.661214 23.872955-123.007363 102.486607-123.007363 73.621015 0 102.522269 61.501134 102.522268 61.501134s29.512597-61.501134 102.486607-61.501134c78.618746 0 102.491701 59.346149 102.491702 123.007363 0 150.130627-204.978308 287.025672-204.978309 287.025671" fill="" p-id="8304"></path><path d="M64.277652 525.123502c0 243.839363 203.480517 447.335164 447.330069 447.335165 243.859741 0 447.294408-203.490706 447.294408-447.335165 0-10.616995-0.86607-21.07606-1.589492-31.524935h52.05588c0.64191 10.448876 1.08004 20.948697 1.08004 31.524935 0 278.68593-220.139622 498.876498-498.840836 498.876498C232.921791 1024 12.736318 803.809433 12.736318 525.123502 12.736318 246.442667 232.916697 26.282667 511.607721 26.282667c10.586428 0 21.091343 0.433035 31.524936 1.074945v52.06607c-10.438687-0.733612-20.897751-1.594587-31.524936-1.594587-243.849552 0.005095-447.33007 203.434667-447.330069 447.294407" fill="" p-id="8305"></path></svg>