feat:优化我的收藏

@@ -29,7 +29,8 @@ export struct Card17Component {
         // 三个图，
         // 三个图，
         GridRow({ gutter: 2 }) {
         GridRow({ gutter: 2 }) {
           GridCol({ span: { xs: 8 } }) {
           GridCol({ span: { xs: 8 } }) {
-            Image(this.contentDTO.fullColumnImgUrls[0].url)
+            Image(this.contentDTO.fullColumnImgUrls.length > 0 ?this.contentDTO.fullColumnImgUrls[0].url:'')
+              .backgroundColor('#f5f5f5')
               .width(CommonConstants.FULL_WIDTH)
               .width(CommonConstants.FULL_WIDTH)
               .aspectRatio(16 / 9)
               .aspectRatio(16 / 9)
               .borderRadius({
               .borderRadius({
@@ -39,7 +40,8 @@ export struct Card17Component {
           }
           }
 
 
           GridCol({ span: { xs: 4 } }) {
           GridCol({ span: { xs: 4 } }) {
-            Image(this.contentDTO.fullColumnImgUrls[1].url)
+            Image(this.contentDTO.fullColumnImgUrls.length > 1? this.contentDTO.fullColumnImgUrls[1].url:'')
+              .backgroundColor('#f5f5f5')
               .width(CommonConstants.FULL_WIDTH)
               .width(CommonConstants.FULL_WIDTH)
               .aspectRatio(16 / 9)
               .aspectRatio(16 / 9)
               .margin({ bottom: 1 })
               .margin({ bottom: 1 })
@@ -54,7 +56,8 @@ export struct Card17Component {
           }
           }
 
 
           GridCol({ span: { xs: 4 } }) {
           GridCol({ span: { xs: 4 } }) {
-            Image(this.contentDTO.fullColumnImgUrls[2].url)
+            Image(this.contentDTO.fullColumnImgUrls.length > 2? this.contentDTO.fullColumnImgUrls[2].url:'')
+              .backgroundColor('#f5f5f5')
               .width(CommonConstants.FULL_WIDTH)
               .width(CommonConstants.FULL_WIDTH)
               .aspectRatio(16 / 9)
               .aspectRatio(16 / 9)
               .margin({ top: 1 })
               .margin({ top: 1 })

@@ -51,11 +51,7 @@ struct EditUserIntroductionPage {
         .borderRadius(5)
         .borderRadius(5)
         .margin(30)
         .margin(30)
         .onClick(()=>{
         .onClick(()=>{
-          let currentUserInfo:editModel = new editModel()
-          currentUserInfo.userExtend.introduction = this.introduction
-          currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_intro
-          this.updateEditModel(currentUserInfo)
-
+          this.updateEditModel()
           let params: editModelParams = {
           let params: editModelParams = {
             introduction: this.introduction
             introduction: this.introduction
           }
           }
@@ -68,7 +64,10 @@ struct EditUserIntroductionPage {
   }
   }
 
 
 
 
-  updateEditModel(Info:editModel){
-    EditInfoViewModel.updateUserInfo(Info)
+  updateEditModel(){
+    let currentUserInfo:editModel = new editModel()
+    currentUserInfo.userExtend.introduction = this.introduction
+    currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_intro
+    EditInfoViewModel.updateUserInfo(currentUserInfo)
   }
   }
 }
 }

@@ -2,6 +2,8 @@ import { CustomTitleUI } from '../reusable/CustomTitleUI'
 import router from '@ohos.router'
 import router from '@ohos.router'
 import { editModel, editModelParams, WDEditDataModelType } from '../../model/EditInfoModel'
 import { editModel, editModelParams, WDEditDataModelType } from '../../model/EditInfoModel'
 import EditInfoViewModel from '../../viewmodel/EditInfoViewModel';
 import EditInfoViewModel from '../../viewmodel/EditInfoViewModel';
+// import { encryptMessage } from '../../../utils/cryptoUtil'
+import { encryptMessage } from 'wdLogin/src/main/ets/utils/cryptoUtil'
 @Entry
 @Entry
 @Component
 @Component
 struct EditUserNikeNamePage {
 struct EditUserNikeNamePage {
@@ -51,25 +53,24 @@ struct EditUserNikeNamePage {
         .borderRadius(5)
         .borderRadius(5)
         .margin(30)
         .margin(30)
         .onClick(()=>{
         .onClick(()=>{
-
           ///内部更新
           ///内部更新
-          let currentUserInfo:editModel = new editModel()
-          currentUserInfo.userExtend.introduction = this.nikeName
-          currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_nickname
-          this.updateEditModel(currentUserInfo)
-
-          let params: editModelParams = {
-            userName: this.nikeName
-          }
-          router.back({
-            url:'',
-            params:params
-          })
+          this.updateEditModel()
         })
         })
     }
     }
   }
   }
 
 
-  updateEditModel(Info:editModel){
-    EditInfoViewModel.updateUserInfo(Info)
+   async  updateEditModel(){
+     let currentUserInfo:editModel = new editModel()
+     currentUserInfo.userName = await encryptMessage(this.nikeName);
+     currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_nickname
+     EditInfoViewModel.updateUserInfo(currentUserInfo).then(()=>{
+       let params: editModelParams = {
+         userName: this.nikeName
+       }
+       router.back({
+         url:'',
+         params:params
+       })
+     })
   }
   }
 }
 }

@@ -53,7 +53,11 @@ class MyCollectionViewModel {
       let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders()
       let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders()
       WDHttp.post<ResponseDTO>(HttpUrlUtils.getExecuteCollcetUrl(),params,headers).then((navResDTO: ResponseDTO) => {
       WDHttp.post<ResponseDTO>(HttpUrlUtils.getExecuteCollcetUrl(),params,headers).then((navResDTO: ResponseDTO) => {
         if (navResDTO.code == 0) {
         if (navResDTO.code == 0) {
-          promptAction.showToast({ message: '删除成功' })
+          if(params.status === 1){
+            promptAction.showToast({ message: '收藏成功' })
+          } else {
+            promptAction.showToast({ message: '删除成功' })
+          }
         }
         }
       })
       })
         .catch((error: Error) => {
         .catch((error: Error) => {