Merge remote-tracking branch 'origin/main'

@@ -72,6 +72,10 @@ export class UserDataLocal {
     SPHelper.default.save(UserDataLocal.USER_HEADER_URL, url)
   }
 
+  public static setUserType(type:string) {
+    SPHelper.default.save(UserDataLocal.USER_Type, type)
+  }
+
   public static setUserFollowOperation(timestamp:string) {
     SPHelper.default.saveSync(UserDataLocal.USER_FOLLOW_OPERATION, timestamp)
   }

@@ -323,6 +323,8 @@ export class ProcessUtils {
         extra: {
           relType: content?.relType,
           relId: content?.relId,
+          extra: content?.extra,
+          title: content?.newsTitle
         } as ExtraDTO
       } as Params,
     };

@@ -130,8 +130,6 @@ export { LiveInfoDTO } from './src/main/ets/bean/detail/LiveInfoDTO';
 
 export { postRecommendListParams } from './src/main/ets/bean/detail/postRecommendListParams';
 
-export { postThemeListParams } from './src/main/ets/bean/detail/postThemeListParams';
-
 export { LiveDTO } from './src/main/ets/bean/peoples/LiveDTO';
 
 export { contentVideosDTO } from './src/main/ets/bean/content/contentVideosDTO';
@@ -165,3 +163,7 @@ export {
   AttentionBatchDTO,
   CreatorDTO
 } from './src/main/ets/bean/peoples/AttentionBatchDTO';
+
+export { GoldenPositionExtraBean } from './src/main/ets/bean/content/GoldenPositionExtraBean';
+export { ClassBean } from './src/main/ets/bean/content/ClassBean';
+export { CreatorsBean } from './src/main/ets/bean/content/CreatorsBean';

@@ -17,4 +17,6 @@ export interface ExtraDTO extends ItemDTO {
   photoList: PhotoListBean[];
   swiperIndex?: number
   commentId?: string;
+  extra?:string
+  title: string
 }
\ No newline at end of file

+import { FullColumnImgUrlDTO } from '../detail/FullColumnImgUrlDTO';
+import { LiveInfoDTO } from '../detail/LiveInfoDTO';
+import { VideoInfoDTO } from '../detail/VideoInfoDTO';
+import { InteractDataDTO } from './InteractDataDTO';
+import { slideShows } from '../morningevening/slideShows';
+import { VoiceInfoDTO } from '../detail/VoiceInfoDTO';
+import { RmhInfoDTO } from '../detail/RmhInfoDTO';
+import { commentInfo } from './commentInfo';
+import { ArrayList } from '@kit.ArkTS';
+
+export interface ClassBean {
+  secondClassifyName:string
+  classifyName:string
+}
\ No newline at end of file

@@ -77,9 +77,11 @@ export interface ContentDTO {
   newTags: string;
   titleShow?: number;
   isSearch?: boolean; // 是否是搜索的结果，区分搜索和主页的数据
+  isCollection?: boolean; // 是否是收藏的结果，区分搜索和主页的数据
   commentInfo?: commentInfo
   //底部导航栏 id（用于频道跳转）
   bottomNavId:string;
   // 链接类型： 0：无链接；1：内链（文章）；2：外链
   openType:string
+  extra:string
 }
\ No newline at end of file

+export interface CreatorsBean {
+  id:number
+  name:string
+}
\ No newline at end of file

+import { ArrayList } from '@kit.ArkTS';
+import { ClassBean } from './ClassBean';
+import { CreatorsBean } from './CreatorsBean';
+
+export interface GoldenPositionExtraBean {
+  sort:number
+  pageNum:number
+  pageSize:number
+  channelId:string
+  topicId:string
+  keyWord:string
+  aggregateType:string
+  poolCode:string
+  showPublishStartTime:string
+  showPublishEndTime:string
+  keywordsType:string
+  keywords:ArrayList<string>
+  classifys: ArrayList<ClassBean>
+  creatorTags: ArrayList<CreatorsBean>
+}
\ No newline at end of file

