优化了UserInfo类的使用

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

@@ -13,7 +13,7 @@ import { yTRouter } from '../utils/YTRouter';
 
 // export const baseURL: string = 'https://hm-test.ytpm.net/prod-api'
 
-export const baseURL: string = 'http://192.168.1.160:9900'
+export const baseURL: string = 'https://hm.ytpm.net/prod-warhouse'
 
 export const instance = axios.create({
   baseURL,

commons/basic/src/main/ets/models/UserInfo.ets

@@ -37,35 +37,35 @@ export class UserInfo {
    * @param _userInfo
    */
   setUserInfoAndLogin(_userInfo: UserInfo) {
-    userInfo.isLogin = true
+    this.isLogin = true
     if (_userInfo.token) {
       userInfo.token = _userInfo.token
     }
-    userInfo.memberEmail = _userInfo.memberEmail
-    userInfo.memberIcon = _userInfo.memberIcon
-    userInfo.memberName = _userInfo.memberName
-    userInfo.userId = _userInfo.userId
-    userInfo.memberScore = _userInfo.memberScore
-    userInfo.aiCount = _userInfo.aiCount
-    userInfo.memberPhone = _userInfo.memberPhone
+    this.memberEmail = _userInfo.memberEmail
+    this.memberIcon = _userInfo.memberIcon
+    this.memberName = _userInfo.memberName
+    this.userId = _userInfo.userId
+    this.memberScore = _userInfo.memberScore
+    this.aiCount = _userInfo.aiCount
+    this.memberPhone = _userInfo.memberPhone
     emitter.emit('refreshList')
-    AppStorage.setOrCreate(UserInfo.KEY, userInfo)
+    AppStorage.setOrCreate(UserInfo.KEY, this)
   }
 
   /**
    * @description 登出并清空用户信息
    */
   logout() {
-    userInfo.isLogin = false
-    userInfo.token = undefined
-    userInfo.memberEmail = undefined
-    userInfo.memberIcon = undefined
-    userInfo.memberName = undefined
-    userInfo.userId = undefined
-    userInfo.memberScore = undefined
-    userInfo.aiCount = undefined
-    userInfo.memberPhone = undefined
-    AppStorage.setOrCreate(UserInfo.KEY, userInfo)
+    this.isLogin = false
+    this.token = undefined
+    this.memberEmail = undefined
+    this.memberIcon = undefined
+    this.memberName = undefined
+    this.userId = undefined
+    this.memberScore = undefined
+    this.aiCount = undefined
+    this.memberPhone = undefined
+    AppStorage.setOrCreate(UserInfo.KEY, this)
     AppStorage.setOrCreate(AppStorageKeyCollect.TOKEN, undefined)
   }
 
@@ -74,81 +74,108 @@ export class UserInfo {
    * @returns boolean
    */
   checkLogin() {
-    return userInfo.isLogin
+    return this.isLogin
   }
 
   getToken() {
-    return userInfo.token
+    return this.token
   }
 
 
   setToken(token: string) {
-    userInfo.token = token
+    this.token = token
     AppStorage.setOrCreate<string>(AppStorageKeyCollect.TOKEN, token)
-    AppStorage.setOrCreate(UserInfo.KEY, userInfo)
+    AppStorage.setOrCreate(UserInfo.KEY, this)
+    return this
   }
 
   getHeadImg() {
-    return userInfo.memberIcon
+    if (this.memberIcon) {
+      return this.memberIcon
+    }
+    return $r('app.media.app_icon')
   }
 
   setHeadImg(headImg: string) {
-    userInfo.memberIcon = headImg
-    AppStorage.setOrCreate(UserInfo.KEY, userInfo)
+    this.memberIcon = headImg
+    AppStorage.setOrCreate(UserInfo.KEY, this)
+    return this
   }
 
   getEmail() {
-    return userInfo.memberEmail
+    return this.memberEmail
   }
 
   setEmail(email: string) {
-    userInfo.memberEmail = email
-    AppStorage.setOrCreate(UserInfo.KEY, userInfo)
+    this.memberEmail = email
+    AppStorage.setOrCreate(UserInfo.KEY, this)
+    return this
   }
 
   getName() {
-    return userInfo.memberName
+    // this.userInfo.getName() ?? this.userInfo.getPhoneNumber() ?? this.userInfo.getId()?.toString()
+    if (this.memberName) {
+      return this.memberName
+    } else if (this.memberPhone) {
+      return this.memberPhone
+    } else if (this.userId) {
+      return this.userId?.toString()
+    } else {
+      if (this.isLogin) {
+        return '华为用户'
+      }
+      return '未登录'
+    }
   }
 
   setName(name: string) {
-    userInfo.memberName = name
-    AppStorage.setOrCreate(UserInfo.KEY, userInfo)
+    this.memberName = name
+    AppStorage.setOrCreate(UserInfo.KEY, this)
+    return this
   }
 
   getId() {
-    return userInfo.userId
+    //(this.userInfo.getId()?.toString().padStart(8, '0') ?? '00000000')
+    if (this.userId) {
+      return this.userId.toString().padStart(8, '0')
+    }
+    return '00000000'
   }
 
   setId(id: number) {
-    userInfo.userId = id
-    AppStorage.setOrCreate(UserInfo.KEY, userInfo)
+    this.userId = id
+    AppStorage.setOrCreate(UserInfo.KEY, this)
+    return this
   }
 
   getGoldNum() {
-    return userInfo.memberScore
+    return this.memberScore
   }
 
   setGoldNum(goldNum: number) {
-    userInfo.memberScore = goldNum
-    AppStorage.setOrCreate(UserInfo.KEY, userInfo)
+    this.memberScore = goldNum
+    AppStorage.setOrCreate(UserInfo.KEY, this)
+    return this
   }
 
   getAiNum() {
-    return userInfo.aiCount
+    return this.aiCount
   }
 
   setAiNum(aiNum: number) {
-    userInfo.aiCount = aiNum
-    AppStorage.setOrCreate(UserInfo.KEY, userInfo)
+    this.aiCount = aiNum
+    AppStorage.setOrCreate(UserInfo.KEY, this)
+    return this
   }
 
   getPhoneNumber() {
-    return userInfo.memberPhone
+    return this.memberPhone
   }
 
   setPhoneNumber(phoneNumber: string) {
-    userInfo.memberPhone = phoneNumber
-    AppStorage.setOrCreate(UserInfo.KEY, userInfo)
+    this.memberPhone = phoneNumber
+    AppStorage.setOrCreate(UserInfo.KEY, this)
+    return this
   }
 }
 

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

@@ -14,7 +14,7 @@ import { userInfo, UserInfo } from '../models/UserInfo';
 import { HuaweiAuthPlugin } from './HuaWeiAuthPlugin';
 
 
-export const baseURL: string = 'https://hm-test.ytpm.net/prod-api'
+export const baseURL: string = 'https://hm.ytpm.net/prod-warhouse'
 
 export const instance = axios.create({
   baseURL,

features/user/src/main/ets/pages/SettingPage.ets

@@ -142,12 +142,12 @@ struct SettingPage {
         .fontColor('#80000000')
       Row() {
         if (typeof item.src == 'string') {
-          Image(this.userInfo.getHeadImg() ? this.userInfo.getHeadImg() : $r('app.media.default_img'))
+          Image(this.userInfo.getHeadImg())
             .height(24)
             .width(24)
             .borderRadius(12)
         } else {
-          Text(this.userInfo.getName() ?? this.userInfo.getPhoneNumber() ?? this.userInfo.getId()?.toString())
+          Text(this.userInfo.getName())
             .fontSize($r('[basic].float.page_text_font_size_12'))
             .fontColor('#CC000000')
         }

features/user/src/main/ets/views/Mine.ets

@@ -1,12 +1,5 @@
 import {
-  BasicType,
-  copyText,
-  IBestToast,
-  userInfo,
-  UserInfo,
-  YTAvoid,
-  YTLog,
-  yTRouter
+  BasicType, copyText, IBestToast, userInfo, UserInfo, YTAvoid, YTLog, yTRouter
 } from 'basic'
 import { common, Want } from '@kit.AbilityKit'
 import { BusinessError } from '@kit.BasicServicesKit'
@@ -63,25 +56,24 @@ export struct Mine {
     Column() {
       Row() {
         Row() {
-          Image(this.userInfo.getHeadImg() ?? $r('app.media.app_icon'))
+          Image(this.userInfo.getHeadImg())
             .aspectRatio(1)
             .height(40)
             .borderRadius(20)
             .margin({ right: 9 })
 
           Column({ space: 7 }) {
-            Text(this.userInfo.getName() ?? this.userInfo.getPhoneNumber() ?? this.userInfo.getId()?.toString() ??
-              '未登录')
-              .fontSize($r('[basic].float.page_text_font_size_16'))
-              .fontColor('Color.Black')
+            Text(this.userInfo.getName())
+              .fontSize(16)
+              .fontColor(Color.Black)
             Text() {
-              Span('ID：' + (this.userInfo.getId()?.toString().padStart(8, '0') ?? '00000000'))
+              Span('ID：' + this.userInfo.getId())
               ImageSpan($r('app.media.copy'))
                 .width(7)
                 .height(8)
                 .margin({ left: 4 })
                 .onClick(() => {
-                  copyText((this.userInfo.getId()?.toString().padStart(8, '0') ?? '00000000'))
+                  copyText((this.userInfo.getId()))
                 })
                 .offset({ bottom: 4 })
             }