Merge remote-tracking branch 'origin/main'

@@ -10,6 +10,10 @@ export class SpConstants{
    static  USER_STATUS="user_status"
    static  USER_TEMP_TOKEN="tempToken"
    static  USER_PHONE = "user_phone"
+   static  USER_CREATOR_ID = "creatorId"
+   static  USER_HEAD_PHOTO_URL = "headPhotoUrl"
+   static  USER_SEX = "sex"
+   static  USER_BIRTHDAY = "birthday"
    //协议相关
    static NET_SERVICE_PROTOCOL = "user_protocol" //人民日报客户端网络服务使用协议
    static PRIVATE_PROTOCOL = "private_protocol" //人民日报客户端用户隐私协议

@@ -148,3 +148,8 @@ export {
   InfluenceData
 } from './src/main/ets/bean/peoples/PeopleShipUserDetailData';
 
+export {
+  UserDetail,
+  UserExtend
+} from './src/main/ets/bean/user/UserDetail';
+

+export interface UserDetail{
+  createTime:string
+  headPhotoStatus:number
+  id:number
+  modifyNumber:number
+  phone:string
+  status:number
+  tenancy:number
+  userNameStatus:number
+  userType:number
+  userName:string
+  userExtend:UserExtend
+}
+
+ export interface UserExtend{
+  airec:number
+  deviceId:string
+  lastLoginTime:string
+  sex:number
+  address:string
+  birthday:string
+  city:string
+  county:string
+  headPhotoUrl:string
+  introduction:string
+  province:string
+  sign:string
+  creatorId:string
+}
+

@@ -7,6 +7,7 @@ import { CheckVerifyBean } from './CheckVerifyBean';
 import {
   SpConstants
 } from '../../../../../../../commons/wdNetwork/oh_modules/wdConstant/src/main/ets/constants/SpConstants'
+import { UserDetail } from 'wdBean/Index';
 
 
 const TAG = 'LoginModel'
@@ -302,5 +303,26 @@ export class LoginModel {
     })
   }
 
+  queryUserDetail() {
+    let bean: Record<string, string> = {};
+    let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
+    return new Promise<UserDetail>((success, fail) => {
+      HttpBizUtil.get<ResponseDTO<UserDetail>>(HttpUrlUtils.queryUserDetail(), headers).then((data: ResponseDTO<UserDetail>) => {
+        if (!data || !data.data) {
+          fail("数据为空")
+          return
+        }
+        if (data.code != 0) {
+          fail(data.message)
+          return
+        }
+        success(data.data)
+      }, (error: Error) => {
+        fail(error.message)
+        Logger.debug("LoginViewModel:error ", error.toString())
+      })
+    })
+  }
+
 }
 

@@ -321,13 +321,7 @@ struct LoginPage {
         ///同步兴趣tag
         let interestsModel = new InterestsHobbiesModel()
         interestsModel.updateInterests()
-
-        router.back({
-          params: { userName: data.userName,
-            userId:data.id},
-          url: `${WDRouterPage.getBundleInfo()}`
-        }
-        )
+        this.queryUserDetail()
       }).catch((error:string)=>{
         promptAction.showToast({ message: error })
       })
@@ -339,12 +333,12 @@ struct LoginPage {
         ///同步兴趣tag
         let interestsModel = new InterestsHobbiesModel()
         interestsModel.updateInterests()
-
-        router.back({
-          params: { userName: data.userName,
-            userId:data.id},
-          url: `${WDRouterPage.getBundleInfo()}`
-        })
+        this.queryUserDetail()
+        // router.back({
+        //   params: { userName: data.userName,
+        //     userId:data.id},
+        //   url: `${WDRouterPage.getBundleInfo()}`
+        // })
       }).catch((value: string) => {
         promptAction.showToast({ message: value })
       })
@@ -352,6 +346,19 @@ struct LoginPage {
 
   }
 
+  queryUserDetail(){
+    this.loginViewModel.queryUserDetail().then(()=>{
+      router.back({
+        url: `${WDRouterPage.getBundleInfo()}`
+      }
+      )
+    }).catch(()=>{
+      router.back({
+        url: `${WDRouterPage.getBundleInfo()}`
+      })
+    })
+  }
+
   //登录
   loginSubmit() {
     Logger.debug(TAG, "loginSubmit " + this.checkCodePage)

@@ -9,6 +9,7 @@ import { encryptMessage } from '../../utils/cryptoUtil'
 
 import { HttpUrlUtils } from 'wdNetwork/src/main/ets/http/HttpUrlUtils'
 import { SpConstants } from 'wdConstant/Index'
+import { UserDetail } from 'wdBean/Index';
 
 const TAG = "LoginViewModel"
 
@@ -213,4 +214,26 @@ export class LoginViewModel {
     return bufferStr;
 
   }
+
+  queryUserDetail(){
+    return new Promise<UserDetail>((success, fail) => {
+      this.loginModel.queryUserDetail().then((data: UserDetail) => {
+        //保存sp
+        if(data){
+          SPHelper.default.save(SpConstants.USER_NAME, data.userName)
+          SPHelper.default.save(SpConstants.USER_PHONE, data.phone)
+        }
+        if(data.userExtend){
+          SPHelper.default.save(SpConstants.USER_SEX, data.userExtend.sex)
+          SPHelper.default.save(SpConstants.USER_CREATOR_ID, data.userExtend.creatorId+"")
+          SPHelper.default.save(SpConstants.USER_HEAD_PHOTO_URL, data.userExtend.headPhotoUrl)
+          SPHelper.default.save(SpConstants.USER_BIRTHDAY, data.userExtend.birthday)
+        }
+
+        success(data)
+      }).catch(() => {
+        fail()
+      })
+    })
+  }
 }
\ No newline at end of file