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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix:bug[17818] UI还原问题-【uat】点击退出，提示未居中，并且样式和android不一致
  ref |> 视频播放，点击评论按钮，播放区域上推，点击播放区，评论弹窗应自动关闭
  ref |> 全局规则-游客评论开关关闭，弹出提示暂时无法评论
  fix:bug[18503] 我的预约列表，底部缺少已加载全部内容提示
  fix(18049)：全域规则-人民日报客户端稿件评论开关关闭，号主动态列表，评论按钮不应展示
  fix:bug[17505] 设置密码的密码长度判断提示信息和实际判断逻辑不一致
  fix:bug[18529] 修改密码未能作最少8位校验

@@ -60,20 +60,13 @@ export struct CarderInteraction {
         })
         })
       }
       }
 
 
-
-      Row() {
-        Image($r('app.media.CarderInteraction_comment'))
-          .width(18)
-          .height(18)
-        Text('评论')
-          .margin({ left: 4 })
-          .fontSize(14)
-          .fontColor('#666666')
+      if(this.contentDetailData.rmhInfo != null){
+        if(this.contentDetailData.shareInfo != null && 1 == this.contentDetailData.shareInfo.shareOpen && 1 == this.contentDetailData.rmhInfo.cnShareControl){
+          this.shareLayout()
+        }
+      }else{
+        this.shareLayout()
       }
       }
-      .justifyContent(FlexAlign.Center)
-      .onClick(() => {
-        ProcessUtils.processPage(this.contentDTO)
-      })
 
 
       this.builderLike()
       this.builderLike()
     }
     }
@@ -87,6 +80,23 @@ export struct CarderInteraction {
     .alignItems(VerticalAlign.Center)
     .alignItems(VerticalAlign.Center)
   }
   }
 
 
+  @Builder
+  shareLayout() {
+    Row() {
+      Image($r('app.media.CarderInteraction_comment'))
+        .width(18)
+        .height(18);
+      Text('评论')
+        .margin({ left: 4 })
+        .fontSize(14)
+        .fontColor('#666666');
+    }
+    .justifyContent(FlexAlign.Center)
+    .onClick(() => {
+      ProcessUtils.processPage(this.contentDTO);
+    })
+  }
+
   /**
   /**
    * 点赞组件
    * 点赞组件
    */
    */

 import { inputMethodEngine } from '@kit.IMEKit'
 import { inputMethodEngine } from '@kit.IMEKit'
 import { commentInfo } from 'wdBean/Index'
 import { commentInfo } from 'wdBean/Index'
+import { ToastUtils } from 'wdKit/Index'
+import { HttpUtils } from 'wdNetwork/Index'
 import { commentItemModel } from '../model/CommentModel'
 import { commentItemModel } from '../model/CommentModel'
 import { publishCommentModel } from '../model/PublishCommentModel'
 import { publishCommentModel } from '../model/PublishCommentModel'
 import commentViewModel from '../viewmodel/CommentViewModel'
 import commentViewModel from '../viewmodel/CommentViewModel'
@@ -40,6 +42,17 @@ export struct CommentCustomDialog {
       }
       }
     }
     }
 
 
+    // 未登录，游客评论未打开 则先登录
+    if (!HttpUtils.isLogin()) {
+      if (this.publishCommentModel.visitorComment != "1") {
+        ToastUtils.showToast("暂时无法评论", 3000)
+
+        this.publishCommentModel.commentContent = ''
+        this.controller?.close()
+        return
+      }
+    }
+
     // 点击时 即可埋点
     // 点击时 即可埋点
     if (this.onPublishBtnClickTrack) {
     if (this.onPublishBtnClickTrack) {
       this.onPublishBtnClickTrack()
       this.onPublishBtnClickTrack()

@@ -24,7 +24,10 @@ export struct CommentListDialogView {
       pageInfo: this.pageInfo,
       pageInfo: this.pageInfo,
       onClose: this.onClose
       onClose: this.onClose
     }),
     }),
-    autoCancel: false,
+    autoCancel: true,
+    cancel: () => {
+      PublicDialogManager.shareInstance().closeDialog(this.dialogController)
+    },
     customStyle: true,
     customStyle: true,
     alignment: DialogAlignment.Bottom,
     alignment: DialogAlignment.Bottom,
   })
   })

