Merge remote-tracking branch 'origin/main'

@@ -2,46 +2,30 @@ import { StringUtils } from './StringUtils';
 import { SPHelper } from './SPHelper';
 import { Logger } from './Logger';
 
-const KEY_USER_TOKEN = 'userToken';
-
 const TAG: string = 'AccountManagerUtils';
 
 // 是否已登录hadLogin
 let hasLogin: boolean = false;
 
 export class AccountManagerUtils {
-  // 是否已登录hadLogin
-  // private static hasLogin: boolean = undefined;
+
+  // 这里需要和其他模块value值一致 ！！！！
+  // TODO: 以前清楚谁写的遗留代码，后续考虑删除
+  static readonly USER_ID = "userId"
 
   constructor() {
   }
 
-  static async getUserToken(): Promise<string> {
-    let userToken = await SPHelper.default.get(KEY_USER_TOKEN, '') as string;
+  static async getUserId(): Promise<string> {
+    let userId = await SPHelper.default.get(AccountManagerUtils.USER_ID, '') as string;
     // Logger.info(TAG, 'getUserToken UserToken.' + userToken);
-    return userToken;
+    return userId;
   }
 
-  static getUserTokenSync(): string {
-    let userToken = SPHelper.default.getSync(KEY_USER_TOKEN, '') as string;
+  static getUserIdSync(): string {
+    let userId = SPHelper.default.getSync(AccountManagerUtils.USER_ID, '') as string;
     // Logger.info(TAG, 'getUserToken UserToken.' + userToken);
-    return userToken;
-  }
-
-  static async putUserToken(value: string) {
-    await SPHelper.default.save(KEY_USER_TOKEN, value);
-  }
-
-  static putUserTokenSync(value: string) {
-    SPHelper.default.saveSync(KEY_USER_TOKEN, value);
-  }
-
-  static async deleteUserToken() {
-    await SPHelper.default.delete(KEY_USER_TOKEN);
-  }
-
-  static deleteUserTokenSync() {
-    SPHelper.default.deleteSync(KEY_USER_TOKEN);
+    return userId;
   }
 
   /**
@@ -51,7 +35,7 @@ export class AccountManagerUtils {
    */
   static async isLogin() {
     Logger.info(TAG, 'isLogin hasLogin1:' + hasLogin);
-    let lastUserToken = await AccountManagerUtils.getUserToken()
+    let lastUserToken = await AccountManagerUtils.getUserId()
     Logger.info(TAG, 'isLogin lastUserToken:' + lastUserToken);
     if (StringUtils.isEmpty(lastUserToken)) {
       hasLogin = false;
@@ -72,7 +56,7 @@ export class AccountManagerUtils {
    */
   static isLoginSync() {
     Logger.info(TAG, 'isLogin hasLogin1:' + hasLogin);
-    let lastUserToken = AccountManagerUtils.getUserTokenSync()
+    let lastUserToken = AccountManagerUtils.getUserIdSync()
     Logger.info(TAG, 'isLogin lastUserToken:' + lastUserToken);
     if (StringUtils.isEmpty(lastUserToken)) {
       hasLogin = false;

@@ -70,6 +70,7 @@ export struct DynamicDetailComponent {
   @State isPageEnd: boolean = false
   @State publishCommentModel: publishCommentModel = new publishCommentModel()
   @State reachEndIncreament: number = 0
+  @State operationButtonList: string[] = []
 
   async aboutToAppear() {
     await this.getContentDetailData()
@@ -532,15 +533,7 @@ export struct DynamicDetailComponent {
                 if (this.contentDetailData?.openComment) {
                   Divider().strokeWidth(6).color('#f5f5f5').margin({ top: $r('app.float.margin_24') })
                   CommentComponent({
-                    publishCommentModel: {
-                      targetId: String(this.contentDetailData?.newsId || ''),
-                      targetRelId: this.contentDetailData?.reLInfo?.relId,
-                      targetTitle: this.contentDetailData?.newsTitle,
-                      targetRelType: this.contentDetailData?.reLInfo?.relType,
-                      targetRelObjectId: String(this.contentDetailData?.reLInfo?.relObjectId),
-                      keyArticle: String(this.contentDetailData?.keyArticle),
-                      targetType: String(this.contentDetailData?.newsType),
-                    } as publishCommentModel
+                    publishCommentModel: this.publishCommentModel
                   })
                 }
                 Blank().layoutWeight(1)
@@ -557,7 +550,7 @@ export struct DynamicDetailComponent {
         OperRowListView({
           contentDetailData: this.contentDetailData,
           publishCommentModel: this.publishCommentModel,
-          operationButtonList: ['comment', 'collect', 'share'],
+          operationButtonList: this.operationButtonList,
           styleType: 1,
         })
 
@@ -574,13 +567,6 @@ export struct DynamicDetailComponent {
    * */
   private async getContentDetailData() {
     this.isNetConnected = NetworkUtil.isNetConnected()
-    this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
-    this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId)
-    this.publishCommentModel.targetTitle = this.contentDetailData?.newsTitle
-    this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType)
-    this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
-    this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
-    this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
     try {
       let data = await MultiPictureDetailViewModel.getDetailData(this.relId, this.contentId, this.relType)
       this.isPageEnd = true;
@@ -590,6 +576,20 @@ export struct DynamicDetailComponent {
       let _publishTime = DateTimeUtils.formatDate(dateTime, PATTERN_DATE_CN_RN)
       this.publishTime = DateTimeUtils.removeTrailingZeros(_publishTime)
       console.log('动态详情', JSON.stringify(this.contentDetailData))
+
+      if (this.contentDetailData?.openComment) {
+        this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
+        this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId || '')
+        this.publishCommentModel.targetTitle = this.contentDetailData?.newsTitle
+        this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType || '')
+        this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId || '')
+        this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle || '')
+        this.publishCommentModel.targetType = String(this.contentDetailData?.newsType || '')
+        this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
+      }
+
+      this.operationButtonList = ['comment', 'collect', 'share']
+
     } catch (exception) {
       console.log('请求失败', JSON.stringify(exception))
       this.isPageEnd = true;

@@ -234,13 +234,13 @@ export struct ImageAndTextPageComponent {
         }
         if (this.contentDetailData?.openComment) {
           this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
-          this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId)
+          this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId || '')
           this.publishCommentModel.targetTitle = this.contentDetailData?.newsTitle
-          this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType)
-          this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
-          this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
-          this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
-          this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment)
+          this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType || '')
+          this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId || '')
+          this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle || '')
+          this.publishCommentModel.targetType = String(this.contentDetailData?.newsType || '')
+          this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
         }
         if (this.contentDetailData?.openAudio && this.contentDetailData?.audioList?.length &&
         this.contentDetailData?.audioList[0].audioUrl) {

@@ -445,13 +445,13 @@ export struct MultiPictureDetailPageComponent {
           // }
           if (this.contentDetailData?.openComment) {
             this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
-            this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId)
+            this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId || '')
             this.publishCommentModel.targetTitle = this.contentDetailData?.newsTitle
-            this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType)
-            this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
-            this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
-            this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
-            this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment)
+            this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType || '')
+            this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId || '')
+            this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle || '')
+            this.publishCommentModel.targetType = String(this.contentDetailData?.newsType || '')
+            this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
           }
           // this.contentDetailData.photoList = []
           if (this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length === 0) {

@@ -72,13 +72,13 @@ export struct SpacialTopicPageComponent {
         this.contentDetailData = detailBeans[0];
         // if (this.contentDetailData[0]?.openComment) {
         this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
-        this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId)
+        this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId || '')
         this.publishCommentModel.targetTitle = this.contentDetailData?.newsTitle
