Merge remote-tracking branch 'origin/main'

@@ -5,8 +5,8 @@
     "description": "$string:shared_desc",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ],
     "compressNativeLibs": true,
     "deliveryWithInstall": true

@@ -5,8 +5,8 @@
     "description": "$string:shared_desc",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ]
   }
 }
\ No newline at end of file

@@ -5,8 +5,8 @@
     "description": "$string:shared_desc",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ],
     "compressNativeLibs": true,
     "deliveryWithInstall": true,

@@ -5,8 +5,8 @@
     "description": "$string:shared_desc",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ],
     "compressNativeLibs": true,
     "deliveryWithInstall": true,

@@ -5,8 +5,8 @@
     "description": "$string:shared_desc",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ],
     "compressNativeLibs": true,
     "deliveryWithInstall": true

@@ -5,8 +5,8 @@
     "description": "$string:shared_desc",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ],
     "compressNativeLibs": true,
     "deliveryWithInstall": true,

@@ -5,8 +5,8 @@
     "description": "$string:shared_desc",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ],
     "compressNativeLibs": true,
     "deliveryWithInstall": true

@@ -5,8 +5,8 @@
     "description": "$string:shared_desc",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ],
     "compressNativeLibs": true,
     "deliveryWithInstall": true

@@ -233,7 +233,8 @@ struct createImg {
                 })
             }
           }
