Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

@@ -73,16 +73,18 @@ export  struct InteractMComponent {
                 .height('12')
                 .height('12')
             }.margin({top:10,bottom:15})
             }.margin({top:10,bottom:15})
           }.padding({left:10,right:10}).alignItems(HorizontalAlign.Start).backgroundColor('#f5f5f5').borderRadius(5)
           }.padding({left:10,right:10}).alignItems(HorizontalAlign.Start).backgroundColor('#f5f5f5').borderRadius(5)
+
+        }
+      }.padding({left:5,right:5}).alignItems(HorizontalAlign.Start).width('90%')
+    }.padding({top:10,left:16,right:16}).width('100%').alignItems(VerticalAlign.Top)
     .onClick(()=>{
     .onClick(()=>{
+      if(this.messageModel.contentType === '211') return
       let  contentDTO :ContentDTO = new ContentDTO();
       let  contentDTO :ContentDTO = new ContentDTO();
       contentDTO.objectType = this.messageModel.InteractMsubM.contentType
       contentDTO.objectType = this.messageModel.InteractMsubM.contentType
       contentDTO.objectId = this.messageModel.InteractMsubM.contentId
       contentDTO.objectId = this.messageModel.InteractMsubM.contentId
       ProcessUtils.processPage(contentDTO)
       ProcessUtils.processPage(contentDTO)
     })
     })
   }
   }