@@ -128,13 +128,13 @@ export struct CommentTabComponent {
       if(this.contentDetail.appstyle === 9) return
       if(this.contentDetail.appstyle === 9) return
       this.onCommentFocus && this.onCommentFocus()
       this.onCommentFocus && this.onCommentFocus()
 
 
-      // 未登录，游客评论未打开 则先登录
-      if (!HttpUtils.isLogin()) {
-        if (this.contentDetail.visitorComment != 1) {
-          WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
-          return
-        }
-      }
+      // 未登录，游客评论未打开 则先登录 ，这里逻辑 放到 发布按钮事件判断了
+      // if (!HttpUtils.isLogin()) {
+      //   if (this.contentDetail.visitorComment != 1) {
+      //     ToastUtils.showToast("暂时无法评论", 3000)
+      //     return
+      //   }
+      // }
 
 
       if (this.contentDetail.openComment != 1 && this.contentDetail.commentDisplay != 1) {
       if (this.contentDetail.openComment != 1 && this.contentDetail.commentDisplay != 1) {
         ToastUtils.showToast("暂时无法评论", 3000)
         ToastUtils.showToast("暂时无法评论", 3000)

@@ -83,7 +83,7 @@ export default struct MinePageUserSimpleInfoUI {
               .textAlign(TextAlign.Center)
               .textAlign(TextAlign.Center)
               .fontColor($r('app.color.white'))
               .fontColor($r('app.color.white'))
               .fontSize(`${this.calcHeight(19)}lpx`)
               .fontSize(`${this.calcHeight(19)}lpx`)
-              .width(`${this.calcHeight(50)}lpx`)
+              .width(this.levelId>9?`${this.calcHeight(69)}lpx`:`${this.calcHeight(50)}lpx`)
               .height(`${this.calcHeight(29)}lpx`)
               .height(`${this.calcHeight(29)}lpx`)
           }.margin({top:'`${this.calcHeight(15)}lpx`'})
           }.margin({top:'`${this.calcHeight(15)}lpx`'})
         }.alignItems(HorizontalAlign.Start)
         }.alignItems(HorizontalAlign.Start)