-export interface postThemeListParams {
-  sort: number;
-  pageNum: number;
-  pageSize: number;
-}
\ No newline at end of file

 // import { FrontLinkObject, MorningEveningPaperDTO, PageInfoBean } from 'wdBean';
 import { CompList, PageInfoBean } from 'wdBean';
-import { DateTimeUtils, Logger, SPHelper } from 'wdKit/Index';
+import { DateTimeUtils, Logger, SPHelper, WindowModel } from 'wdKit/Index';
 import { PaperReaderSimpleDialog } from '../../dialog/PaperReaderDialog';
 import { MorningEveningViewModel } from '../../viewmodel/MorningEveningViewModel';
 // import { AudioBarView } from './AudioBarView';
@@ -102,6 +102,7 @@ export struct MorningEveningPaperComponent {
   async aboutToAppear() {
     let windowHight: window.Window = await window.getLastWindow(getContext(this));
     await windowHight.setWindowLayoutFullScreen(true);
+    WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
     this.topSafeHeight = px2vp(windowHight.getWindowAvoidArea(window.AvoidAreaType.TYPE_SYSTEM).topRect.height)
 
     let dailyPaperTopicPageId = await SPHelper.default.getSync('dailyPaperTopicPageId', "") as String
@@ -173,6 +174,7 @@ export struct MorningEveningPaperComponent {
   async aboutToDisappear() {
     let windowHight: window.Window = await window.getLastWindow(getContext(this));
     await windowHight.setWindowLayoutFullScreen(false);
+    WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
   }
 
   onPageHide() {

@@ -34,7 +34,7 @@ export struct PaperTitleComponent {
         Text(this.subTitle ?? '')// Text('2024年\n1月16日')
           // .width(50)
           .margin({ left: 5 })
-          .fontSize(12)
+          .fontSize(8)
           .fontColor($r('app.color.white'))
           .maxLines(2)
 
@@ -47,7 +47,8 @@ export struct PaperTitleComponent {
       .alignItems(VerticalAlign.Center)
       .alignRules({
         left: { anchor: "img_logo1", align: HorizontalAlign.End },
-        center: { anchor: "__container__", align: VerticalAlign.Center } })
+        center: { anchor: "__container__", align: VerticalAlign.Center }
+      })
       .id('row_paper_date')
 
       Image($r('app.media.icon_close'))
@@ -55,7 +56,8 @@ export struct PaperTitleComponent {
         .width($r('app.float.top_arrow_size'))
         .alignRules({
           right: { anchor: "__container__", align: HorizontalAlign.End },
-          center: { anchor: "__container__", align: VerticalAlign.Center } })
+          center: { anchor: "__container__", align: VerticalAlign.Center }
+        })
         .id('img_close')
         .onClick((event: ClickEvent) => {
           // console.info(TAG, "img_close")
@@ -68,11 +70,12 @@ export struct PaperTitleComponent {
         .width($r('app.float.top_arrow_size'))
         .alignRules({
           right: { anchor: "img_close", align: HorizontalAlign.Start },
-          center: { anchor: "__container__", align: VerticalAlign.Center } })
+          center: { anchor: "__container__", align: VerticalAlign.Center }
+        })
         .id('img_share')
         .margin({ right: 13 })
     }
-    // .margin({ left: 14, right: 14 })
+    .margin({ left: 14, right: 14 })
     .height($r('app.float.top_bar_height'))
 
     // .backgroundColor(Color.Black)

@@ -150,8 +150,11 @@ export struct SingleColumn999Component {
         scrollBackward: NestedScrollMode.SELF_FIRST
       })
     } else {
+      if (this.compListItem && this.compListItem?.operDataList) {
         EmptyComponent({ emptyHeight: 200 })
       }
+
+    }
   }
 
   // public buildLanes(): number {

@@ -28,7 +28,7 @@ export struct CardSourceInfo {
           .textOverflow({ overflow: TextOverflow.Ellipsis })
       }
       // 新闻tab下的卡片，2天之前的不显示时间。但是如果是搜索情况下展示的卡片，显示时间
