Merge remote-tracking branch 'origin/main'

@@ -82,4 +82,20 @@ export class DeviceUtil {
   static getRandomUUIDForTraceID(): string {
     return util.generateRandomUUID().toUpperCase().replace(/-/g, '')
   }
+
+  /**
+   * 是否为phone设备(可折叠手机即便完全展开状态也返回true)
+   * @returns
+   */
+  static isPhone(): boolean {
+    return deviceInfo.deviceType == 'phone' || deviceInfo.deviceType == 'default';
+  }
+
+  static isNotPhone(): boolean {
+    return !DeviceUtil.isPhone();
+  }
+
+  static isTablet(): boolean {
+    return deviceInfo.deviceType == 'tablet';
+  }
 }

@@ -105,8 +105,10 @@ export struct CompParser {
         // ZhSingleColumn05({ compDTO: compDTO })
         // Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_09) {
+        Divider().strokeWidth(3).color('#ffffff').padding({ left: 16, right: 16 }).margin({top: -3})
+        Divider().strokeWidth(6).color('#f5f5f5')
         ZhSingleColumn09({ compDTO: this.compDTO })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
+        Divider().strokeWidth(6).color('#f5f5f5')
       } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告
         AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO })
         //Text(`compIndex = ${compIndex}`).width('100%').fontSize('12fp').fontColor(Color.Red).padding({ left: 16, right: 16 })