-        this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType)
-        this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
-        this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
-        this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
-        this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment)
+        this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType || '')
+        this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId || '')
+        this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle || '')
+        this.publishCommentModel.targetType = String(this.contentDetailData?.newsType || '')
+        this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
         // }
         this.trySendData2H5()
       }

@@ -81,7 +81,7 @@ export struct Card6Component {
                   this.contentDTO.objectType == '5' ? 30 : 0)
           }.alignContent(Alignment.TopStart)
 
-        }.height("75%")
+        }
         .justifyContent(FlexAlign.Start)
 
 

@@ -93,6 +93,9 @@ export struct CommentComponent {
         }
       });
     }
+    if (model) {
+      this.isComments = true
+    }
 
   }
 

@@ -164,7 +164,7 @@ class CommentViewModel {
   publishComment(model: publishCommentModel) {
 
     return new Promise<commentItemModel>((success, fail) => {
-      const visitorMode = model.visitorComment == "1" && AccountManagerUtils.isLoginSync() == false
+      const visitorMode = model.visitorComment == "1" && HttpUtils.isLogin() == false
       let url = visitorMode ? HttpUrlUtils.getNoUserPublishCommentUrl() : HttpUrlUtils.getPublishCommentUrl()
 
       let bean: Record<string, string> = {};

@@ -9,6 +9,7 @@ import {
 import { MultiPictureDetailViewModel } from '../../viewmodel/MultiPictureDetailViewModel';
 import commentViewModel from '../../components/comment/viewmodel/CommentViewModel';
 import { commentItemModel } from '../../components/comment/model/CommentModel'
+import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 
 /**
  * 精选评论卡
@@ -22,9 +23,11 @@ export struct ZhSingleRow06 {
   @State newsStatusOfUser: batchLikeAndCollectResult = {
     likeStatus: '0'
   } as batchLikeAndCollectResult // 点赞、收藏状态
+  @State loadImg: boolean = false;
 
-  aboutToAppear(): void {
+  async aboutToAppear(): Promise<void> {
     this.getInteractDataStatus()
+    this.loadImg = await onlyWifiLoadImg();
   }
 
   /**
@@ -160,7 +163,12 @@ export struct ZhSingleRow06 {
   CompHeader(item: CompDTO) {
     Row() {
       Row() {
-        Image(item.operDataList[0]?.commentInfo?.userHeaderUrl ? item.operDataList[0].commentInfo.userHeaderUrl : $r('app.media.default_head'))
+        Image(
+          this.loadImg
+            ? item.operDataList[0]?.commentInfo?.userHeaderUrl
+              ? item.operDataList[0].commentInfo.userHeaderUrl
+              : $r('app.media.default_head')
+            : '')
           .width(32)
           .height(32)
           .borderRadius(16)

@@ -64,13 +64,13 @@ export struct DetailPlayLiveCommon {
           // if (this.contentDetailData.openComment === 1) {
           console.log(TAG, '查询视频详情用于评论展示 openComment:', this.contentDetailData.openComment)
           this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
-          this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId)
+          this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId || '')
           this.publishCommentModel.targetTitle = this.contentDetailData?.newsTitle
-          this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType)
-          this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
-          this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
-          this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
-          this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment)
+          this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType || '')
+          this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId || '')
+          this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle || '')
+          this.publishCommentModel.targetType = String(this.contentDetailData?.newsType || '')
+          this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
           this.publishCommentModel.commentContent = ''
           // }
         }

@@ -166,12 +166,13 @@ export struct DetailPlayShortVideoPage {
     this.queryNewsInfoOfUser()
 
     this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
-    this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId)
+    this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId || '')
     this.publishCommentModel.targetTitle = this.contentDetailData?.newsTitle
-    this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType)
-    this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
-    this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
-    this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
+    this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType || '')
+    this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId || '')
+    this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle || '')
+    this.publishCommentModel.targetType = String(this.contentDetailData?.newsType || '')
+    this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
     this.publishCommentModel.commentContent = ''
 
   }

@@ -17,13 +17,13 @@ export struct CommentComponentPage {
   aboutToAppear(): void {
 
     this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
-    this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId)
+    this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId || '')
     this.publishCommentModel.targetTitle = this.contentDetailData?.newsTitle
-    this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType)
-    this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
-    this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
-    this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
-    this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment)
+    this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType || '')
+    this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId || '')
+    this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle || '')
+    this.publishCommentModel.targetType = String(this.contentDetailData?.newsType || '')
+    this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
   }
 
   build() {