-      if (this.contentDTO.isSearch || !this.contentDTO.isSearch && DateTimeUtils.getCommentTime
+      if (this.contentDTO.isSearch || this.contentDTO.isCollection || !this.contentDTO.isSearch && DateTimeUtils.getCommentTime
       (Number
         .parseFloat(this
           .contentDTO.publishTime))

@@ -9,13 +9,13 @@ export default struct MinePageUserSimpleInfoUI {
   @Watch('loginStateChange') @Prop isLogin :boolean
   @State userName:string = "登陆注册"
   @State headPhotoUrl:string = ""
+  userType:string = "1"
   @State levelHead:string = ""
   @State levelId:number = 0
 
   loginStateChange(){
     if(this.isLogin){
       this.getUserInfo()
-      this.getUserLevel()
     }else{
       this.headPhotoUrl = ""
       this.levelHead = ""
@@ -54,8 +54,10 @@ export default struct MinePageUserSimpleInfoUI {
             Text(this.userName)
               .fontColor($r('app.color.color_222222'))
               .maxLines(1)
+              .fontWeight(FontWeight.Bold)
               .textOverflow({ overflow: TextOverflow.Ellipsis })
               .fontSize('33lpx')
+              .lineHeight("46lpx")
 
             Image($r('app.media.mine_user_edit'))
               .width('27lpx')
@@ -144,7 +146,21 @@ export default struct MinePageUserSimpleInfoUI {
         this.userName = value.userName
         this.headPhotoUrl = value.headPhotoUrl
         UserDataLocal.setUserHeaderUrl(value.headPhotoUrl)
+
+        this.userType = value.userType
+        UserDataLocal.setUserType(value.userType)
+
+        if(this.userType === "1"){
+          if(StringUtils.isNotEmpty(value.honoraryIcon)){
+            this.levelHead = value.honoraryIcon
+            return
+          }
+          if(StringUtils.isNotEmpty(value.avatarFrame)){
+            this.levelHead = value.avatarFrame
+          }
         }
+      }
+      this.getUserLevel()
     }).catch((err:Error)=>{
       console.log(TAG,JSON.stringify(err))
     })
@@ -152,10 +168,14 @@ export default struct MinePageUserSimpleInfoUI {
   getUserLevel(){
     MinePageDatasModel.getUserLevelData(getContext(this)).then((value)=>{
       if(value!=null){
+        if(StringUtils.isEmpty(this.levelHead)){
+          if(this.userType === "1"){
             this.levelHead = value.levelHead
+          }
+        }
         this.levelId = value.levelId
-        UserDataLocal.setUserLevel(value.levelId)
-        UserDataLocal.setUserLevelHeaderUrl(value.levelHead + "")
+        UserDataLocal.setUserLevel(this.levelId)
+        UserDataLocal.setUserLevelHeaderUrl(this.levelHead + "")
       }
     }).catch((err:Error)=>{
       console.log(TAG,JSON.stringify(err))

@@ -128,7 +128,8 @@ struct EditUserInfoPage {
           onAccept:(value:DatePickerResult) => {
             let mon = value.month as number + 1
             let monStr = mon < 10? '0'+mon.toString():mon.toString();
-            this.currentUserInfo.userExtend.birthday = value.year+'-'+monStr+'-'+value.day;
+            let dayStr = value.day as number < 10? '0'+value.day:value.day;
+            this.currentUserInfo.userExtend.birthday = value.year+'-'+monStr+'-'+dayStr;
             this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_birthday
             this.updateEditModel()
           }

@@ -47,6 +47,7 @@ struct MyCollectionListPage {
         CustomPullToRefresh({
           alldata:this.allDatas,
           scroller:this.scroller,
+          hasMore:this.browSingModel.hasMore,
           customList:()=>{
             this.ListLayout()
           },
@@ -122,10 +123,14 @@ struct MyCollectionListPage {
       if (collectionItem && collectionItem.list && collectionItem.list.length > 0) {
         if (this.currentPage === 1) {
           this.allDatas = []
-          this.allDatas.push(...collectionItem.list)
-        }else {
-          this.allDatas = this.allDatas.concat(...collectionItem.list)
         }
+
+        for (let index = 0; index < collectionItem.list.length; index++) {
+          const compDTO = collectionItem.list[index];
+          compDTO.isCollection = true ///用于时间展示
+          this.allDatas.push(compDTO)
+        }
+
         if (collectionItem.hasNext === 0) {
           this.browSingModel.hasMore = false;
         } else {
@@ -188,8 +193,17 @@ struct MyCollectionListPage {
     })
 
     //重置删除状态
+    this.updataUIState()
+  }
+
+  updataUIState(){
     this.isEditState = false
     this.isAllSelect = false
+
+    if (this.allDatas.length === 0) {
+      this.browSingModel.viewType = ViewType.EMPTY;
+      this.browSingModel.hasMore === true
+    }
   }
 
 }
\ No newline at end of file

-import { ContentDTO } from 'wdBean';
+import { ContentDTO , Action,GoldenPositionExtraBean} from 'wdBean';
 import { CommonConstants ,ViewType} from 'wdConstant';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import RefreshLayout from '../page/RefreshLayout';
@@ -22,9 +22,14 @@ struct ThemeListPage {
   currentPage: number = 1;
   pageSize: number = 20;
   title: string = '金刚位聚合页'
+  extra: string = ''
 
   aboutToAppear(): void {
-    PageViewModel.postThemeList(this.sort, this.currentPage, this.pageSize).then((liveReviewDTO) => {
+    let par:Action =  router.getParams() as Action;
+    let params = par?.params;
+    this.extra = params?.extra?.extra || '';
+    this.title = params?.extra?.title || '';
+    PageViewModel.postThemeList(this.sort, this.currentPage, this.pageSize,this.extra).then((liveReviewDTO) => {
       console.log(`postThemeList${JSON.stringify(liveReviewDTO)}`)
       this.data.push(...liveReviewDTO.list)
       if(this.data.getDataArray().length > 0){

+import { ToastUtils } from 'wdKit';
+
 @Component
 export struct PeopleShipHomeAttentionComponent {
   @Consume isAttention: string
@@ -111,7 +113,7 @@ export struct PeopleShipHomeAttentionComponent {
         left: '-5vp'
       })
       .onClick(() => {
-
+        ToastUtils.showToast('分享为公共方法，待开发', 1000);
       })
 
     }

@@ -2,6 +2,7 @@ import router from '@ohos.router'
 import { PeopleShipUserDetailData } from 'wdBean'
 import { PeopleShipHomePageHeadComponent } from './PeopleShipHomePageHeadComponent'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
+import { ToastUtils } from 'wdKit';
 
 @Component
 export struct PeopleShipHomePageNavComponent {
@@ -126,7 +127,7 @@ export struct PeopleShipHomePageNavComponent {
             .objectFit(ImageFit.Auto)
             .margin({ right: '10vp' })
             .onClick(() => {
-
+              ToastUtils.showToast('分享为公共方法，待开发', 1000);
             })
         }
         .width('100%')

@@ -108,12 +108,14 @@ export struct SearchComponent {
               SearchHistoryComponent({ searchHistoryData: $searchHistoryData, onDelHistory: (): void => this.getSearchHistoryData(),onGetSearchRes: (item,index): void => this.getSearchHistoryResData(item,index) })
             }
 
+            if(this.searchHistoryData.length>0){
               //分隔符
               Divider()
                 .width('100%')
                 .height('1lpx')
                 .color($r('app.color.color_EDEDED'))
                 .strokeWidth('1lpx')
+            }
 
             SearchHotsComponent({onGetSearchRes: (item): void => this.getSearchHotResData(item)})
           }
@@ -123,7 +125,6 @@ export struct SearchComponent {
         .width('100%')
         .height('100%')
         .padding({ left: '31lpx', right: '31lpx' })
-        .margin({ top: '36lpx' })
       } else {
         if (this.hasChooseSearch) {
           //搜索结果

@@ -120,7 +120,7 @@ export struct SearchHistoryComponent{
       .columnsTemplate('1fr 1fr')
       .rowsGap('23lpx')
     }
-    .margin({bottom:'46lpx'})
+    .margin({top:"36lpx",bottom:'46lpx'})
   }
 
   getCategoryRowCount() {

@@ -41,19 +41,19 @@ export struct SearchHotsComponent{
 
         Text("热门搜索")
           .textAlign(TextAlign.Center)
-          .fontWeight('600lpx')
+          .fontWeight(FontWeight.Bold)
           .fontSize('33lpx')
           .lineHeight('46lpx')
           .fontColor($r('app.color.color_222222'))
-          .height('38lpx')
+          .height('46lpx')
       }
       .width('100%')
+      .margin({bottom:"15lpx"})
 
       List(){
         ForEach(this.searchHotsData,(item:SearchHotContentItem,index:number)=>{
           ListItem(){
               Column(){
-              Column(){
                 Row(){
                   Row(){
                     if(item.sequence <=3){
@@ -80,6 +80,7 @@ export struct SearchHotsComponent{
                       .fontWeight('400lpx')
                       .lineHeight('42lpx')
                   }.layoutWeight(1)
+
                   if(item.mark===1 || item.mark===2){
                     Image(item.mark===1?$r('app.media.search_hots_mark1'):$r('app.media.search_hots_mark2'))
                       .width('42lpx')
@@ -89,6 +90,7 @@ export struct SearchHotsComponent{
                   }
                 }.alignItems(VerticalAlign.Center)
                 .height('84lpx')
+                .width('100%')
                 .justifyContent(FlexAlign.SpaceBetween)
 
                 if(index != this.searchHotsData.length-1 ){
@@ -98,18 +100,15 @@ export struct SearchHotsComponent{
                     .color($r('app.color.color_F5F5F5'))
                     .strokeWidth('1lpx')
                 }
-              }.height('108lpx')
-              .justifyContent(FlexAlign.Center)
+              }.height('85lpx')
+              .width('100%')
               .alignItems(HorizontalAlign.Start)
-              .padding({left:'27lpx'})
-            }
           }
           .onClick(()=>{
             if (this.onGetSearchRes !== undefined) {
               this.onGetSearchRes(item.hotEntry)
             }
           })
-          .height('117lpx')
         })
       }.onScrollFrameBegin((offset, state) => {
         return { offsetRemain: 0 }

@@ -194,7 +194,8 @@ export struct SearchResultContentComponent{
           isSearch: true,
           publishTimestamp:"",
           bottomNavId:'',
-          openType:''
+          openType:'',
+          extra:''
         }
 
         this.data.push(contentDTO)

@@ -158,6 +158,22 @@ export struct ImageItemView {
 
   build() {
     Stack() {
+      if(this.imageUri != null && (this.imageUri.includes('.gif') || this.imageUri.includes('.GIF'))){
+        Image(this.imageUri)// TODO：知识点：宽高只根据其尺寸设置一个，通过保持宽高比来设置另一个属性
+          .width(this.fitWH === "width" ? "100%" : undefined)
+          .height(this.fitWH === "height" ? "100%" : undefined)
+          .aspectRatio(this.imageWHRatio)
+          .objectFit(ImageFit.Cover)// TODO：知识点：保持宽高比进行缩放，可以超出父组件，以便实现多图切换的增强功能
+          .autoResize(false)
+          .transform(this.matrix)// TODO：知识点：通过matrix控制图片的缩放
+          .defaultFocus(true)
+          .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
+          .offset({
+            // TODO：知识点：通过offset控制图片的偏移
+            x: this.imageOffsetInfo.currentX,
+            y: this.imageOffsetInfo.currentY
+          })
+      }else{
         Image(this.imagePixelMap)// TODO：知识点：宽高只根据其尺寸设置一个，通过保持宽高比来设置另一个属性
           .width(this.fitWH === "width" ? "100%" : undefined)
           .height(this.fitWH === "height" ? "100%" : undefined)
@@ -173,6 +189,8 @@ export struct ImageItemView {
             y: this.imageOffsetInfo.currentY
           })
       }
+
+    }
     .onBlur(() => {
       this.resetCurrentImageInfo();
     })

@@ -20,6 +20,7 @@ struct MineHomePage {
   @State userName:string = ""
   @State headPhotoUrl:string = ""
   @State levelHead:string = ""
+  userType:string = "1"
   @State levelId:number = 0
   @State desc:string = "点击添加简介，让大家认识你" //text 搞两个样式，如果三行，就显示 另外一个text  没有显示高度的
   @State isHasIntroduction: boolean = false
@@ -31,7 +32,6 @@ struct MineHomePage {
 
   onPageShow(): void {
     this.getUserInfo()
-    this.getUserLevel()
   }
 
   build() {
@@ -403,7 +403,20 @@ struct MineHomePage {
         this.attentionNum = value.attentionNum
         this.registTime = value.registTime
         this.getRegisterDays()
+
+        this.userType = value.userType
+
+        if(this.userType === "1"){
+          if(StringUtils.isNotEmpty(value.honoraryIcon)){
+            this.levelHead = value.honoraryIcon
+            return
+          }
+          if(StringUtils.isNotEmpty(value.avatarFrame)){
+            this.levelHead = value.avatarFrame
+          }
         }
+      }
+      this.getUserLevel()
     }).catch((err:Error)=>{
       console.log(TAG,JSON.stringify(err))
     })
@@ -411,7 +424,11 @@ struct MineHomePage {
   getUserLevel(){
     MinePageDatasModel.getUserLevelData(getContext(this)).then((value)=>{
       if(value!=null){
+        if(StringUtils.isEmpty(this.levelHead)){
+          if(this.userType === "1"){
             this.levelHead = value.levelHead
+          }
+        }
         this.levelId = value.levelId
       }
     }).catch((err:Error)=>{

@@ -3,6 +3,7 @@ import { display, router } from '@kit.ArkUI';
 import { ImageItemView } from '../components/view/ImageItemView';
 import { ImageDownloadComponent } from '../components/ImageDownloadComponent';
 import { Action } from 'wdBean';
+import { WindowModel } from 'wdKit/Index';
 
 const TAG = 'MultiPictureListPage';
 
@@ -23,6 +24,7 @@ export struct MultiPictureListPage {
   // @Provide bgc: Color = Color.White;
 
   aboutToAppear(): void {
+    this.openFullScreen()
     //获取宽高尺寸
     this.screenWidth = this.displayTool.width
     // this.picWidth = this.screenWidth - vp2px(52)
@@ -130,10 +132,36 @@ export struct MultiPictureListPage {
     }
     .width('100%')
     .height('100%')
+    .padding({top:$r('app.float.margin_44')})
     .backgroundColor(Color.Black)
     .id('e_picture_container')
     // 设置顶部绘制延伸到状态栏
     // 设置底部绘制延伸到导航条
     .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
   }
+
+  /**
+   * 开启沉浸式
+   * TODO:颜色待根据业务接口修改
+   */
+  openFullScreen() {
+    WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
+    WindowModel.shared.setWindowLayoutFullScreen(true)
+    // WindowModel.shared.setWindowSystemBarEnable([])
+  }
+
+  aboutToDisappear(): void {
+    console.log(TAG, 'aboutToDisappear')
+    this.closeFullScreen()
+  }
+
+  /**
+   * 关闭沉浸式
+   * TODO:颜色待根据业务接口修改
+   */
+  closeFullScreen() {
+    WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
+    WindowModel.shared.setWindowLayoutFullScreen(false)
+    // WindowModel.shared.setWindowSystemBarEnable(['status', 'navigation'])
+  }
 }
\ No newline at end of file

@@ -38,10 +38,10 @@ struct OtherNormalUserHomePage {
   @State commentNum:number = 0//评论数
   @State attentionNum:number = 0//关注数
   @State desc:string = ""
+  userType:string = "1"
 
   aboutToAppear(){
     this.getUserInfo()
-    this.getUserLevel()
   }
 
 
@@ -348,7 +348,20 @@ struct OtherNormalUserHomePage {
         this.browseNum = StringUtils.isEmpty(value.browseNum)?0:value.browseNum
         this.commentNum = StringUtils.isEmpty(value.commentNum)?0:value.commentNum
         this.attentionNum = StringUtils.isEmpty(value.attentionNum)?0:value.attentionNum
+
+        this.userType = value.userType
+
+        if(this.userType === "1"){
+          if(StringUtils.isNotEmpty(value.honoraryIcon)){
+            this.levelHead = value.honoraryIcon
+            return
+          }
+          if(StringUtils.isNotEmpty(value.avatarFrame)){
+            this.levelHead = value.avatarFrame
           }
+        }
+      }
+      this.getUserLevel()
     }).catch((err:Error)=>{
       console.log(TAG,JSON.stringify(err))
     })
@@ -359,7 +372,11 @@ struct OtherNormalUserHomePage {
     }
     MinePageDatasModel.getOtherUserLevelData([this.curUserId],getContext(this)).then((value)=>{
       if(value!=null){
+        if(StringUtils.isEmpty(this.levelHead)){
+          if(this.userType === "1"){
             this.levelHead = value[0].levelHead
+          }
+        }
         this.levelId = value[0].level
       }
     }).catch((err:Error)=>{

@@ -22,7 +22,7 @@ import {
   postExecuteLikeParams,
   postInteractAccentionOperateParams,
   postRecommendListParams,
-  postThemeListParams
+  GoldenPositionExtraBean
 } from 'wdBean';
 import { PageUIReqBean } from '../components/page/bean/PageUIReqBean';
 
@@ -437,7 +437,7 @@ export class PageRepository {
    * @param params
    * @returns
    * */
-  static postThemeList(params: postThemeListParams) {
+  static postThemeList(params: GoldenPositionExtraBean) {
     let url = HttpUrlUtils.getThemeListUrl()
     Logger.info(TAG, "postThemeList url = " + url + JSON.stringify(params))
     return WDHttp.post<ResponseDTO<LiveReviewDTO>>(url, params)

@@ -9,4 +9,10 @@ export class MineUserDetailItem{
   commentNum:number = 0//评论数
   attentionNum:number = 0//关注数
   registTime:number = 0//账号注册时间
+
+  honoraryIcon = ""//荣誉称号 (优先)
+  avatarFrame:string = ""//最佳评论员头像框地址
+
+
+
 }
\ No newline at end of file

@@ -8,7 +8,8 @@ import {
   NavigationBodyDTO,
   PageDTO,
   PageInfoBean,
-  PageInfoDTO
+  PageInfoDTO,
+  GoldenPositionExtraBean
 } from 'wdBean';
 
 import { CollectionUtils, Logger, ResourcesUtils, StringUtils } from 'wdKit';
@@ -379,10 +380,13 @@ export class PageViewModel extends BaseViewModel {
     })
   }
 
-  async postThemeList(sort: number, pageNum: number, pageSize: number) : Promise<LiveReviewDTO> {
+  async postThemeList(sort: number, pageNum: number, pageSize: number,extra: string) : Promise<LiveReviewDTO> {
+    let bean: GoldenPositionExtraBean = JSON.parse(extra)
+    bean.pageNum = pageNum
+    bean.pageSize = pageSize
     return new Promise<LiveReviewDTO>((success, error) => {
       Logger.info(TAG, `postThemeList pageInfo start`);
-      PageRepository.postThemeList({ sort, pageNum, pageSize }).then((resDTO) => {
+      PageRepository.postThemeList(bean).then((resDTO) => {
         if (!resDTO || !resDTO.data) {
           Logger.error(TAG, 'postThemeList then navResDTO is empty');
           error('resDTO is empty');

@@ -221,6 +221,10 @@
       "value": "36vp"
     },
     {
+      "name": "margin_44",
+      "value": "44vp"
+    },
+    {
       "name": "vp_3",
       "value": "3vp"
     },