-import { CompDTO, ContentDTO, slideShows, VideoInfoDTO } from 'wdBean';
+import { ContentDTO, slideShows, VideoInfoDTO, CompDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant';
 import { ProcessUtils } from 'wdRouter';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';

@@ -71,7 +71,7 @@ export struct Card5Component {
             }
             .width(CommonConstants.FULL_WIDTH)
             .fontColor(Color.White)
-            .fontSize($r('app.float.normal_text_size'))
+            .fontSize($r('app.float.font_size_17'))
             .fontWeight(FontWeight.Bold)
             .maxLines(2)
             .align(Alignment.TopStart)

@@ -190,6 +190,7 @@ export struct CommentIconComponent {
               .width(this.getMeasureText(this.publishCommentModel.totalCommentNumer) +
                 12)// .backgroundColor(Color.Green)
               .id("Text")
+              .visibility(this.publishCommentModel.totalCommentNumer ? Visibility.Visible : Visibility.Hidden)
             // .offset({
             //   x: 3
             // })

@@ -55,7 +55,7 @@ export struct ZhGridLayout02 {
           .width(CommonConstants.FULL_WIDTH)
 
           GridRow({
-            gutter: { x: 12, y: 15 },
+            gutter: { x: 12, y: 13 },
             columns: { sm: listSize, md: 2 },
             breakpoints: { value: ['320vp', '520vp', '840vp'] }
           }) {
@@ -120,7 +120,7 @@ export struct ZhGridLayout02 {
       }
 
       Text(item.newsTitle)
-        .margin({ top: '5' })
+        .margin({top:'6'})
         .fontSize(13)
         .maxLines(2)
         .textOverflow({ overflow: TextOverflow.Ellipsis })

@@ -59,12 +59,16 @@ export struct ZhGridLayout03 {
         .backgroundColor(0xf5f5f5)
         .width(44)
         .aspectRatio(1 / 1)
-        .margin({
-          bottom: 16
-        })
+        // .margin({
+        //   bottom: 16
+        // })
       Text(item.newsTitle)
         .fontSize(13)
         .maxLines(1)
+        .margin({
+          top: 8,
+          bottom:11
+        })
         .textOverflow({ overflow: TextOverflow.Ellipsis })
     }
     .width('100%')

@@ -27,7 +27,7 @@ struct EditUserInfoPage {
       }
     }),
     alignment: DialogAlignment.Bottom,
-    offset:{dx:0,dy:-20}
+    offset:{dx:0,dy:-20},
   })
 
   aboutToAppear() {
@@ -97,14 +97,14 @@ struct EditUserInfoPage {
       Row(){
         Text(r.title)
           .fontSize(15)
-          .fontColor(Color.Gray)
+          .fontColor('#666666')
         Blank()
 
         Text(r.subTitle)
           .textOverflow({overflow:TextOverflow.Ellipsis})
           .maxLines(1)
           .fontSize(14)
-          .fontColor(Color.Gray)
+          .fontColor(r.subTitle === '待完善'?'#999999':'#666666')
           .padding({right:10})
           .width('70%')
           .textAlign(TextAlign.End)

@@ -45,7 +45,7 @@ struct EditUserIntroductionPage {
       Divider()
         .margin(20)
 
-      Text('1、账号中（头像、昵称等）不允许含有违禁违规内容；\n2、最多60个字，只能输入中文、数字、英文字母。')
+      Text('1、账号中(头像、昵称等)不允许含有违禁违规内容；\n2、最多60个字，只能输入中文、数字、英文字母。')
         .fontSize(13)
         .padding(12)
         .fontColor(Color.Gray).lineHeight(25)
@@ -54,6 +54,8 @@ struct EditUserIntroductionPage {
         .type(ButtonType.Normal)
         .width('90%')
         .backgroundColor('#ED2800')
+        .opacity(this.numCount === 0 ? 0.6 : 1)
+        .fontColor(this.numCount === 0 ? '#999999' : Color.White)
         .borderRadius(5)
         .margin(30)
         .onClick(()=>{

@@ -47,7 +47,7 @@ struct EditUserNikeNamePage {
       Divider()
         .margin(20)
 
-      Text('1、账号中（头像、昵称等）不允许含有违禁违规内容；\n2、最多16个字，只能输入中文、数字、英文字母。')
+      Text('1、账号中(头像、昵称等)不允许含有违禁违规内容；\n2、最多16个字，只能输入中文、数字、英文字母。')
         .fontSize(13)
         .padding(12)
         .fontColor(Color.Gray).lineHeight(25)
@@ -56,6 +56,8 @@ struct EditUserNikeNamePage {
         .type(ButtonType.Normal)
         .width('90%')
         .backgroundColor('#ED2800')
+        .opacity(this.numCount === 0 ? 0.6 : 1)
+        .fontColor(this.numCount === 0 ? '#999999' : Color.White)
         .borderRadius(5)
         .margin(30)
         .onClick(()=>{

@@ -11,6 +11,7 @@ import { CustomBottomFuctionUI } from '../view/CustomBottomFuctionUI';
 import { BigPicCardComponent } from '../view/BigPicCardComponent';
 import { contentListItemParams } from '../../model/MyCollectionModel';
 import { CustomPullToRefresh } from '../reusable/CustomPullToRefresh';
+import { MyCustomDialog } from '../reusable/MyCustomDialog'
 
 @Entry
 @Component
@@ -26,6 +27,19 @@ struct MyCollectionListPage {
   @State  currentPage: number = 1;
   private scroller: Scroller = new Scroller();
 
+  dialogController: CustomDialogController = new CustomDialogController({
+    builder: MyCustomDialog({
+      confirm: () => {
+        this.deleteDatas()
+      },
+      titleShow:false,
+      tipValue: this.isAllSelect?'是否确认清空?':'确认删除'+this.deleteNum.toString()+'条收藏'
+    }),
+    autoCancel: true,
+    alignment: DialogAlignment.Center,
+    customStyle: true
+  })
+
   aboutToAppear(){
     this.getData()
   }
@@ -73,7 +87,7 @@ struct MyCollectionListPage {
               this.allSelectDatas(isAllSelect)
             },
             confirmCallback:()=>{
-              this.deleteDatas()
+              this.dialogController.open()
             }
           })
         }

@@ -58,7 +58,7 @@ export struct LikeComponent {
     } else if (this.componentType == 5) {
       // 图集点赞，展示标识
       this.likeCompStyle5()
-    }else {
+    } else {
       //1: 底部栏目样式  默认样式
       this.likeCompStyle1()
     }
@@ -188,7 +188,7 @@ export struct LikeComponent {
       .alignItems(VerticalAlign.Center)
       .position({ x: '100%', })
       .markAnchor({ x: '100%' })
-      .backgroundImage(this.likeStatus? $r('app.media.ic_like_back_Select'):$r('app.media.ic_like_back'))
+      .backgroundImage(this.likeStatus ? $r('app.media.ic_like_back_Select') : $r('app.media.ic_like_back'))
       .backgroundImageSize(ImageSize.Auto)
       .visibility(this.likeCount > 0 ? Visibility.Visible : Visibility.Hidden)
     }.width(24).height(24)
@@ -209,7 +209,7 @@ export struct LikeComponent {
       .width(36)
       .height(36)
       .borderRadius(18)
-      .backgroundColor(this.pageComponentType === 4 ? '#4D000000' : '#FFF5F5F5')
+      .backgroundColor((this.pageComponentType === 4 || this.pageComponentType === 2) ? '#4D000000' : '#FFF5F5F5')
 
 
       Row() {

@@ -9,7 +9,7 @@ export  struct AreaPickerDialog {
   @Provide currentSecondBean: AreaListManageModel = new AreaListManageModel('','','',[])
   @Provide currentThirdBean: AreaListManageModel = new AreaListManageModel('','','',[])
   controller: CustomDialogController
-  title: string  = '地区选择'
+  title: string  = '修改地区'
   @Provide dataSource: AreaListModel[] = []
   result: JSON[] = [];
   confirmCallback: (province:string,city:string,county:string,address:string) => void = () => {
@@ -33,7 +33,7 @@ export  struct AreaPickerDialog {
 
         Blank()
 
-        Button('确定',{type:ButtonType.Normal})
+        Button('提交',{type:ButtonType.Normal})
           .onClick(()=> {
             this.controller.close()
             this.confirmCallback(this.currentFirst.label,this.currentSecondBean.label,this.currentThirdBean.label,this.currentFirst.label+this.currentSecondBean.label+this.currentThirdBean.label);

@@ -28,9 +28,11 @@ export   struct  FirstLevelComponent  {
               this.currentFirst = EditInfoViewModel.getAreaListManageModel(this.dataSource[index as number])
             })
             .backgroundColor(Color.White)
-            .border({color:'#e2e2e2',width:{right:0.5}})
+            // .border({color:'#e2e2e2',width:{right:0.5}})
             .width('100%')
             .layoutWeight(1)
+            .selectedTextStyle({color:'#666666'})
+            .textStyle({color:'#999999'})
         }
       }
       .justifyContent(FlexAlign.Center)

@@ -21,9 +21,11 @@ export   struct  SecondLevelComponent  {
               this.currentSecondBean = EditInfoViewModel.getAreaListManageModel(this.currentFirst.children[index as number])
             })
             .backgroundColor(Color.White)
-            .border({color:'#e2e2e2',width:{right:0.5}})
+            // .border({color:'#e2e2e2',width:{right:0.5}})
             .width('100%')
             .layoutWeight(1)
+            .selectedTextStyle({color:'#666666'})
+            .textStyle({color:'#999999'})
         }
       }
       .justifyContent(FlexAlign.Center)

@@ -22,9 +22,11 @@ export   struct  ThirdLevelComponent  {
               this.currentThirdBean = EditInfoViewModel.getAreaListManageModel(this.currentSecondBean.children[index as number])
             })
             .backgroundColor(Color.White)
-            .border({color:'#e2e2e2',width:{right:0.5}})
+            // .border({color:'#e2e2e2',width:{right:0.5}})
             .width('100%')
             .layoutWeight(1)
+            .selectedTextStyle({color:'#666666'})
+            .textStyle({color:'#999999'})
         }
       }
       .justifyContent(FlexAlign.Center)

@@ -125,7 +125,7 @@ class EditInfoViewModel {
       this.BasePostRequest(item.editDataType == WDEditDataModelType.WDEditDataModelType_nickname?HttpUrlUtils.APPOINTMENT_editUserDetail1_PATH:HttpUrlUtils.APPOINTMENT_editUserDetail_PATH,this.params)
         .then((navResDTO: ResponseDTO) => {
           if (navResDTO.code == 0) {
-            promptAction.showToast({ message: '修改成功' })
+            promptAction.showToast({ message: '您的资料已提交' })
             success(navResDTO)
           }else {
             promptAction.showToast({ message: navResDTO.message })

@@ -199,6 +199,7 @@ export struct DetailPlayShortVideoPage {
           })
 
         }
+        .width('100%')
         .layoutWeight(1)
         .onClick(() => {
           this.playerController?.switchPlayOrPause();
@@ -223,9 +224,10 @@ export struct DetailPlayShortVideoPage {
       }
       .height('100%')
       .width('100%')
-      .padding({
-        top: this.displayDirection === DisplayDirection.VIDEO_HORIZONTAL ? 0 : this.topSafeHeight + 'px'
-      })
+
+      // .padding({
+      //   top: this.displayDirection === DisplayDirection.VIDEO_HORIZONTAL ? 0 : this.topSafeHeight + 'px'
+      // })
 
       if (this.showCommentList) {
         CommentComponentPage({})

@@ -258,15 +258,12 @@ export struct VideoChannelDetail {
           .visibility(this.isMouted ? Visibility.None : Visibility.Visible)
         Swiper(this.swiperController) {
           ForEach(this.data, (item: ContentDetailDTO, index: number) => {
-            Column() {
             DetailPlayShortVideoPage({
               contentDetailData: item,
               currentIndex: this.currentIndex,
               index: index,
               interactData: this.interactDataList[index]
             })
-            }.width('100%')
-            .height('100%')
           }, (item: ContentDetailDTO) => item.newsId + '')
         }
         .displayCount(1, true)

@@ -5,7 +5,7 @@ import UIAbility from '@ohos.app.ability.UIAbility';
 import Want from '@ohos.app.ability.Want';
 import window from '@ohos.window';
 import { BusinessError } from '@ohos.base';
-import { EmitterEventId, EmitterUtils, WindowModel } from 'wdKit';
+import { DeviceUtil, EmitterEventId, EmitterUtils, WindowModel } from 'wdKit';
 import { ConfigurationConstant } from '@kit.AbilityKit';
 import { WDPushNotificationManager } from 'wdHwAbility/Index';
 import { StartupManager } from '../startupmanager/StartupManager';
@@ -58,8 +58,20 @@ export default class EntryAbility extends UIAbility {
     console.info('floatWindowClass audioWidth' + audioWidth);
 
 
-    // let a = new WindowModel();
-    // 设置窗口的显示方向属性
+    // 在普通phone/折叠屏/tablet设备上以沉浸式(全屏)启动
+    if (DeviceUtil.isPhone() || DeviceUtil.isTablet()) {
+      // 设置窗口的布局是否为沉浸式布局
+      // 沉浸式布局是指布局不避让状态栏与导航栏，组件可能产生与其重叠的情况。
+      // 非沉浸式布局是指布局避让状态栏与导航栏，组件不会与其重叠。
+      // windowClass.setWindowLayoutFullScreen(true)
+      // 设置窗口全屏模式时窗口内导航栏、状态栏的属性
+      // windowClass.setWindowSystemBarProperties({
+      //    statusBarContentColor: "#FFFFFF"
+      // })
+
+      // 设置启动时窗口的显示方向属性,
+      // 普通phone以PORTRAIT/竖屏显示模式启动
+      // 折叠屏和tablet是以AUTO_ROTATION_RESTRICTED/受开关控制的自动旋转模式启动
       WindowModel.shared.setPreferredOrientation(window.Orientation.PORTRAIT)
         .then(() => {
           hilog.info(0x0000, 'testTag', 'setPreferredOrientation Succeeded');
@@ -68,6 +80,8 @@ export default class EntryAbility extends UIAbility {
           hilog.error(0x0000, 'testTag',
             `setPreferredOrientation catch, error error.name : ${err.name},  error.message:${err.message}`);
         })
+    }
+
     //../../../../../../features/wdLogin/src/main/ets/pages/launchPage/LaunchPage
     windowStage.loadContent('pages/launchPage/LaunchPage', (err, data) => {
       if (err.code) {

@@ -47,7 +47,7 @@ struct LaunchInterestsHobbiesPage {
         .width('100%')
         .height('61lpx')
         .margin({top:'84lpx'})
-      Text('完善信息，将为您推荐个性化的内容')
+      Text('完善信息,将为您推荐个性化的内容')
         .fontSize('27lpx')
         .textAlign(TextAlign.Center)
         .fontColor('#9E9E9E')
@@ -69,8 +69,8 @@ struct LaunchInterestsHobbiesPage {
                 Image('')
                   .width('100%')
                   .height('100%')
-                  .backgroundColor(Color.Gray)
-                  .opacity(item.choose?0.85:0)
+                  .backgroundColor(Color.Black)
+                  .opacity(item.choose?0.5:0)
                   .borderRadius(5)
               }
 
@@ -134,14 +134,14 @@ struct LaunchInterestsHobbiesPage {
           .width('662lpx')
           .height('84lpx')
           .backgroundColor(Color.White)
-          .opacity(this.selectCount == 0 ? 0.3 : 0)
+          .opacity(this.selectCount == 0 ? 0.6 : 0)
           .borderRadius('10lpx')
           .onClick(()=>{
             if (this.selectCount == 0) {
               promptAction.showToast({
                 message : '请先选择您感兴趣的内容哦',
                 duration: 2000,
-                bottom: '50%'
+                bottom: '50%',
               })
                return
             }