@@ -159,6 +159,9 @@ export struct AppointmentListUI {
           this.count = this.data.totalCount()
           this.count = this.data.totalCount()
           if (this.data.totalCount() < value.totalCount) {
           if (this.data.totalCount() < value.totalCount) {
             this.curPageNum++
             this.curPageNum++
+            if(this.count < 5){
+              this.getNewPageData()
+            }
           } else {
           } else {
             this.hasMore = false
             this.hasMore = false
           }
           }

 import {  SpConstants } from 'wdConstant';
 import {  SpConstants } from 'wdConstant';
-import { Logger, SPHelper, ToastUtils,  EmitterEventId, EmitterUtils, DateTimeUtils } from 'wdKit';
+import { Logger, SPHelper, ToastUtils,  EmitterEventId, EmitterUtils, DateTimeUtils, CustomToast } from 'wdKit';
 import {MineMainSettingFunctionItem} from '../../viewmodel/MineMainSettingFunctionItem';
 import {MineMainSettingFunctionItem} from '../../viewmodel/MineMainSettingFunctionItem';
 import MineSettingDatasModel from '../../model/MineSettingDatasModel';
 import MineSettingDatasModel from '../../model/MineSettingDatasModel';
 import router from '@ohos.router';
 import router from '@ohos.router';
@@ -31,6 +31,17 @@ export struct AccountAndSecurityLayout {
   pageShowAccountTime:number = 0;
   pageShowAccountTime:number = 0;
   pageHideAccountTime:number = 0;
   pageHideAccountTime:number = 0;
 
 
+  @State toastText:string = ""
+  dialogToast: CustomDialogController = new CustomDialogController({
+    builder: CustomToast({
+      msg: this.toastText,
+    }),
+    autoCancel: false,
+    alignment: DialogAlignment.Center,
+    customStyle: true,
+    maskColor:"#00000000"
+  })
+
   //注销账户 浏览埋点
   //注销账户 浏览埋点
   logoutLayoutHide(){
   logoutLayoutHide(){
     this.logoutLayoutHideTime = DateTimeUtils.getTimeStamp()
     this.logoutLayoutHideTime = DateTimeUtils.getTimeStamp()
@@ -127,9 +138,6 @@ export struct AccountAndSecurityLayout {
 
 
     // 收到eventId为1的事件后执行该回调
     // 收到eventId为1的事件后执行该回调
     let callback = (eventData: emitter.EventData): void => {
     let callback = (eventData: emitter.EventData): void => {
-      // promptAction.showToast({
-      //   message: JSON.stringify(eventData)
-      // });
       if(eventData&&eventData.data){
       if(eventData&&eventData.data){
         this.listData[0].subTitle = eventData.data['content']
         this.listData[0].subTitle = eventData.data['content']
       }
       }
@@ -477,11 +485,11 @@ export struct AccountAndSecurityLayout {
   logout(){
   logout(){
     let login = new LoginViewModel;
     let login = new LoginViewModel;
     login.logOut().then(()=>{
     login.logOut().then(()=>{
-      promptAction.showToast({ message: '退出登录' })
+      this.showToastTip('退出登录')
       EmitterUtils.sendEvent(EmitterEventId.PEOPLE_SHIP_ATTENTION)
       EmitterUtils.sendEvent(EmitterEventId.PEOPLE_SHIP_ATTENTION)
       router.back();
       router.back();
     }).catch((error:string)=>{
     }).catch((error:string)=>{
-      promptAction.showToast({ message: error })
+      this.showToastTip(error)
     });
     });
   }
   }
 
 
@@ -500,6 +508,11 @@ export struct AccountAndSecurityLayout {
     securityNum = phoneNum.replace(needSecurityString,'****')
     securityNum = phoneNum.replace(needSecurityString,'****')
     return securityNum;
     return securityNum;
   }
   }
+
+  showToastTip(msg:string){
+    this.toastText = msg
+    this.dialogToast.open()
+  }
 }
 }
 
 
 @Component
 @Component

@@ -200,6 +200,7 @@ struct ModifyPasswordPage {
             .width('100%')
             .width('100%')
             .height(`${this.calcHeight(80)}lpx`)
             .height(`${this.calcHeight(80)}lpx`)
             .backgroundColor(this.btnStatus ? '#ED2800' : '#99ED2800')
             .backgroundColor(this.btnStatus ? '#ED2800' : '#99ED2800')
+            .enabled(this.btnStatus ?true:false)
             .borderRadius('4vp')
             .borderRadius('4vp')
             .onClick(() => {
             .onClick(() => {
               if(this.btnStatus){
               if(this.btnStatus){
@@ -227,7 +228,7 @@ struct ModifyPasswordPage {
   }
   }
 
 
   inputTextChange(){
   inputTextChange(){
-    if ((this.password_old.length >= 6 && this.password_old.length <= 20) && (this.password_new.length >= 6 && this.password_new.length <= 20)&& (this.password_new_repeat.length >= 6 && this.password_new_repeat.length <= 20)) {
+    if ((this.password_old.length >= 8 && this.password_old.length <= 20) && (this.password_new.length >= 8 && this.password_new.length <= 20)&& (this.password_new_repeat.length >= 8 && this.password_new_repeat.length <= 20)) {
       this.btnStatus = true;
       this.btnStatus = true;
     } else {
     } else {
       this.btnStatus = false;
       this.btnStatus = false;

@@ -134,7 +134,7 @@ export struct SettingPasswordPage {
         this.listData.push(new AccoutPageDataModel(0, '设置密码', '', '', '', '', 0))
         this.listData.push(new AccoutPageDataModel(0, '设置密码', '', '', '', '', 0))
         this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请输入密码', 10086))
         this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '请输入密码', 10086))
         this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '再次输入密码', 10087))
         this.listData.push(new AccoutPageDataModel(1, '', '', '', '', '再次输入密码', 10087))
-        this.listData.push(new AccoutPageDataModel(3, '', '', '提示：密码长度6~20位，使用大写字母、小写字母、数字、特殊字符中三种或三种以上', '', '', 0))
+        this.listData.push(new AccoutPageDataModel(3, '', '', '提示：密码长度8~20位，使用大写字母、小写字母、数字、特殊字符中三种或三种以上', '', '', 0))
         this.listData.push(new AccoutPageDataModel(4, '', '', '', '确认', '', 0))
         this.listData.push(new AccoutPageDataModel(4, '', '', '', '确认', '', 0))
         break;
         break;
       case 2:
       case 2:
@@ -294,6 +294,7 @@ export struct SettingPasswordPage {
         .width('100%')
         .width('100%')
         .height('80lpx')
         .height('80lpx')
         .backgroundColor(this.btnStatus ? '#da3e22' : '#e5856d')
         .backgroundColor(this.btnStatus ? '#da3e22' : '#e5856d')
+        .enabled(this.btnStatus ?true:false)
         .fontColor('#fff')
         .fontColor('#fff')
         .borderRadius('4vp')
         .borderRadius('4vp')
         .onClick(() => {
         .onClick(() => {
@@ -325,7 +326,7 @@ export struct SettingPasswordPage {
         TrackingButton.click("setPasswordPageConfirm",TrackConstants.PageName.Setup_Passwd,TrackConstants.PageName.Setup_Passwd)
         TrackingButton.click("setPasswordPageConfirm",TrackConstants.PageName.Setup_Passwd,TrackConstants.PageName.Setup_Passwd)
       }
       }
       // 需要+手机号校验
       // 需要+手机号校验
-      if (this.password01.length < 6 || this.password01.length > 20) {
+      if (this.password01.length < 8 || this.password01.length > 20) {
         this.showToastTip('密码不符合密码规范')
         this.showToastTip('密码不符合密码规范')
         return
         return
       }
       }
@@ -376,7 +377,7 @@ export struct SettingPasswordPage {
     }
     }
 
 
     if (this.password01) {
     if (this.password01) {
-      if ((this.password01.length >= 6 && this.password01.length <= 20) && (this.password02.length >= 6 && this.password02.length <= 20)) {
+      if ((this.password01.length >= 8 && this.password01.length <= 20) && (this.password02.length >= 8 && this.password02.length <= 20)) {
         this.btnStatus = true;
         this.btnStatus = true;
       } else {
       } else {
         this.btnStatus = false;
         this.btnStatus = false;