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

@@ -294,7 +294,7 @@ export struct ImageAndTextPageComponent {
       if (this.detailContentEmpty) {
       if (this.detailContentEmpty) {
         this.emptyType = 18
         this.emptyType = 18
       }
       }
-      console.log(TAG, "dl", JSON.stringify(detailBeans))
+      console.log(TAG, "dl1111111111", JSON.stringify(detailBeans[0]))
       if (detailBeans && detailBeans.length > 0) {
       if (detailBeans && detailBeans.length > 0) {
         this.contentDetailData = detailBeans[0];
         this.contentDetailData = detailBeans[0];
         let dateTime =
         let dateTime =
@@ -340,7 +340,7 @@ export struct ImageAndTextPageComponent {
       imei: HttpUtils.getImei(),
       imei: HttpUtils.getImei(),
       userId: HttpUtils.getUserId(),
       userId: HttpUtils.getUserId(),
       contentId: String(this.contentDetailData?.newsId),
       contentId: String(this.contentDetailData?.newsId),
-      recType: Number(this.contentDetailData?.reLInfo?.relType),
+      recType: 1,
       contentType: this.contentDetailData?.newsType,
       contentType: this.contentDetailData?.newsType,
       relId: this.contentDetailData?.reLInfo?.relId,
       relId: this.contentDetailData?.reLInfo?.relId,
       channelId: String(this.contentDetailData?.reLInfo?.channelId)
       channelId: String(this.contentDetailData?.reLInfo?.channelId)

@@ -26,6 +26,7 @@ export default struct MinePageUserSimpleInfoUI {
       this.userName = SPHelper.default.getSync(SpConstants.USER_NAME,"") as string
       this.userName = SPHelper.default.getSync(SpConstants.USER_NAME,"") as string
       this.headPhotoUrl = SPHelper.default.getSync(SpConstants.USER_HEAD_PHOTO_URL,"") as string
       this.headPhotoUrl = SPHelper.default.getSync(SpConstants.USER_HEAD_PHOTO_URL,"") as string
 
 
+      ///用户类型1普通用户
       let userType = SPHelper.default.getSync(SpConstants.USER_Type,"") as string
       let userType = SPHelper.default.getSync(SpConstants.USER_Type,"") as string
       if (userType && userType.length > 0) {
       if (userType && userType.length > 0) {
         this.userType = userType
         this.userType = userType
@@ -44,7 +45,7 @@ export default struct MinePageUserSimpleInfoUI {
       Stack(){
       Stack(){
 
 
         Image(this.isLogin?(this.headPhotoUrl?this.headPhotoUrl:this.userType === "1"?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon')):$r('app.media.default_head_userPage'))
         Image(this.isLogin?(this.headPhotoUrl?this.headPhotoUrl:this.userType === "1"?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon')):$r('app.media.default_head_userPage'))
-          .alt($r('app.media.default_head_userPage'))
+          .alt(this.userType === "1"?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon'))
           .width(`${this.calcHeight(120)}lpx`)
           .width(`${this.calcHeight(120)}lpx`)
           .height(`${this.calcHeight(120)}lpx`)
           .height(`${this.calcHeight(120)}lpx`)
           .objectFit(ImageFit.Cover)
           .objectFit(ImageFit.Cover)

@@ -2,7 +2,7 @@ import { CompDTO, ContentDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant';
 import { CommonConstants } from 'wdConstant';
 import { CardParser } from '../CardParser';
 import { CardParser } from '../CardParser';
 
 
-const RECOMMEND_LIST_TITLE = '相关推荐'
+const RECOMMEND_LIST_TITLE = '推荐推荐'
 
 
 @Component
 @Component
 export struct RecommendList {
 export struct RecommendList {

@@ -185,7 +185,8 @@ export struct DetailPlayShortVideoPage {
     }
     }
 
 
     this.videoLandScape = this.contentDetailData.videoInfo[0]?.videoLandScape
     this.videoLandScape = this.contentDetailData.videoInfo[0]?.videoLandScape
-    this.ratio = (this.contentDetailData.videoInfo[0]?.resolutionWidth || 16) /
+    this.ratio = this.videoLandScape == 2 ? (this.contentDetailData.videoInfo[0]?.resolutionWidth || 9) /
+      (this.contentDetailData.videoInfo[0]?.resolutionHeight || 16):(this.contentDetailData.videoInfo[0]?.resolutionWidth || 16) /
       (this.contentDetailData.videoInfo[0]?.resolutionHeight || 9)
       (this.contentDetailData.videoInfo[0]?.resolutionHeight || 9)
     this.playerController.onCanplay = async () => {
     this.playerController.onCanplay = async () => {
       this.ratio = this.playerController.videoWidth / this.playerController.videoHeight
       this.ratio = this.playerController.videoWidth / this.playerController.videoHeight
@@ -212,7 +213,6 @@ export struct DetailPlayShortVideoPage {
 
 
     ///解决初始化竖屏视频时 this.ratio未更新导致显示错误
     ///解决初始化竖屏视频时 this.ratio未更新导致显示错误
     this.calculatePlayerRect()
     this.calculatePlayerRect()
-
   }
   }
 
 
   contentTrackingDict() {
   contentTrackingDict() {