-        } else if (this.fullColumnImgUrls.length === 4) {
+        } else if (this.fullColumnImgUrls.length === 5) {
+          // 四图卡里面塞了一张补位卡
           GridCol({
             span: { xs: 4 }
           }) {

@@ -53,7 +53,7 @@ export struct Card5Component {
           }
         )
         .aspectRatio(343 / 225)
-      if (!!this.titleShowPolicy) {
+      if (!!this.titleShowPolicy || this.titleShowPolicy === null ) {
         Row()
           .borderRadius(
             {

@@ -273,14 +273,14 @@ struct indicatorAnimations {
     if (this.isAutoPlay) {
       setTimeout(() => {
         this.leftW = '100%'
-        this.centerFontSize = 11
+        this.centerFontSize = 10
       }, 0)
       setTimeout(() => {
         this.rightW = '100%'
       }, 1500)
     } else {
       this.leftW = '100%'
-      this.centerFontSize = 11
+      this.centerFontSize = 10
       this.rightW = '100%'
     }
 
@@ -307,7 +307,7 @@ struct indicatorAnimations {
       Text(this.index + 1 < 10 ? `0${this.index + 1}` : `${this.index + 1}`)
         .fontSize(this.centerFontSize)
         .fontColor($r('app.color.white'))
-        .width(16)
+        .width(11)
         .textAlign(TextAlign.Center)
         .margin({
           bottom: -2

@@ -153,8 +153,8 @@ export struct ZhSingleRow02 {
     .padding({
       left: $r('app.float.card_comp_pagePadding_lf'),
       // right: $r('app.float.card_comp_pagePadding_lf'),
-      top: $r('app.float.card_comp_pagePadding_tb'),
-      bottom: $r('app.float.card_comp_pagePadding_tb')
+      top: 8,
+      bottom: 8
     })
     .backgroundColor($r('app.color.white'))
     .margin({ bottom: 8 })

@@ -244,6 +244,7 @@ export struct ZhSingleRow03 {
             .width(154)
             .height(60)
             .maxLines(3)
+            .fontSize(15)
             .textOverflow({overflow: TextOverflow.Ellipsis})
         }
         .margin({bottom: 16})
@@ -254,8 +255,10 @@ export struct ZhSingleRow03 {
               Text(this.format(new Date(item.liveInfo.liveStartTime).getTime()))
                 .margin({right: 6})
                 .fontColor(0x000000)
-                .fontSize(13)
+                .fontSize(12)
                 .textAlign(TextAlign.Start)
+                .fontFamily('PingFang SC-Semibold')
+                .fontWeight(600)
               Image($r('app.media.timeline_rect'))
                 .width(4)
                 .height(3)
@@ -263,10 +266,13 @@ export struct ZhSingleRow03 {
               Text(item.liveInfo.liveStartTime.split(' ')[1].slice(0, 5))
                 .margin({right: 6})
                 .fontColor(0x000000)
-                .fontSize(13)
+                .fontSize(12)
+                .fontFamily('PingFang SC-Semibold')
+                .fontWeight(600)
               Text('开始直播')
                 .fontColor(0xC8C8C8)
-                .fontSize(13)
+                .fontSize(12)
+                .fontFamily('PingFang SC-Semibold')
             }
 
           Row() {

@@ -57,7 +57,6 @@ export struct OtherHomePageBottomCommentComponent {
             this.curPageNum = 1;
             this.hasMore = true
             this.isGetRequest = false
-            this.data_comment.clear()
 
             if (!this.isLoading){
               this.getNewPageData()
@@ -134,6 +133,8 @@ export struct OtherHomePageBottomCommentComponent {
       let object = new OtherUserCommentListRequestItem("", 20, this.curPageNum, time, "1", this.curUserId)
 
       MinePageDatasModel.getOtherCommentListData(object, getContext(this)).then((value) => {
+        if (this.curPageNum === 1) this.data_comment.clear()
+
         if (!this.data_comment || value.list.length == 0) {
           this.hasMore = false
           this.isLoading = false

@@ -142,11 +142,11 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
                   .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
                   .textAlign(TextAlign.Start)
                   .margin({ top: 8 })
-                  .width(150)
+                  .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
                   .lineHeight(19)
-                  .height(42)
                   .lineHeight(21)
               }
+              .height(134)
               .padding({ right: 16 })
               // .offset({x:16})
               .onClick(() => {

@@ -146,16 +146,18 @@ export struct LiveHorizontalCardComponent {
                 Column() {
                   Stack({ alignContent: Alignment.BottomEnd }) {
                     Image(this.loadImg ? item.coverUrl : '')
-                      .backgroundColor(0xf5f5f5)
+                      .backgroundColor(this.loadImg ? 0xffffff : 0xf5f5f5)
                       .aspectRatio(16 / 9)
                       .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
-                      .borderRadius(4)
-                      .objectFit(ImageFit.Cover)
+                      // .borderRadius(4)
+                      .objectFit(ImageFit.Contain)
                     CardMediaInfo({
                       livePeopleNum:false,
                       contentDTO: item
                     })
                   }
+                  .borderRadius(4)
+                  .border({width: 1, color: 0xf5f5f5})
 
                   Text(item.newsTitle)
                     .fontSize($r("app.float.font_size_14"))
@@ -166,9 +168,9 @@ export struct LiveHorizontalCardComponent {
                     .textAlign(TextAlign.Start)
                     .margin({ top: 8 })
                     .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
-                    .height(42)
                     .lineHeight(21)
                 }
+                .height(134)
                 .padding({ right: 16 })
                 .onClick(() => {
                   InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)

@@ -16,10 +16,10 @@ const  TAG = "OtherNormalUserHomePage"
 struct OtherNormalUserHomePage {
   @State params:Record<string, string> =  router.getParams() as Record<string, string>;
   @Watch('change') @State curUserId: string = '-1';
-  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   pageShowTime:number = 0;
   pageHideTime:number = 0;
-
+  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
 
   onPageShow() {
     this.curUserId = this.params?.['userId'];
@@ -68,7 +68,7 @@ struct OtherNormalUserHomePage {
         Stack({ alignContent: Alignment.Top }){
           Image($r('app.media.title_bg'))
             .width('100%')
-            .height('355lpx')
+            .height(`calc(${295 + this.topSafeHeight + 'lpx'})`)
             .objectFit(ImageFit.Cover)
 
           Row()
@@ -83,7 +83,7 @@ struct OtherNormalUserHomePage {
           Stack({ alignContent: Alignment.Top }){
             this.MineHomeTitleTransparent()
             this.MineHomeTitleWhite()
-          }
+          }.margin({top:px2vp(this.topSafeHeight)})
 
           Scroll() {
             Column() {
@@ -175,7 +175,7 @@ struct OtherNormalUserHomePage {
                   this.tileOpacity = persent
                 }
               })
-              .backgroundColor($r('app.color.color_transparent'))
+              // .backgroundColor($r('app.color.color_transparent'))
               .height('184lpx')
               .width('100%')
               .padding({ left: '6lpx' })
@@ -184,7 +184,7 @@ struct OtherNormalUserHomePage {
               if(StringUtils.isNotEmpty(this.desc)){
                 Column() {
                   Row() {
-                    Text(this.desc)
+                    Text('简介：'+this.desc)
                       .fontSize('27lpx')
                       .maxLines(3)
                       .textOverflow({ overflow: TextOverflow.Ellipsis })

@@ -26,6 +26,8 @@ struct SearchCreatorPage {
   @State isLoading: boolean = false
   @State hasMore: boolean = true
   curPageNum: number = 1;
+  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
 
   onPageShow() {
     this.keyword = this.params?.pageID;
@@ -154,6 +156,7 @@ struct SearchCreatorPage {
   }
 
   build() {
+    Column(){
       Column() {
         CustomTitleUI({ titleName: "全部结果" })
         Divider()
@@ -200,5 +203,10 @@ struct SearchCreatorPage {
       }
       .width('100%')
       .height('100%')
+    }.width("100%")
+    .height("100%")
+    .backgroundColor($r('app.color.color_transparent'))
+    .padding({top:px2vp(this.topSafeHeight)})
+
   }
 }
\ No newline at end of file

@@ -2,12 +2,12 @@ import { CommentListItem } from './CommentListItem'
 
 export class MineCommentListDetailItem{
   list:CommentListItem[] = []
-
+  hasNext: number = 1
   pageNum: number = 0
   pageSize: number = 20
   totalCount: number = 0
 
-  constructor(list?:CommentListItem[],pageNum?: number,pageSize?: number,totalCount?: number) {
+  constructor(list?:CommentListItem[],hasNext?: number,pageNum?: number,pageSize?: number,totalCount?: number) {
   }
 
 }
\ No newline at end of file

@@ -5,8 +5,8 @@
     "description": "$string:shared_desc",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ],
     "compressNativeLibs": true,
     "deliveryWithInstall": true,

@@ -5,8 +5,8 @@
     "description": "$string:shared_desc",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ],
     "compressNativeLibs": true,
     "deliveryWithInstall": true,

@@ -5,8 +5,8 @@
     "description": "$string:shared_desc",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ],
     "compressNativeLibs": true,
     "deliveryWithInstall": true,

@@ -5,8 +5,8 @@
     "description": "$string:shared_desc",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ],
     "compressNativeLibs": true,
     "deliveryWithInstall": true,

@@ -5,8 +5,8 @@
     "description": "$string:shared_desc",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ],
     "compressNativeLibs": true,
     "deliveryWithInstall": true,

@@ -5,8 +5,8 @@
     "description": "$string:shared_desc",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ],
     "compressNativeLibs": true,
     "deliveryWithInstall": true,

@@ -5,8 +5,8 @@
     "description": "$string:shared_desc",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ],
     "compressNativeLibs": true,
     "deliveryWithInstall": true

@@ -59,10 +59,13 @@ struct LoginProtocolWebview {
             .width(24)
             .aspectRatio(1)
             .onClick(() => {
+              if (this.isConnectNetwork){
+                ///无网络状态下 执行webviewController.accessBackward方法 会crash
                 if(this.webviewController.accessBackward()){
                   this.webviewController.backward()
                   return
                 }
+              }
               router.back();
             }).margin({ left: 16 })
           Text()

@@ -5,8 +5,8 @@
     "description": "$string:shared_desc",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ],
     "compressNativeLibs": true,
     "deliveryWithInstall": true,

@@ -5,8 +5,8 @@
     "description": "$string:shared_desc",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ],
     "compressNativeLibs": true,
     "deliveryWithInstall": true,

@@ -5,8 +5,8 @@
     "description": "$string:shared_desc",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ],
     "compressNativeLibs": true,
     "deliveryWithInstall": true,

@@ -5,8 +5,8 @@
     "description": "$string:shared_desc",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ],
     "compressNativeLibs": true,
     "deliveryWithInstall": true,

 import {InterestsHobbiesModel, InterestsList} from '../viewModel/InterestsHobbiesModel'
 import { WDRouterRule } from 'wdRouter';
 import { WDRouterPage } from 'wdRouter';
-import { SPHelper } from 'wdKit/Index';
-import { SpConstants } from 'wdConstant/Index';
+import { NetworkUtil, SPHelper } from 'wdKit/Index';
+import { SpConstants, ViewType } from 'wdConstant/Index';
 import { CustomToast} from 'wdKit'
 import { ButtonOptions, promptAction, window } from '@kit.ArkUI';
 import { ParamType, TrackConstants, TrackingContent } from 'wdTracking/Index';
 import { ImageKnifeComponent,ScaleType } from '@ohos/imageknife';
+import { EmptyComponent, WDViewDefaultType } from 'wdComponent/Index';
 
 @Entry
 @Component
@@ -16,7 +17,7 @@ struct LaunchInterestsHobbiesPage {
   @State interestsArray: InterestsList[] = []
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
-
+  @State isConnectNetwork : boolean = NetworkUtil.isNetConnected()
   dialogToast: CustomDialogController = new CustomDialogController({
     builder: CustomToast({
       msg: '请先选择您感兴趣的内容哦',
@@ -72,6 +73,13 @@ struct LaunchInterestsHobbiesPage {
             .height('35lpx')
             .margin({top:'12lpx'})
 
+          if(!this.isConnectNetwork){
+            EmptyComponent({ emptyType: 1,emptyHeight:"60%" ,retry: () => {
+              this.isConnectNetwork = NetworkUtil.isNetConnected()
+            }})
+              .layoutWeight(1)
+              .width('100%')
+          }else{
             Grid( ){
               ForEach(this.interestsArray,(item:InterestsList,index:number)=>{
                 GridItem(){
@@ -138,6 +146,9 @@ struct LaunchInterestsHobbiesPage {
             .rowsGap('23lpx')
             .scrollBar(BarState.Off)
           }
+
+
+        }
         .width('100%')
         .height('100%')
       }

@@ -110,7 +110,7 @@ export default struct CustomDialogComponent {
       .margin({top: 1})
     }
     .width('528lpx')
-    .borderRadius('15')
+    .borderRadius('10')
     .backgroundColor(Color.White)
     .clip(true)
 

@@ -321,8 +321,8 @@ export struct MultiPictureDetailPageComponent {
         middle: { anchor: "__container__", align: HorizontalAlign.Center }
       })
       .zIndex(1)
-      .onChange((index: number) => {
-        this.swiperIndex = index
+      .onAnimationStart((index: number, targetIndex: number, extraInfo: SwiperAnimationEvent) => {
+        this.swiperIndex = targetIndex
       })
       .onClick(() => {
         this.showDownload = !this.showDownload

@@ -6,8 +6,8 @@
     "mainElement": "EntryAbility",
     "deviceTypes": [
       "phone",
-      "tablet",
-      "2in1"
+//      "tablet",
+//      "2in1"
     ],
     "compressNativeLibs": true,
     "deliveryWithInstall": true,