Merge remote-tracking branch 'origin/main'

@@ -141,8 +141,8 @@ export struct ENewspaperPageComponent {
     // bottomSafeHeight 底导高度 topSafeHeight 顶导高度 44 顶部高度 60 底部高度
     // bottomSafeHeight 底导高度 topSafeHeight 顶导高度 44 顶部高度 60 底部高度
     // newspaper_shadow 49 高度  e_newspaper_content 59 margin top
     // newspaper_shadow 49 高度  e_newspaper_content 59 margin top
     let height =
     let height =
-      screenHeight - this.bottomSafeHeight - this.topSafeHeight - vp2px(44) - vp2px(60) - vp2px(49) - vp2px(59)
-    this.picHeight = height
+      // screenHeight - this.bottomSafeHeight - this.topSafeHeight - vp2px(44) - vp2px(60) - vp2px(49) - vp2px(59)
+    this.picHeight = (this.picWidth * 506)/355
 
 
     let ratio = this.ratio == '100%' ? 1 : 0.5
     let ratio = this.ratio == '100%' ? 1 : 0.5
     this.picWidth = this.picWidth * ratio
     this.picWidth = this.picWidth * ratio
@@ -279,7 +279,7 @@ export struct ENewspaperPageComponent {
           .indicator(false)
           .indicator(false)
           .loop(false)
           .loop(false)
           .displayCount(1)
           .displayCount(1)
-          .margin({ top: 59, left: 10, right: 10 })
+          .margin({ top: 69, left: 10, right: 10 })
           .id('e_newspaper_content')
           .id('e_newspaper_content')
           .alignRules({
           .alignRules({
             top: { anchor: "e_newspaper_top", align: VerticalAlign.Bottom },
             top: { anchor: "e_newspaper_top", align: VerticalAlign.Bottom },

@@ -122,7 +122,8 @@ export struct LiveLikeComponent {
 
 
       if (this.likeCount != 0) {
       if (this.likeCount != 0) {
         RelativeContainer() {
         RelativeContainer() {
-          Image(this.styleType == 1 ? $r('app.media.comment_icon_number_bg') : $r('app.media.ic_like_back_Select'))
+          ///2是直播，直播的单独一种样式，
+          Image( this.contentDetailData.newsType == 2 ? $r('app.media.live_like_icon_number_bg') : (this.styleType == 1 ? $r('app.media.comment_icon_number_bg') : $r('app.media.ic_like_back_Select')))
             .objectFit(ImageFit.Fill)
             .objectFit(ImageFit.Fill)
             .height(10)
             .height(10)
             .resizable({
             .resizable({

@@ -219,7 +219,7 @@
         <div class="cdescrip_text" v-if="details.rmhDesc" @click="skipCustomerNumberPage">{{details.rmhDesc}}</div>
         <div class="cdescrip_text" v-if="details.rmhDesc" @click="skipCustomerNumberPage">{{details.rmhDesc}}</div>
       </div>
       </div>
       <!-- @click.stop阻止事件冒泡 -->
       <!-- @click.stop阻止事件冒泡 -->
-      <template v-if="!isOwer">
+      <template v-if="!isOwer && showButton">
         <div class="clook-btn clook" @click.stop="clookBtn" v-if="clookStatusSee || showClook">
         <div class="clook-btn clook" @click.stop="clookBtn" v-if="clookStatusSee || showClook">
           <template v-if="clookBtnActive">
           <template v-if="clookBtnActive">
             <img class="clook-loading anticon-spin" src="./image/loading_clock.svg" alt="">
             <img class="clook-loading anticon-spin" src="./image/loading_clock.svg" alt="">

@@ -50,6 +50,7 @@ const app = Vue.createApp({
     const isRmh = ref(null)
     const isRmh = ref(null)
     const isNewspaper = ref(null)
     const isNewspaper = ref(null)
     const browseStr = ref('')
     const browseStr = ref('')
+    const showButton = ref(false)
 
 
     const state = reactive({
     const state = reactive({
       clientHeight: 0,
       clientHeight: 0,
@@ -1051,11 +1052,13 @@ const app = Vue.createApp({
           headers: state.appHeader,
           headers: state.appHeader,
           showError: false
           showError: false
         })
         })
+        showButton.value = true
         if (response.success) {
         if (response.success) {
           clookStatusSee.value = response.data[0].status == '1' ? false : true //  '1' 是已关注  '0'是未关注
           clookStatusSee.value = response.data[0].status == '1' ? false : true //  '1' 是已关注  '0'是未关注
         }
         }
       } else {
       } else {
         if (state.creatorID == state.details.rmhId) {
         if (state.creatorID == state.details.rmhId) {
+          showButton.value = true
           isOwer.value = true
           isOwer.value = true
           clookStatusSee.value = false
           clookStatusSee.value = false
           nextTick(() => {
           nextTick(() => {
@@ -1090,6 +1093,7 @@ const app = Vue.createApp({
                   const code = statusResponseMap.code
                   const code = statusResponseMap.code
                   const data = statusResponseMap.data
                   const data = statusResponseMap.data
                   if ([ 200, '0' ].includes(code)) {
                   if ([ 200, '0' ].includes(code)) {
+                    showButton.value = true
                     if (data) {
                     if (data) {
                       if (data[0].status == '1') {
                       if (data[0].status == '1') {
                         state.initClockStatus = !initStatus
                         state.initClockStatus = !initStatus
@@ -1949,6 +1953,7 @@ const app = Vue.createApp({
       isNewspaper.value = false
       isNewspaper.value = false
       voteInit.value = false
       voteInit.value = false
       showClook.value = false
       showClook.value = false
+      showButton.value = false
       optionList.value = []
       optionList.value = []
       subjectList.value = []
       subjectList.value = []
       channelList.value = []
       channelList.value = []
@@ -2074,6 +2079,7 @@ const app = Vue.createApp({
       optionList,
       optionList,
       showClook,
       showClook,
       clookStatusSee,
       clookStatusSee,
+      showButton,
       timeLine,
       timeLine,
       shareOpen,
       shareOpen,
       hasReadCount,
       hasReadCount,

@@ -56,17 +56,11 @@ export struct PlayerComponent {
       this.playerController.onVideoSizePlayerComponentBack = (width: number, height: number) => {
       this.playerController.onVideoSizePlayerComponentBack = (width: number, height: number) => {
         if(width>height){
         if(width>height){
           this.isLarge = false
           this.isLarge = false
-          if(this.liveStreamType == 1) { ///后台选择的是竖屏流，实际流画面是横屏，展示样式和安卓保持一致
-            this.isLarge = true
-            this.playerController?.setScaleMode(AliScaleMode.SCALE_ASPECT_FILL)
-            return
-          }
           if(width > 2){
           if(width > 2){
             this.liveStreamType = 0
             this.liveStreamType = 0
           }
           }
         }else{
         }else{
           this.isLarge = true
           this.isLarge = true
-          this.playerController?.setScaleMode(AliScaleMode.SCALE_ASPECT_FILL)
         }
         }
       }
       }
     }
     }