ref |> 直播IM消息显示，处理竖屏直播

@@ -38,8 +38,14 @@ export interface LiveRoomItemBean {
   fullColumnImgUrlDto: FullColumnImgUrlDTO
   fullColumnImgUrlDto: FullColumnImgUrlDTO
   //观看人次
   //观看人次
   pv: string
   pv: string
-  // 自义定表情 -  from im
+
+  ///------- from IM
+  // 自义定表情
   customizeExpression: number
   customizeExpression: number
+  // 已登录的用户id
+  senderUserId?: string
+  // 未登录的设备id
+  deviceId?: string
 
 
   // 自定义字段
   // 自定义字段
   customFormIM?: boolean  // 默认来自网络接口
   customFormIM?: boolean  // 默认来自网络接口
@@ -71,4 +77,26 @@ export enum LiveMessageOptType {
 export enum LiveMessageRoomType {
 export enum LiveMessageRoomType {
   living = "ZH_VIDEO",    // 直播间
   living = "ZH_VIDEO",    // 直播间
   chat = "ZH_CHAT",       // 大家聊
   chat = "ZH_CHAT",       // 大家聊
+}
+
+export enum LiveMessageRole {
+  host = "host",
+  guest = "guest",
+  tourist = "tourist",
+}
+
+export function LiveMessageIsHistoryMessage(optionType: LiveMessageOptType): boolean {
+  let isHistoryMessage = false
+  switch (optionType) {
+    case LiveMessageOptType.ZH_TEXT_MSG:
+    case LiveMessageOptType.ZH_IMAGE_MSG:
+    case LiveMessageOptType.ZH_TEXT_AND_IMAGE_MSG:
+    case LiveMessageOptType.ZH_AUDIO_MSG:
+    case LiveMessageOptType.ZH_VIDEO_MSG: {
+      isHistoryMessage = true
+    } break;
+    default:
+      break;
+  }
+  return isHistoryMessage
 }
 }

@@ -10,7 +10,7 @@ import { LiveRoomItemBean } from 'wdBean/Index';
 import { LiveRoomBaseInfo } from './LiveRoomBaseInfo'
 import { LiveRoomBaseInfo } from './LiveRoomBaseInfo'
 
 
 import { JSON } from '@kit.ArkTS';
 import { JSON } from '@kit.ArkTS';
-import { LiveMessageOptType } from 'wdBean/src/main/ets/bean/live/LiveRoomBean';
+import { LiveMessageIsHistoryMessage, LiveMessageOptType } from 'wdBean/src/main/ets/bean/live/LiveRoomBean';
 
 
 const TAG = "LiveRoomManager"
 const TAG = "LiveRoomManager"
 
 
@@ -109,7 +109,7 @@ export class LiveRoom extends ChatroomStatusListener {
 
 
     let optionType = liveRoomItemBean.optionType != undefined ? liveRoomItemBean.optionType : liveRoomItemBean.dataType
     let optionType = liveRoomItemBean.optionType != undefined ? liveRoomItemBean.optionType : liveRoomItemBean.dataType
 
 
-    if (this.isHistoryMessage(optionType)) {
+    if (LiveMessageIsHistoryMessage(optionType)) {
       liveRoomItemBean.customFormIM = true
       liveRoomItemBean.customFormIM = true
       if (this.onHistoryMessage) {
       if (this.onHistoryMessage) {
         this.onHistoryMessage(liveRoomItemBean)
         this.onHistoryMessage(liveRoomItemBean)
@@ -123,20 +123,4 @@ export class LiveRoom extends ChatroomStatusListener {
 
 
   
   
   }
   }
-  
-  isHistoryMessage(optionType: string): boolean {
-    let isHistoryMessage = false
-    switch (optionType) {
-      case LiveMessageOptType.ZH_TEXT_MSG:
-      case LiveMessageOptType.ZH_IMAGE_MSG:
-      case LiveMessageOptType.ZH_TEXT_AND_IMAGE_MSG:
-      case LiveMessageOptType.ZH_AUDIO_MSG:
-      case LiveMessageOptType.ZH_VIDEO_MSG: {
-        isHistoryMessage = true
-      } break;
-      default:
-        break;
-    }
-    return isHistoryMessage
-  }
 }
 }

@@ -95,6 +95,10 @@ export struct DetailPlayLivePage {
 
 
   configChatRoom() {
   configChatRoom() {
     this.chatRoomController.onHistoryMessage = (liveRoomItemBean: LiveRoomItemBean) => {
     this.chatRoomController.onHistoryMessage = (liveRoomItemBean: LiveRoomItemBean) => {
+      const preDisplay = this.contentDetailData.liveInfo.preCommentFlag == 1
+      if (this.liveViewModel.filterMySelfCommentNoPreDisplay(liveRoomItemBean, preDisplay)) {
+        return
+      }
       if (liveRoomItemBean.messageRoom == LiveMessageRoomType.living) {
       if (liveRoomItemBean.messageRoom == LiveMessageRoomType.living) {
         this.lastInputedLiveComment = liveRoomItemBean
         this.lastInputedLiveComment = liveRoomItemBean
       } else if (liveRoomItemBean.messageRoom == LiveMessageRoomType.chat) {
       } else if (liveRoomItemBean.messageRoom == LiveMessageRoomType.chat) {

-import { ContentDetailDTO, LiveRoomDataBean } from 'wdBean/Index';
+import { ContentDetailDTO, LiveRoomDataBean, LiveRoomItemBean } from 'wdBean/Index';
 import { LiveViewModel } from '../viewModel/LiveViewModel';
 import { LiveViewModel } from '../viewModel/LiveViewModel';
 import { CustomToast, WindowModel } from 'wdKit/Index';
 import { CustomToast, WindowModel } from 'wdKit/Index';
 import { PlayerComponent } from '../widgets/vertical/PlayerComponent';
 import { PlayerComponent } from '../widgets/vertical/PlayerComponent';
@@ -12,6 +12,7 @@ import { LiveDetailPageLogic } from '../viewModel/LiveDetailPageLogic';
 import { onlyWifiLoadVideo } from 'wdComponent/src/main/ets/utils/lazyloadImg';
 import { onlyWifiLoadVideo } from 'wdComponent/src/main/ets/utils/lazyloadImg';
 import { StringUtils } from 'wdKit';
 import { StringUtils } from 'wdKit';
 import { LiveDetailChatRoomController } from '../im/LiveDetailChatRoomController';
 import { LiveDetailChatRoomController } from '../im/LiveDetailChatRoomController';
+import { LiveMessageOptType } from 'wdBean/src/main/ets/bean/live/LiveRoomBean';
 
 
 const storage = LocalStorage.getShared();
 const storage = LocalStorage.getShared();
 const TAG = 'DetailPlayVLivePage'
 const TAG = 'DetailPlayVLivePage'
@@ -40,6 +41,7 @@ export struct DetailPlayVLivePage {
   @Consume contentId: string
   @Consume contentId: string
   @State swiperIndex: number = 1
   @State swiperIndex: number = 1
   @Consume liveDetailPageLogic: LiveDetailPageLogic
   @Consume liveDetailPageLogic: LiveDetailPageLogic
+  @Provide lastInputedComment: LiveRoomItemBean = {} as LiveRoomItemBean // 上次输入的消息
   //播放错误
   //播放错误
   @State isPlayerError: boolean = false
   @State isPlayerError: boolean = false
   @State isCanplay: boolean = false
   @State isCanplay: boolean = false
@@ -71,7 +73,7 @@ export struct DetailPlayVLivePage {
     if(!await onlyWifiLoadVideo()){
     if(!await onlyWifiLoadVideo()){
       this.showToastTip(this.toastText)
       this.showToastTip(this.toastText)
     }
     }
-    this.chatRoomController.configDetail(this.contentDetailData)
+    this.configChatRoom()
   }
   }
 
 
   aboutToDisappear(): void {
   aboutToDisappear(): void {
@@ -92,6 +94,22 @@ export struct DetailPlayVLivePage {
  //   WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
  //   WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
   }
   }
 
 
+  configChatRoom() {
+    this.chatRoomController.onHistoryMessage = (liveRoomItemBean: LiveRoomItemBean) => {
+      const preDisplay = this.contentDetailData.liveInfo.preCommentFlag == 1
+      if (this.liveViewModel.filterMySelfCommentNoPreDisplay(liveRoomItemBean, preDisplay)) {
+        return
+      }
+      this.lastInputedComment = liveRoomItemBean
+    }
+    this.chatRoomController.onLiveMessage = (liveRoomItemBean: LiveRoomItemBean) => {
+      if (liveRoomItemBean.optionType == LiveMessageOptType.ZH_ROOM_NUMBER_MSG) {
+        this.liveRoomDataBean.pv = Number(liveRoomItemBean.pv)
+      }
+    }
+    this.chatRoomController.configDetail(this.contentDetailData)
+  }
+
   build() {
   build() {
 
 
     Stack({ alignContent: Alignment.Top }) {
     Stack({ alignContent: Alignment.Top }) {

@@ -7,10 +7,12 @@ import {
   LiveRoomItemBean,
   LiveRoomItemBean,
   ValueType
   ValueType
 } from 'wdBean/Index'
 } from 'wdBean/Index'
+import { LiveMessageIsHistoryMessage } from 'wdBean/src/main/ets/bean/live/LiveRoomBean'
+import { SpConstants } from 'wdConstant'
 import { ContentDetailRequest } from 'wdDetailPlayApi/Index'
 import { ContentDetailRequest } from 'wdDetailPlayApi/Index'
-import { Logger } from 'wdKit/Index'
+import { Logger, SPHelper } from 'wdKit/Index'
 import { ToastUtils } from 'wdKit/src/main/ets/utils/ToastUtils'
 import { ToastUtils } from 'wdKit/src/main/ets/utils/ToastUtils'
-import { ResponseDTO } from 'wdNetwork/Index'
+import { HttpUtils, ResponseDTO } from 'wdNetwork/Index'
 import { LiveModel } from './LiveModel'
 import { LiveModel } from './LiveModel'
 
 
 const TAG = "LiveViewModel"
 const TAG = "LiveViewModel"
@@ -196,4 +198,26 @@ export class LiveViewModel {
     retItem.fullColumnImgUrlDto = item.fullColumnImgUrlDto
     retItem.fullColumnImgUrlDto = item.fullColumnImgUrlDto
     return retItem
     return retItem
   }
   }
+
+  filterMySelfCommentNoPreDisplay(comment: LiveRoomItemBean, openPreDisplay:boolean) {
+    let mySelf = false
+    const userId = HttpUtils.getUserId()
+    const deviceId = HttpUtils.getDeviceId()
+    if (comment.senderUserId && comment.senderUserId == userId) {
+      mySelf = true
+    } else if (comment.deviceId && comment.deviceId == deviceId) {
+      mySelf = true
+    }
+    let optionType = comment.optionType != undefined ? comment.optionType : comment.dataType
+
+    if (mySelf
+      && openPreDisplay
+      && comment.customFormIM === true
+      && LiveMessageIsHistoryMessage(optionType)
+    ) {
+      return true
+    }
+    return false
+  }
+
 }
 }

@@ -53,7 +53,9 @@ export struct TabChatComponent {
 
 
           this.liveChatList.push(info)
           this.liveChatList.push(info)
           this.pageModel.viewType = ViewType.LOADED;
           this.pageModel.viewType = ViewType.LOADED;
-          // this.scroller.scrollEdge(Edge.Bottom)
+          if (this.pageModel.viewType == ViewType.LOADED) {
+            this.scroller.scrollEdge(Edge.Bottom)
+          }
           console.log(TAG, '发布评论：', JSON.stringify(this.publishCommentModel.lastCommentModel))
           console.log(TAG, '发布评论：', JSON.stringify(this.publishCommentModel.lastCommentModel))
         }
         }
       }
       }
@@ -63,6 +65,9 @@ export struct TabChatComponent {
   lastInputedCommentChanged(info: string) {
   lastInputedCommentChanged(info: string) {
     Logger.debug(TAG, "2显示评论》》》: " + JSON.stringify(this.lastInputedComment))
     Logger.debug(TAG, "2显示评论》》》: " + JSON.stringify(this.lastInputedComment))
     this.liveChatList.push(this.liveViewModel.deepCopyLiveRoomItem(this.lastInputedComment))
     this.liveChatList.push(this.liveViewModel.deepCopyLiveRoomItem(this.lastInputedComment))
+    if (this.pageModel.viewType == ViewType.LOADED) {
+      this.scroller.scrollEdge(Edge.Bottom)
+    }
     this.pageModel.viewType = ViewType.LOADED;
     this.pageModel.viewType = ViewType.LOADED;
   }
   }
 
 

 import { LiveRoomItemBean } from 'wdBean/Index'
 import { LiveRoomItemBean } from 'wdBean/Index'
+import { LiveMessageRole } from 'wdBean/src/main/ets/bean/live/LiveRoomBean'
+import { LengthMetrics } from '@kit.ArkUI'
 
 
 @Component
 @Component
 export struct ChatItemComponent {
 export struct ChatItemComponent {
@@ -10,17 +12,23 @@ export struct ChatItemComponent {
   build() {
   build() {
     Row() {
     Row() {
       Text() {
       Text() {
-        // if (this.item.senderUserName) {
-        //   Span(' 主持人 ')
-        //     .fontSize(11)
-        //     .lineHeight(20)
-        //     .textBackgroundStyle({ color: '#808562', radius: 2 })
-        //   Span(' ')
-        // }
+        if (this.item.role == LiveMessageRole.host) {
+          Span(' 主持人 ')
+            .fontSize(11)
+            .lineHeight(20)
+            .textBackgroundStyle({ color: "#70FFC63F", radius: 2 })
+          Span(' ')
+        }
+        if (this.item.role == LiveMessageRole.guest) {
+          Span(' 嘉宾 ')
+            .fontSize(11)
+            .lineHeight(20)
+            .textBackgroundStyle({ color: "#70FFC63F", radius: 2 })
+          Span(' ')
+        }
         Span(this.item.senderUserName + ': ')
         Span(this.item.senderUserName + ': ')
           .fontColor('#FFFFC63F')
           .fontColor('#FFFFC63F')
           .padding({ right: 118 })
           .padding({ right: 118 })
-        //
 
 
         Span(this.item.text)
         Span(this.item.text)
       }
       }

 import { Action, ContentDetailDTO, LiveDetailsBean, LiveRoomDataBean, LiveRoomItemBean } from 'wdBean/Index'
 import { Action, ContentDetailDTO, LiveDetailsBean, LiveRoomDataBean, LiveRoomItemBean } from 'wdBean/Index'
-import { LiveCommentComponent } from 'wdComponent/Index'
-import { publishCommentModel } from 'wdComponent/src/main/ets/components/comment/model/PublishCommentModel'
 import { LiveOperRowListView } from 'wdComponent'
 import { LiveOperRowListView } from 'wdComponent'
 import PageModel from 'wdComponent/src/main/ets/viewmodel/PageModel'
 import PageModel from 'wdComponent/src/main/ets/viewmodel/PageModel'
 import { DisplayDirection, SpConstants, ViewType } from 'wdConstant/Index'
 import { DisplayDirection, SpConstants, ViewType } from 'wdConstant/Index'
@@ -25,8 +23,8 @@ export struct PlayerCommentComponent {
   @Consume displayDirection: DisplayDirection
   @Consume displayDirection: DisplayDirection
   @State private pageModel: PageModel = new PageModel()
   @State private pageModel: PageModel = new PageModel()
   @State liveChatList: Array<LiveRoomItemBean> = []
   @State liveChatList: Array<LiveRoomItemBean> = []
+  @Consume @Watch("lastInputedCommentChagned") lastInputedComment: LiveRoomItemBean
   @Consume @Watch('liveDetailsBeanChange') contentDetailData: ContentDetailDTO
   @Consume @Watch('liveDetailsBeanChange') contentDetailData: ContentDetailDTO
-  @Consume publishCommentModel: publishCommentModel
   scroller: Scroller = new Scroller()
   scroller: Scroller = new Scroller()
 
 
   async aboutToAppear(): Promise<void> {
   async aboutToAppear(): Promise<void> {
@@ -81,6 +79,16 @@ export struct PlayerCommentComponent {
         })
         })
   }
   }
 
 
+  lastInputedCommentChagned() {
+    Logger.debug(TAG, "2显示评论》》》: " + JSON.stringify(this.lastInputedComment))
+
+    this.liveChatList.push(this.lastInputedComment)
+    if (this.pageModel.viewType == ViewType.LOADED) {
+      this.scroller.scrollEdge(Edge.Bottom)
+    }
+    this.pageModel.viewType = ViewType.LOADED;
+  }
+
   build() {
   build() {
     Column() {
     Column() {
       Stack({ alignContent: Alignment.BottomStart }) {
       Stack({ alignContent: Alignment.BottomStart }) {