-      }.padding({left:5,right:5}).alignItems(HorizontalAlign.Start).width('90%')
-    }.padding({top:10,left:16,right:16}).width('100%').alignItems(VerticalAlign.Top)
-  }
 
 
   buildContentString(): string {
   buildContentString(): string {
     let contentString: string = ''
     let contentString: string = ''

@@ -45,10 +45,11 @@ struct EditUserIntroductionPage {
       Divider()
       Divider()
         .margin(20)
         .margin(20)
 
 
-      Text('1、账号中(头像、昵称等)不允许含有违禁违规内容；\n2、最多60个字，只能输入中文、数字、英文字母。')
+      Row(){
+        Text('1、账号中(头像、昵称等)不允许含有违禁违规内容；\n2、最多16个字，只能输入中文、数字、英文字母。')
           .fontSize(13)
           .fontSize(13)
-        .padding(12)
           .fontColor(Color.Gray).lineHeight(25)
           .fontColor(Color.Gray).lineHeight(25)
+      }.padding({left:16}).width('100%')
 
 
       Button('保存')
       Button('保存')
         .type(ButtonType.Normal)
         .type(ButtonType.Normal)

@@ -47,10 +47,12 @@ struct EditUserNikeNamePage {
       Divider()
       Divider()
         .margin(20)
         .margin(20)
 
 
+      Row(){
         Text('1、账号中(头像、昵称等)不允许含有违禁违规内容；\n2、最多16个字，只能输入中文、数字、英文字母。')
         Text('1、账号中(头像、昵称等)不允许含有违禁违规内容；\n2、最多16个字，只能输入中文、数字、英文字母。')
           .fontSize(13)
           .fontSize(13)
-        .padding(12)
           .fontColor(Color.Gray).lineHeight(25)
           .fontColor(Color.Gray).lineHeight(25)
+      }.padding({left:16}).width('100%')
+
 
 
       Button('保存')
       Button('保存')
         .type(ButtonType.Normal)
         .type(ButtonType.Normal)

@@ -69,7 +69,15 @@ struct InteractMessagePage {
       // 下拉刷新
       // 下拉刷新
       ForEach(this.allDatas, (InteractM: InteractMessageModel, compIndex: number) => {
       ForEach(this.allDatas, (InteractM: InteractMessageModel, compIndex: number) => {
         ListItem() {
         ListItem() {
+          Column(){
             InteractMComponent({messageModel:InteractM})
             InteractMComponent({messageModel:InteractM})
+
+            Divider()
+              .color('#f5f5f5')
+              .width('100%')
+              .strokeWidth(1)
+              .padding({left:16,right:16,top:16})
+          }
         }
         }
       })
       })
       // 加载更多
       // 加载更多

@@ -20,6 +20,7 @@ struct MyCollectionListPage {
   @State private browSingModel: PageModel = new PageModel()
   @State private browSingModel: PageModel = new PageModel()
   isloading : boolean = false
   isloading : boolean = false
   @Provide isEditState:boolean = false
   @Provide isEditState:boolean = false
+  @State isDisplayButton:boolean = false
   @State allDatas :ContentDTO[] = [];
   @State allDatas :ContentDTO[] = [];
   @State selectDatas :ContentDTO[] = [];
   @State selectDatas :ContentDTO[] = [];
   @Provide deleteNum :number = 0;
   @Provide deleteNum :number = 0;
@@ -48,7 +49,7 @@ struct MyCollectionListPage {
 
 
   build() {
   build() {
     Column(){
     Column(){
-      CustomTitleAndEditUI({titleName:'我的收藏',isDisplayButton:this.browSingModel.viewType == ViewType.ERROR || this.browSingModel.viewType == ViewType.EMPTY?false:true,editCallback:()=>{
+      CustomTitleAndEditUI({titleName:'我的收藏',isDisplayButton:this.isDisplayButton,editCallback:()=>{
         this.allSelectDatas(false)
         this.allSelectDatas(false)
         this.isAllSelect = false
         this.isAllSelect = false
         this.selectDatas = []
         this.selectDatas = []
@@ -159,16 +160,19 @@ struct MyCollectionListPage {
           } else {
           } else {
             this.browSingModel.hasMore = true;
             this.browSingModel.hasMore = true;
           }
           }
+          this.isDisplayButton = true;
         } else {
         } else {
           if (this.currentPage === 1) {
           if (this.currentPage === 1) {
             this.browSingModel.viewType = ViewType.EMPTY;
             this.browSingModel.viewType = ViewType.EMPTY;
             this.browSingModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoCollection
             this.browSingModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoCollection
+            this.isDisplayButton = false;
           }
           }
         }
         }
       })
       })
     } else {
     } else {
       this.browSingModel.viewType = ViewType.EMPTY;
       this.browSingModel.viewType = ViewType.EMPTY;
       this.browSingModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoNetwork;
       this.browSingModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoNetwork;
+      this.isDisplayButton = false;
     }
     }
   }
   }
 
 
@@ -231,6 +235,7 @@ struct MyCollectionListPage {
     if (this.allDatas.length === 0) {
     if (this.allDatas.length === 0) {
       this.browSingModel.viewType = ViewType.EMPTY;
       this.browSingModel.viewType = ViewType.EMPTY;
       this.browSingModel.hasMore === true
       this.browSingModel.hasMore === true
+      this.isDisplayButton = false;
     }
     }
   }
   }
 
 

@@ -4,7 +4,7 @@ import router from '@ohos.router'
 export struct CustomTitleAndEditUI {
 export struct CustomTitleAndEditUI {
   imgBack:boolean = true
   imgBack:boolean = true
   titleName:string = "默认标题"
   titleName:string = "默认标题"
-  isDisplayButton:boolean = false
+  @Link isDisplayButton:boolean
   @Consume isEditState:boolean
   @Consume isEditState:boolean
   editCallback: () => void = () => {
   editCallback: () => void = () => {
   }
   }

@@ -39,18 +39,18 @@ export  struct AreaPickerDialog {
             this.confirmCallback(this.currentFirst.label,this.currentSecondBean.label,this.currentThirdBean.label,this.currentFirst.label+this.currentSecondBean.label+this.currentThirdBean.label);
             this.confirmCallback(this.currentFirst.label,this.currentSecondBean.label,this.currentThirdBean.label,this.currentFirst.label+this.currentSecondBean.label+this.currentThirdBean.label);
           })
           })
           .backgroundColor(0xffffff)
           .backgroundColor(0xffffff)
-          .fontColor(Color.Blue)
+          .fontColor('#ED2800')
           .layoutWeight(1)
           .layoutWeight(1)
       }
       }
       .margin({top:0,bottom:10})
       .margin({top:0,bottom:10})
 
 
       Row(){
       Row(){
-        FirstLevelComponent().width('30%')
-        SecondLevelComponent().width('30%')
-        ThirdLevelComponent().width('30%')
+        FirstLevelComponent().width('33%')
+        SecondLevelComponent().width('33%')
+        ThirdLevelComponent().width('33%')
       }
       }
     }
     }
     .height('40%')
     .height('40%')
