优化请求发送 新增缓存管理推送管理工具 扩展Date 规划了某些工具方法的分类

commons/basic/src/main/ets/apis/YTRequest.ets

@@ -13,10 +13,10 @@ import { userInfo } from '../models/UserInfo';
 import { yTRouter } from '../utils/YTRouter';
 
 
-// export const baseURL: string = 'https://hm.ytpm.net/prod-warhouse'
+export const baseURL: string = 'https://hm.ytpm.net/prod-warhouse'
 
-
-export const baseURL: string = 'http://192.168.1.160:48098'
+//
+// export const baseURL: string = 'http://192.168.1.160:48098'
 
 export const instance = axios.create({
   baseURL,
@@ -88,11 +88,11 @@ export class YTRequest {
     return instance.delete<null, T, null>(url, { params, headers })
   }
 
-  static put<T, D>(url: string, data?: D, params?: ESObject, headers?: AxiosHeaders) {
+  static put<T, D = ESObject>(url: string, data?: D, params?: ESObject, headers?: AxiosHeaders) {
     return instance.put<null, T, D>(url, data, { params, headers })
   }
 
-  static upPost<T, D>(url: string, data: D, configs?: AxiosRequestConfig<D>) {
+  static upPost<T, D = ESObject>(url: string, data: D, configs?: AxiosRequestConfig<D>) {
     return instance.post<string, T, D>(url, data, configs)
   }
 

commons/basic/src/main/ets/constants/index.ets

@@ -37,7 +37,22 @@ export enum AppStorageKeyCollect {
    * @type Record<string, string>
    * @description 验证码登录手机号与验证码
    */
-  CAPTCHA_LOGIN = 'captchaLogin'
+  CAPTCHA_LOGIN = 'captchaLogin',
+  /**
+   * @type number
+   * @description 屏幕宽度
+   */
+  SCREEN_WIDTH = 'screenWidth',
+  /**
+   * @type number
+   * @description 屏幕高度
+   */
+  SCREEN_HEIGHT = 'screenHeight',
+  /**
+   * @type string
+   * @description 推送token
+   */
+  PUSH_TOKEN = 'pushToken'
 }
 
 export enum EmitterKeyCollection {

products/entry/src/main/ets/entryability/EntryAbility.ets

@@ -3,23 +3,23 @@ import { hilog } from '@kit.PerformanceAnalysisKit';
 import { window } from '@kit.ArkUI';
 import {
   AppStorageKeyCollect,
+  IBestInit,
   jHStartAd,
   permissionController,
+  pushMessageUtil,
   YTAvoid,
   YTBreakPoint,
   YTLog,
-  YTUserRequest
+  yTPreferences
 } from 'basic';
-import { preferences } from '@kit.ArkData';
 import { identifier } from '@kit.AdsKit';
 import { BusinessError } from '@kit.BasicServicesKit';
 
 const DOMAIN = 0x0000;
 
 export default class EntryAbility extends UIAbility {
-  onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void {
+  async onCreate(_: Want, __: AbilityConstant.LaunchParam) {
     this.context.getApplicationContext().setColorMode(ConfigurationConstant.ColorMode.COLOR_MODE_NOT_SET);
-    hilog.info(DOMAIN, 'testTag', '%{public}s', 'Ability onCreate');
   }
 
   onDestroy(): void {
@@ -27,7 +27,6 @@ export default class EntryAbility extends UIAbility {
   }
 
   onWindowStageCreate(windowStage: window.WindowStage): void {
-
     windowStage.loadContent('/pages/Index'.slice(1), (err) => {
       if (err.code) {
         hilog.error(DOMAIN, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err));
@@ -43,10 +42,8 @@ export default class EntryAbility extends UIAbility {
       })
 
       PersistentStorage.persistProp<string>(AppStorageKeyCollect.TOKEN, '')
-      if (AppStorage.get<string>(AppStorageKeyCollect.TOKEN)) {
-        YTUserRequest.refreshUserInfo()
-      }
-      // IBestInit(windowStage, this.context)
+
+      IBestInit(windowStage, this.context)
       bundleManager.getBundleInfoForSelf(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_SIGNATURE_INFO)
         .then(res => {
           YTLog.info(`signatureInfo:` + JSON.stringify(res.signatureInfo))
@@ -56,27 +53,28 @@ export default class EntryAbility extends UIAbility {
         })
       permissionController.init(this.context)
         .then(() => {
-          permissionController.askPermissions(["ohos.permission.APP_TRACKING_CONSENT"], (res, err) => {
-            if (err) {
-              YTLog.error(err)
-            } else {
-              if (res?.authResults[0] === 0) {
-                YTLog.info('succeeded in requesting permission');
-                identifier.getOAID((err: BusinessError, data: string) => {
-                  if (err.code) {
-                    YTLog.error(`get oaid failed, error: ${err.code} ${err.message}`);
-                  } else {
-                    const oaid: string = data;
-                    jHStartAd.init(this.context, oaid)
-                    AppStorage.setOrCreate('OAID', oaid)
-                    YTLog.info(`succeeded in getting oaid by callback , oaid: ${oaid}`);
-                  }
-                });
+          permissionController
+            .askPermissions(["ohos.permission.APP_TRACKING_CONSENT"], (res, err) => {
+              if (err) {
+                YTLog.error(err)
               } else {
-                YTLog.error('user rejected');
+                if (res?.authResults[0] === 0) {
+                  YTLog.info('succeeded in requesting permission');
+                  identifier.getOAID((err: BusinessError, data: string) => {
+                    if (err.code) {
+                      YTLog.error(`get oaid failed, error: ${err.code} ${err.message}`);
+                    } else {
+                      const oaid: string = data;
+                      jHStartAd.init(this.context, oaid)
+                      AppStorage.setOrCreate('OAID', oaid)
+                      YTLog.info(`succeeded in getting oaid by callback , oaid: ${oaid}`);
+                    }
+                  });
+                } else {
+                  YTLog.error('user rejected');
+                }
               }
-            }
-          })
+            })
         })
       // IBestSetGlobalConfig({
       //   unit: "vp",
@@ -105,13 +103,11 @@ export default class EntryAbility extends UIAbility {
       YTBreakPoint.setBreakPoint(windowWidth)
       windowClass.on('windowSizeChange', size => {
         YTBreakPoint.setBreakPoint(size.width)
+        AppStorage.setOrCreate(AppStorageKeyCollect.SCREEN_WIDTH, px2vp(size.width))
+        AppStorage.setOrCreate(AppStorageKeyCollect.SCREEN_HEIGHT, px2vp(size.height))
       })
-      //创建首选项 category
-      let preference: preferences.Preferences | null = null
-      preference = preferences.getPreferencesSync(getContext(), {
-        name: 'category'
-      })
-      AppStorage.setOrCreate<preferences.Preferences>('category', preference)
+      yTPreferences.init(this.context)
+      pushMessageUtil.init(this.context)
     });
 
   }

products/entry/src/main/ets/pages/Index.ets

@@ -1,4 +1,4 @@
-import { BasicType, YTAvoid, yTRouter, yTToast } from 'basic';
+import { BasicType, YTAvoid, yTRouter, yTToast, YTUserRequest } from 'basic';
 import { Mine } from 'user/src/main/ets/views/Mine';
 import { MainView, SecondView, ThirdView } from 'feature';
 
@@ -37,6 +37,10 @@ struct Index {
       context: this.getUIContext(),
       options: { alignment: DialogAlignment.Center, maskColor: '#80000000' }
     })
+
+    YTUserRequest.refreshUserInfo((res, err) => {
+      //TODO 在此处发起需要登录的请求
+    })
   }
 
   build() {