-
+    .width('100%')
   }
   }
 }
 }

@@ -165,7 +165,7 @@ struct MineHomePage {
             //用户简介区域
             //用户简介区域
             Column() {
             Column() {
               Row() {
               Row() {
-                Text(this.desc)
+                Text(this.isHasIntroduction?"简介："+this.desc:this.desc)
                   .fontSize('27lpx')
                   .fontSize('27lpx')
                   .maxLines(3)
                   .maxLines(3)
                   .textOverflow({ overflow: TextOverflow.Ellipsis })
                   .textOverflow({ overflow: TextOverflow.Ellipsis })
@@ -417,7 +417,7 @@ struct MineHomePage {
         this.userName = value.userName
         this.userName = value.userName
         this.headPhotoUrl = value.headPhotoUrl
         this.headPhotoUrl = value.headPhotoUrl
         if(StringUtils.isNotEmpty(value.introduction)){
         if(StringUtils.isNotEmpty(value.introduction)){
-          this.desc = "简介：" + value.introduction
+          this.desc = value.introduction
           this.isHasIntroduction = true
           this.isHasIntroduction = true
         }else{
         }else{
           this.desc = "点击添加简介，让大家认识你"
           this.desc = "点击添加简介，让大家认识你"

@@ -47,7 +47,7 @@ export class RefreshConstants {
    * The NoMoreLayout constants.
    * The NoMoreLayout constants.
    */
    */
   static readonly NoMoreLayoutConstant_NORMAL_PADDING: number = 8;
   static readonly NoMoreLayoutConstant_NORMAL_PADDING: number = 8;
-  static readonly NoMoreLayoutConstant_TITLE_FONT: string = '16vp';
+  static readonly NoMoreLayoutConstant_TITLE_FONT: string = '12vp';
   static readonly NoMoreLayoutConstant_TITLE_COLOR: string = '#666666';
   static readonly NoMoreLayoutConstant_TITLE_COLOR: string = '#666666';
   /**
   /**
    * The RefreshLayout constants.
    * The RefreshLayout constants.

@@ -109,6 +109,8 @@ export struct OperationListView {
       contentList: [{
       contentList: [{
         contentId: this.contentDetailData?.newsId + '',
         contentId: this.contentDetailData?.newsId + '',
         contentType: this.contentDetailData?.newsType + '',
         contentType: this.contentDetailData?.newsType + '',
+        relType: this.contentDetailData?.reLInfo?.relType + '',
+        contentRelId: this.contentDetailData?.reLInfo?.relId + '',
       }],
       }],
 
 
     }
     }

@@ -87,6 +87,8 @@ export struct PlayerRightView {
       contentList: [{
       contentList: [{
         contentId: this.contentDetailData?.newsId + '',
         contentId: this.contentDetailData?.newsId + '',
         contentType: this.contentDetailData?.newsType + '',
         contentType: this.contentDetailData?.newsType + '',
+        relType: this.contentDetailData?.reLInfo?.relType + '',
+        contentRelId: this.contentDetailData?.reLInfo?.relId + '',
       }],
       }],
 
 
     }
     }

@@ -17,7 +17,7 @@ struct GuidePages {
           this.ChildItem(index)
           this.ChildItem(index)
 
 
         }, (item: number) => JSON.stringify(item))
         }, (item: number) => JSON.stringify(item))
-      }.loop(false)
+      }.loop(false).disableSwipe(true)
       .indicator(false)
       .indicator(false)
       .width('100%')
       .width('100%')
       .height('100%')
       .height('100%')