Merge remote-tracking branch 'origin/main'

@@ -47,4 +47,5 @@ export class SpConstants{
 
 
    //游客状态下首次评论时间
    //游客状态下首次评论时间
    static FIRSTCOMMENTTIME =  'firstCommentTime'
    static FIRSTCOMMENTTIME =  'firstCommentTime'
+   static TOURIST_NICK_NAME =  'touristNickName'
 }
 }

@@ -742,4 +742,8 @@ export class HttpUrlUtils {
     return url
     return url
   }
   }
 
 
+  static reportDeviceInfo() {
+    let url = HttpUrlUtils.getHost() + "/api/rmrb-user-center/common/user/c/device/push";
+    return url;
+  }
 }
 }

@@ -55,7 +55,7 @@ export struct WdWebLocalComponent {
             .mixedMode(MixedMode.All)
             .mixedMode(MixedMode.All)
             .onlineImageAccess(true)
             .onlineImageAccess(true)
             .enableNativeEmbedMode(true)
             .enableNativeEmbedMode(true)
-            .layoutMode(WebLayoutMode.FIT_CONTENT)
+            // .layoutMode(WebLayoutMode.FIT_CONTENT)
             // .nestedScroll({ scrollForward: NestedScrollMode.SELF_FIRST, scrollBackward: NestedScrollMode.PARENT_FIRST })
             // .nestedScroll({ scrollForward: NestedScrollMode.SELF_FIRST, scrollBackward: NestedScrollMode.PARENT_FIRST })
             .height(this.webHeight)
             .height(this.webHeight)
             .onPageBegin((event) => {
             .onPageBegin((event) => {

@@ -69,6 +69,7 @@ export struct DynamicDetailComponent {
   @State isNetConnected: boolean = true
   @State isNetConnected: boolean = true
   @State isPageEnd: boolean = false
   @State isPageEnd: boolean = false
   @State publishCommentModel: publishCommentModel = new publishCommentModel()
   @State publishCommentModel: publishCommentModel = new publishCommentModel()
+  @State reachEndIncreament: number = 0
 
 
   async aboutToAppear() {
   async aboutToAppear() {
     await this.getContentDetailData()
     await this.getContentDetailData()

@@ -52,6 +52,7 @@ export struct ImageAndTextPageComponent {
   @State isNetConnected: boolean = true
   @State isNetConnected: boolean = true
   @State info: Area | null = null
   @State info: Area | null = null
   @State likeNum: number = 0
   @State likeNum: number = 0
+  @State reachEndIncreament : number = 0
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -141,7 +142,12 @@ export struct ImageAndTextPageComponent {
               if (this.contentDetailData?.openComment) {
               if (this.contentDetailData?.openComment) {
                 Divider().strokeWidth(6).color('#f5f5f5')
                 Divider().strokeWidth(6).color('#f5f5f5')
                 CommentComponent({
                 CommentComponent({
-                  publishCommentModel: this.publishCommentModel
+                  publishCommentModel: this.publishCommentModel,
+                  fixedHeightMode: false,
+                  reachEndIncreament: this.reachEndIncreament,
+                  reachEndLoadMoreFinish: () => {
+
+                  }
                 }).onAreaChange((oldValue: Area, newValue: Area) => {
                 }).onAreaChange((oldValue: Area, newValue: Area) => {
                   this.info = newValue
                   this.info = newValue
                 })
                 })
@@ -157,6 +163,9 @@ export struct ImageAndTextPageComponent {
         .padding({ bottom: 76 })
         .padding({ bottom: 76 })
         .scrollBar(BarState.Off)
         .scrollBar(BarState.Off)
         .align(Alignment.Top)
         .align(Alignment.Top)
+        .onReachEnd(() => {
+          this.reachEndIncreament += 1
+        })
 
 
         if (!this.isNetConnected) {
         if (!this.isNetConnected) {
           EmptyComponent({
           EmptyComponent({
@@ -228,6 +237,7 @@ export struct ImageAndTextPageComponent {
           this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
           this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
           this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
           this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
           this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
           this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
+          this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment)
         }
         }
         if (this.contentDetailData?.openAudio && this.contentDetailData?.audioList?.length &&
         if (this.contentDetailData?.openAudio && this.contentDetailData?.audioList?.length &&
         this.contentDetailData?.audioList[0].audioUrl) {
         this.contentDetailData?.audioList[0].audioUrl) {

@@ -449,6 +449,7 @@ export struct MultiPictureDetailPageComponent {
             this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
             this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
             this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
             this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
             this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
             this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
+            this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment)
           }
           }
           // this.contentDetailData.photoList = []
           // this.contentDetailData.photoList = []
           if (this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length === 0) {
           if (this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length === 0) {

@@ -72,6 +72,7 @@ export struct SpacialTopicPageComponent {
         this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
         this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
         this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
         this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
         this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
         this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
+          this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment)
         // }
         // }
         this.trySendData2H5()
         this.trySendData2H5()
       }
       }

@@ -20,6 +20,8 @@ export class publishCommentModel {
   targetType: string = ''
   targetType: string = ''
   /*评论总数*/
   /*评论总数*/
   totalCommentNumer: string = '0'
   totalCommentNumer: string = '0'
+  /// 游客评论开关：visitorComment  1：打开；0：关闭
+  visitorComment: string = "0"
 
 
   //评论传参
   //评论传参
   /*评论图片url，多个逗号隔开*/
   /*评论图片url，多个逗号隔开*/

@@ -27,12 +27,17 @@ export struct CommentComponent {
   @Consume contentDetailData: ContentDetailDTO
   @Consume contentDetailData: ContentDetailDTO
   listScroller: ListScroller = new ListScroller(); // scroller控制器
   listScroller: ListScroller = new ListScroller(); // scroller控制器
   historyOffset: number = 0; // 上次浏览到列表距离顶端的偏移量offset
   historyOffset: number = 0; // 上次浏览到列表距离顶端的偏移量offset
-  isloading: boolean = false
   @State allDatas: LazyDataSource<commentItemModel> = new LazyDataSource();
   @State allDatas: LazyDataSource<commentItemModel> = new LazyDataSource();
   @State dialogController: CustomDialogController | null = null;
   @State dialogController: CustomDialogController | null = null;
 
 
   // @State private browSingModel: commentListModel = new commentListModel()
   // @State private browSingModel: commentListModel = new commentListModel()
 
 
+  // 是否为固定高度模式。true时，里面上拉加载更多生效，外层不能包Scroll。
+  // false时，外层实现加载更多，并通过reachEndIncreament通知开发加载更多，reachEndLoadMoreFinish 通知上层加载更多完成
+  fixedHeightMode: boolean = false
+  @Prop @Watch("parentOnReachEnd") reachEndIncreament : number = 0
+  reachEndLoadMoreFinish?: () => void
+
   // 在自定义组件即将析构销毁时将dialogControlle置空
   // 在自定义组件即将析构销毁时将dialogControlle置空
   aboutToDisappear() {
   aboutToDisappear() {
     this.dialogController = null // 将dialogController置空
     this.dialogController = null // 将dialogController置空
@@ -186,23 +191,43 @@ export struct CommentComponent {
 
 
           // 加载更多
           // 加载更多
           ListItem() {
           ListItem() {
-            if (this.hasMore === false) {
+            if (this.hasMore == false) {
               NoMoreLayout()
               NoMoreLayout()
             }
             }
           }
           }
         }
         }
-
       }
       }
+      .margin({bottom: 10})
       .onReachEnd(() => {
       .onReachEnd(() => {
+        if (!this.fixedHeightMode) {
+          return
+        }
         if (this.hasMore) {
         if (this.hasMore) {
           this.getData()
           this.getData()
         }
         }
       })
       })
-      .enableScrollInteraction(false)
+      .enableScrollInteraction(this.fixedHeightMode ? true: false)
+      // .nestedScroll({
+      //   scrollForward: NestedScrollMode.PARENT_FIRST,
+      //   scrollBackward: NestedScrollMode.SELF_FIRST
+      // })
     }
     }
 
 
   }
   }
 
 
+  parentOnReachEnd() {
+    if (this.fixedHeightMode) {
+      return
+    }
+    if (this.hasMore) {
+      this.getData()
+    } else {
+      if (this.reachEndLoadMoreFinish) {
+        this.reachEndLoadMoreFinish()
+      }
+    }
+  }
+
   //获取数据
   //获取数据
   async getData() {
   async getData() {
     commentViewModel.fetchContentCommentList(this.currentPage + '', this.publishCommentModel.targetId,
     commentViewModel.fetchContentCommentList(this.currentPage + '', this.publishCommentModel.targetId,
@@ -241,6 +266,9 @@ export struct CommentComponent {
         } else {
         } else {
           this.hasMore = false
           this.hasMore = false
         }
         }
+        if (!this.fixedHeightMode && this.reachEndLoadMoreFinish) {
+          this.reachEndLoadMoreFinish()
+        }
       })
       })
   }
   }
 }
 }
@@ -468,7 +496,7 @@ struct commentHeaderView {
         .margin({ left: 8 })
         .margin({ left: 8 })
         .alignContent(Alignment.Center)
         .alignContent(Alignment.Center)
         .onClick(() => {
         .onClick(() => {
-          // TODO 跳转个人详情
+          commentViewModel.jumpToAccountPage(this.item)
         })
         })
 
 
         //昵称
         //昵称

+import { ContentDetailDTO, PageInfoDTO } from 'wdBean/Index'
+import { publishCommentModel } from '../model/PublishCommentModel'
+
+@CustomDialog
+export struct CommentListDialog {
+
+  /// 内部使用
+  private publishCommentModel: publishCommentModel = new publishCommentModel()
+  controller?: CustomDialogController
+
+  /// 外部初始化
+  contentDetail?: ContentDetailDTO
+  pageInfo?: PageInfoDTO
+
+  build() {
+  }
+
+
+}

@@ -412,33 +412,7 @@ struct QualityCommentItem {
 
 
   jumpToAccountOwner() {
   jumpToAccountOwner() {
 
 
-    let url = HttpUrlUtils.getOtherUserDetailDataUrl()
-    let item : Record<string, string >= {
-      "creatorId": this.item.fromCreatorId || "",
-      "userType": `${this.item.fromUserType}`,
-      "userId": this.item.fromUserId || "-1",
-    }
-    HttpBizUtil.post<ResponseDTO<MasterDetailRes>>(url, item).then((result) => {
-      if (!result.data || result.data.mainControl != 1) {
-        ToastUtils.longToast("暂时无法查看该创作者主页")
-        return
-      }
-
-      if (result.data.banControl == 1) {
-        ToastUtils.longToast("该账号已封禁，不予访问")
-        return
-      }
-
-      if (result.data.userType === "1") { // 普通用户
-        let params: Record<string, string> = {'userId': result.data.userId};
-        WDRouterRule.jumpWithPage(WDRouterPage.otherNormalUserHomePagePage,params)
-      } else { // 非普通用户
-        ProcessUtils.gotoPeopleShipHomePage(result.data.creatorId)
-      }
-
-    }).catch(() => {
-      ToastUtils.longToast("暂时无法查看该创作者主页")
-    })
+    commentViewModel.jumpToAccountPage(this.item)
   }
   }
 
 
   jumpToDetail() {
   jumpToDetail() {

+import { MasterDetailRes } from 'wdBean/Index';
 import { SpConstants } from 'wdConstant/Index';
 import { SpConstants } from 'wdConstant/Index';
-import { DateTimeUtils, Logger, SPHelper, ToastUtils, UserDataLocal } from 'wdKit/Index';
+import {
+  AccountManagerUtils,
+  DateTimeUtils, DeviceUtil, Logger, SPHelper, ToastUtils, UserDataLocal } from 'wdKit/Index';
 import { HttpBizUtil, HttpUrlUtils, HttpUtils, ResponseDTO } from 'wdNetwork/Index';
 import { HttpBizUtil, HttpUrlUtils, HttpUtils, ResponseDTO } from 'wdNetwork/Index';
 import { HttpRequest } from 'wdNetwork/src/main/ets/http/HttpRequest';
 import { HttpRequest } from 'wdNetwork/src/main/ets/http/HttpRequest';
+import { ProcessUtils, WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import {
 import {
   commentItemModel,
   commentItemModel,
   commentListModel,
   commentListModel,
@@ -160,7 +164,9 @@ class CommentViewModel {
   publishComment(model: publishCommentModel) {
   publishComment(model: publishCommentModel) {
 
 
     return new Promise<commentItemModel>((success, fail) => {
     return new Promise<commentItemModel>((success, fail) => {
-      let url = HttpUrlUtils.getPublishCommentUrl()
+      const visitorMode = model.visitorComment == "1" && AccountManagerUtils.isLoginSync() == false
+      let url = visitorMode ? HttpUrlUtils.getNoUserPublishCommentUrl() : HttpUrlUtils.getPublishCommentUrl()
+
       let bean: Record<string, string> = {};
       let bean: Record<string, string> = {};
 
 
       bean['targetId'] = model.targetId;
       bean['targetId'] = model.targetId;
@@ -176,6 +182,11 @@ class CommentViewModel {
       bean['targetType'] = model.targetType
       bean['targetType'] = model.targetType
       bean['parentId'] = model.parentId
       bean['parentId'] = model.parentId
 
 
+      if (visitorMode) {
+        bean['deviceId'] = DeviceUtil.clientId()
+        bean['userName'] = SPHelper.default.getSync(SpConstants.TOURIST_NICK_NAME, "") as string
+      }
+
       HttpRequest.post<ResponseDTO<commentItemModel>>(url, bean).then((data: ResponseDTO<commentItemModel>) => {
       HttpRequest.post<ResponseDTO<commentItemModel>>(url, bean).then((data: ResponseDTO<commentItemModel>) => {
         if (data.code != 0) {
         if (data.code != 0) {
           ToastUtils.showToast(data.message, 1000);
           ToastUtils.showToast(data.message, 1000);
@@ -185,10 +196,9 @@ class CommentViewModel {
         ToastUtils.showToast(data.message, 1000);
         ToastUtils.showToast(data.message, 1000);
         let model = data.data as commentItemModel
         let model = data.data as commentItemModel
 
 
-        let userId = HttpUtils.getUserId()
-        let FIRSTCOMMENTTIME = SPHelper.default.getSync(SpConstants.FIRSTCOMMENTTIME, '')
+        let firstCommentTime = SPHelper.default.getSync(SpConstants.FIRSTCOMMENTTIME, '') as string
 
 
-        if (!userId && !FIRSTCOMMENTTIME) {
+        if (visitorMode && firstCommentTime.length == 0) {
           //保存首次评论时间
           //保存首次评论时间
           SPHelper.default.saveSync(SpConstants.FIRSTCOMMENTTIME, DateTimeUtils.formatDate(data.timestamp, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN))
           SPHelper.default.saveSync(SpConstants.FIRSTCOMMENTTIME, DateTimeUtils.formatDate(data.timestamp, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN))
         }
         }
@@ -472,6 +482,36 @@ class CommentViewModel {
     }
     }
     return false
     return false
   }
   }
+
+  jumpToAccountPage(commentItem: commentItemModel) {
+    let url = HttpUrlUtils.getOtherUserDetailDataUrl()
+    let item : Record<string, string >= {
+      "creatorId": commentItem.fromCreatorId || "",
+      "userType": `${commentItem.fromUserType}`,
+      "userId": commentItem.fromUserId || "-1",
+    }
+    HttpBizUtil.post<ResponseDTO<MasterDetailRes>>(url, item).then((result) => {
+      if (!result.data || result.data.mainControl != 1) {
+        ToastUtils.longToast("暂时无法查看该创作者主页")
+        return
+      }
+
+      if (result.data.banControl == 1) {
+        ToastUtils.longToast("该账号已封禁，不予访问")
+        return
+      }
+
+      if (result.data.userType === "1") { // 普通用户
+        let params: Record<string, string> = {'userId': result.data.userId};
+        WDRouterRule.jumpWithPage(WDRouterPage.otherNormalUserHomePagePage,params)
+      } else { // 非普通用户
+        ProcessUtils.gotoPeopleShipHomePage(result.data.creatorId)
+      }
+
+    }).catch(() => {
+      ToastUtils.longToast("暂时无法查看该创作者主页")
+    })
+  }
 }
 }
 
 
 
 

+import { insightIntent } from '@kit.IntentsKit';
 import { BottomNavDTO, CompDTO, TopNavDTO } from 'wdBean';
 import { BottomNavDTO, CompDTO, TopNavDTO } from 'wdBean';
 import { SpConstants } from 'wdConstant';
 import { SpConstants } from 'wdConstant';
 import { DisplayUtils, LazyDataSource, Logger, NetworkUtil, SPHelper, ToastUtils } from 'wdKit';
 import { DisplayUtils, LazyDataSource, Logger, NetworkUtil, SPHelper, ToastUtils } from 'wdKit';
@@ -8,6 +9,7 @@ import { FirstTabTopSearchComponent } from '../search/FirstTabTopSearchComponent
 import { AssignChannelParam } from 'wdRouter/src/main/ets/utils/HomeChannelUtils';
 import { AssignChannelParam } from 'wdRouter/src/main/ets/utils/HomeChannelUtils';
 import { PeopleShipMainComponent } from '../peopleShip/PeopleShipMainComponent';
 import { PeopleShipMainComponent } from '../peopleShip/PeopleShipMainComponent';
 import { channelSkeleton } from '../skeleton/channelSkeleton';
 import { channelSkeleton } from '../skeleton/channelSkeleton';
+import { common } from '@kit.AbilityKit';
 
 
 
 
 const TAG = 'TopNavigationComponent';
 const TAG = 'TopNavigationComponent';
@@ -37,6 +39,7 @@ export struct TopNavigationComponent {
   // 顶导当前选中/焦点下标
   // 顶导当前选中/焦点下标
   @State currentTopNavSelectedIndex: number = 0;
   @State currentTopNavSelectedIndex: number = 0;
   @State currentTopNavName: string = '';
   @State currentTopNavName: string = '';
+  @State currentTopNavItem: TopNavDTO = {} as TopNavDTO
   // 顶导数据
   // 顶导数据
   @State @Watch('onTopNavigationDataUpdated') topNavList: TopNavDTO[] = []
   @State @Watch('onTopNavigationDataUpdated') topNavList: TopNavDTO[] = []
   @State compList: LazyDataSource<CompDTO> = new LazyDataSource();
   @State compList: LazyDataSource<CompDTO> = new LazyDataSource();
@@ -58,6 +61,8 @@ export struct TopNavigationComponent {
   @Prop @Watch('onAutoRefresh') autoRefresh: number = 0
   @Prop @Watch('onAutoRefresh') autoRefresh: number = 0
   // 传递给page的自动刷新通知
   // 传递给page的自动刷新通知
   @State autoRefresh2Page: number = 0
   @State autoRefresh2Page: number = 0
+  //保存当前导航选中时的时间戳 意图开始时间
+  @State executedStartTime: number = new Date().getTime()
   // 当前底导index
   // 当前底导index
   @State navIndex: number = 0
   @State navIndex: number = 0
   @State animationDuration: number = 0
   @State animationDuration: number = 0
@@ -167,6 +172,7 @@ export struct TopNavigationComponent {
       this.currentTopNavSelectedIndex = index
       this.currentTopNavSelectedIndex = index
       this.currentTopNavName = this.myChannelList[index].name
       this.currentTopNavName = this.myChannelList[index].name
     }
     }
+    this.currentTopNavItem = this.myChannelList[this.currentTopNavSelectedIndex]
   }
   }
 
 
   isBroadcast(item: TopNavDTO) {
   isBroadcast(item: TopNavDTO) {
@@ -184,6 +190,49 @@ export struct TopNavigationComponent {
     return item.channelType === 3
     return item.channelType === 3
   }
   }
 
 
+  //意图共享
+  topNavInsightIntentShare(item: TopNavDTO){
+    let tapNavIntent: insightIntent.InsightIntent = {
+      intentName: 'ViewColumn',
+      intentVersion: '1.0.1',
+      identifier: '52dac3b0-6520-4974-81e5-25f0879449b5',
+      intentActionInfo: {
+        actionMode: 'EXPECTED',
+        currentPercentage: 50,
+        executedTimeSlots: {
+          executedEndTime: new Date().getTime(),
+          executedStartTime: this.executedStartTime
+        }
+      },
+      intentEntityInfo: {
+        entityName: 'ViewColumn',
+        entityId: String(item.pageId) || '',
+        displayName: item.name,
+        logoURL: 'https://www-file.huawei.com/-/media/corporate/images/home/logo/huawei_logo.png',
+        rankingHint: 99,
+        isPublicData: true
+      }
+    }
+
+    try {
+      let context = getContext(this) as common.UIAbilityContext;
+      // 共享数据
+      insightIntent.shareIntent(context, [tapNavIntent], (error) => {
+        if (error?.code) {
+          // 处理业务逻辑错误
+          console.error(`shareIntent failed, error.code: ${error?.code}, error.message: ${error?.message}`);
+          return;
+        }
+        // 执行正常业务
+        console.log('shareIntent succeed');
+      });
+    } catch (error) {
+      // 处理异常
+      console.error(`error.code: ${error?.code}, error.message: ${error?.message}`);
+    }
+  }
+
+
   build() {
   build() {
     Column() {
     Column() {
       // 顶部搜索、日报logo、早晚报
       // 顶部搜索、日报logo、早晚报
@@ -278,7 +327,11 @@ export struct TopNavigationComponent {
           if (!this.isBroadcast(this._currentNavIndex === 0 ? this.myChannelList[index] : this.topNavList[index]) &&
           if (!this.isBroadcast(this._currentNavIndex === 0 ? this.myChannelList[index] : this.topNavList[index]) &&
             !this.isLayout(this._currentNavIndex === 0 ? this.myChannelList[index] : this.topNavList[index])
             !this.isLayout(this._currentNavIndex === 0 ? this.myChannelList[index] : this.topNavList[index])
           ) {
           ) {
+            //在 tab 切换之前意图共享
+            // this.topNavInsightIntentShare(this.currentTopNavItem)
+
             this.currentTopNavSelectedIndex = index;
             this.currentTopNavSelectedIndex = index;
+            this.currentTopNavItem = this.myChannelList[index]
           }
           }
           if (this.isBroadcast(this._currentNavIndex === 0 ? this.myChannelList[index] : this.topNavList[index])) {
           if (this.isBroadcast(this._currentNavIndex === 0 ? this.myChannelList[index] : this.topNavList[index])) {
             // 跳转到播报页面
             // 跳转到播报页面
@@ -416,9 +469,11 @@ export struct TopNavigationComponent {
         this.changeByClick = true
         this.changeByClick = true
         this.tabsController.changeIndex(index)
         this.tabsController.changeIndex(index)
       }
       }
+
     })
     })
   }
   }
 
 
+
   aboutToAppear() {
   aboutToAppear() {
     //处理新闻tab顶导频道数据
     //处理新闻tab顶导频道数据
     this.topNavListHandle()
     this.topNavListHandle()

@@ -70,6 +70,7 @@ export struct DetailPlayLiveCommon {
           this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
           this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
           this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
           this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
           this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
           this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
+          this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment)
           this.publishCommentModel.commentContent = ''
           this.publishCommentModel.commentContent = ''
           // }
           // }
         }
         }

@@ -2,7 +2,10 @@ import HuaweiAuth from './utils/HuaweiAuth'
 import { JumpInterceptorAction, RouterJumpInterceptor, WDRouterPage } from 'wdRouter'
 import { JumpInterceptorAction, RouterJumpInterceptor, WDRouterPage } from 'wdRouter'
 import { BusinessError } from '@kit.BasicServicesKit'
 import { BusinessError } from '@kit.BasicServicesKit'
 import { router } from '@kit.ArkUI'
 import { router } from '@kit.ArkUI'
-import { AccountManagerUtils } from 'wdKit/Index'
+import { AccountManagerUtils, SPHelper } from 'wdKit/Index'
+import { LoginViewModel } from './pages/login/LoginViewModel'
+import { SpConstants } from 'wdConstant/Index'
+import { ReportDeviceInfo } from './reportDeviceInfo/ReportDeviceInfo'
 
 
 class LoginJumpHandler implements JumpInterceptorAction {
 class LoginJumpHandler implements JumpInterceptorAction {
   
   
@@ -37,4 +40,14 @@ export class LoginModule {
     }
     }
 
 
   }
   }
+
+  // 启动进入主页 和 每次登录成功调用
+  static reportDeviceInfo() {
+    ReportDeviceInfo.reportDeviceInfo().then((res) => {
+      let nickName = res.touristNickName
+      if (res.touristNickName) {
+        SPHelper.default.save(SpConstants.TOURIST_NICK_NAME, res.touristNickName)
+      }
+    })
+  }
 }
 }

@@ -82,6 +82,30 @@ export class LoginModel {
     })
     })
   }
   }
 
 
+  // loginType 0:手机号密码  2：手机号登录 3：QQ 4：微信 5：微博 6：APPLEID 7:手机号一键登录8：账号+密码 9：华为一键登录
+  thirdPartLogin(loginType: number, otherParams: Record<string, string|number>) {
+    otherParams['loginType'] = loginType
+    otherParams['deviceId'] = HttpUtils.getDeviceId()
+
+    return new Promise<LoginBean>((success, fail) => {
+      HttpRequest.post<ResponseDTO<LoginBean>>(HttpUrlUtils.getAppLoginUrl(), otherParams).then((data: ResponseDTO<LoginBean>) => {
+        Logger.debug("LoginViewModel:success2 ", data.message)
+        if (!data) {
+          fail("数据为空")
+          return
+        }
+        if (!data.data||data.code != 0) {
+          fail(data.message)
+          return
+        }
+        success(data.data)
+      }, (error: Error) => {
+        fail(error.message)
+        Logger.debug("LoginViewModel:error2 ", error.toString())
+      })
+    })
+  }
+
   // {"password":"523acd319228efde34e8a30268ee8ca5e4fc421d72affa531676e1765940d22c","phone":"13625644528","loginType":0,"oldPassword":"BA5FD74F827AF9B271FE17CADC489C36","deviceId":"60da5af6-9c59-3566-8622-8c6c00710994"}
   // {"password":"523acd319228efde34e8a30268ee8ca5e4fc421d72affa531676e1765940d22c","phone":"13625644528","loginType":0,"oldPassword":"BA5FD74F827AF9B271FE17CADC489C36","deviceId":"60da5af6-9c59-3566-8622-8c6c00710994"}
   appLoginByPassword(phone: string, loginType: number, password: string, oldPassword: string) {
   appLoginByPassword(phone: string, loginType: number, password: string, oldPassword: string) {
     let bean: Record<string, string | number> = {};
     let bean: Record<string, string | number> = {};

@@ -10,6 +10,7 @@ import { encryptMessage } from '../../utils/cryptoUtil'
 import { SpConstants } from 'wdConstant/Index'
 import { SpConstants } from 'wdConstant/Index'
 import { UserDetail } from 'wdBean/Index';
 import { UserDetail } from 'wdBean/Index';
 import { HttpUtils } from 'wdNetwork/Index'
 import { HttpUtils } from 'wdNetwork/Index'
+import { LoginModule } from '../../LoginModule'
 
 
 const TAG = "LoginViewModel"
 const TAG = "LoginViewModel"
 
 
@@ -47,6 +48,27 @@ export class LoginViewModel {
 
 
     return new Promise<LoginBean>((success, fail) => {
     return new Promise<LoginBean>((success, fail) => {
       this.loginModel.appLogin(phone, loginType, verificationCode).then((data: LoginBean) => {
       this.loginModel.appLogin(phone, loginType, verificationCode).then((data: LoginBean) => {
+        this.dealWithLoginSuccess(data)
+        success(data)
+      }).catch((error:string) => {
+        fail(error)
+      })
+    })
+  }
+
+  huaweiOneKeyLogin(authCode: string) {
+    return new Promise<LoginBean>((success, fail) => {
+      this.loginModel.thirdPartLogin(9, {"idToken": authCode}).then((data: LoginBean) => {
+        this.dealWithLoginSuccess(data)
+        success(data)
+      }).catch((error:string) => {
+        fail(error)
+      })
+    })
+  }
+
+  //TODO: 这里要整体改掉
+  dealWithLoginSuccess(data: LoginBean) {
     SPHelper.default.saveSync(SpConstants.USER_FIRST_MARK, data.firstMark)
     SPHelper.default.saveSync(SpConstants.USER_FIRST_MARK, data.firstMark)
     SPHelper.default.saveSync(SpConstants.USER_ID, data.id)
     SPHelper.default.saveSync(SpConstants.USER_ID, data.id)
     SPHelper.default.saveSync(SpConstants.USER_JWT_TOKEN, data.jwtToken)
     SPHelper.default.saveSync(SpConstants.USER_JWT_TOKEN, data.jwtToken)
@@ -56,11 +78,8 @@ export class LoginViewModel {
     SPHelper.default.saveSync(SpConstants.USER_Type, data.userType)
     SPHelper.default.saveSync(SpConstants.USER_Type, data.userType)
     SPHelper.default.saveSync(SpConstants.USER_NAME, data.userName)
     SPHelper.default.saveSync(SpConstants.USER_NAME, data.userName)
     EmitterUtils.sendEmptyEvent(EmitterEventId.LOGIN_SUCCESS)
     EmitterUtils.sendEmptyEvent(EmitterEventId.LOGIN_SUCCESS)
-        success(data)
-      }).catch((error:string) => {
-        fail(error)
-      })
-    })
+
+    LoginModule.reportDeviceInfo()
   }
   }
 
 
   async appLoginByPassword(phone: string, loginType: number, password: string, oldPassword: string) {
   async appLoginByPassword(phone: string, loginType: number, password: string, oldPassword: string) {
@@ -75,15 +94,7 @@ export class LoginViewModel {
       let passwordNew = await this.doMd(password)
       let passwordNew = await this.doMd(password)
       Logger.debug(TAG, "PASSWORD:" + passwordNew)
       Logger.debug(TAG, "PASSWORD:" + passwordNew)
       this.loginModel.appLoginByPassword(phone, newLoginType, passwordNew, oldPassword).then((data: LoginBean) => {
       this.loginModel.appLoginByPassword(phone, newLoginType, passwordNew, oldPassword).then((data: LoginBean) => {
-        SPHelper.default.saveSync(SpConstants.USER_FIRST_MARK, data.firstMark)
-        SPHelper.default.saveSync(SpConstants.USER_ID, data.id)
-        SPHelper.default.saveSync(SpConstants.USER_JWT_TOKEN, data.jwtToken)
-        SPHelper.default.saveSync(SpConstants.USER_LONG_TIME_NO_LOGIN_MARK, data.longTimeNoLoginMark)
-        SPHelper.default.saveSync(SpConstants.USER_REFRESH_TOKEN, data.refreshToken)
-        SPHelper.default.saveSync(SpConstants.USER_STATUS, data.status)
-        SPHelper.default.saveSync(SpConstants.USER_Type, data.userType)
-        SPHelper.default.saveSync(SpConstants.USER_NAME, data.userName)
-        EmitterUtils.sendEmptyEvent(EmitterEventId.LOGIN_SUCCESS)
+       this.dealWithLoginSuccess(data)
         success(data)
         success(data)
       }).catch((value: string) => {
       }).catch((value: string) => {
         fail(value)
         fail(value)

@@ -3,13 +3,30 @@ import { Params } from 'wdBean/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import HuaweiAuth from '../../utils/HuaweiAuth'
 import HuaweiAuth from '../../utils/HuaweiAuth'
 import { BusinessError } from '@kit.BasicServicesKit'
 import { BusinessError } from '@kit.BasicServicesKit'
-import { ToastUtils } from 'wdKit/Index'
+import { Logger, ToastUtils, CustomToast, EmitterUtils, EmitterEventId } from 'wdKit/Index'
+import { LoginViewModel } from './LoginViewModel'
+import {InterestsHobbiesModel} from '../../../../../../../products/phone/src/main/ets/pages/viewModel/InterestsHobbiesModel'
+
+const TAG = "OneKeyLoginPage"
 
 
 @Entry
 @Entry
 @Component
 @Component
 struct OneKeyLoginPage {
 struct OneKeyLoginPage {
   anonymousPhone: string = ''
   anonymousPhone: string = ''
   @State agreeProtocol: boolean = false
   @State agreeProtocol: boolean = false
+  viewModel: LoginViewModel = new LoginViewModel()
+  @State toastText:string = ""
+  dialogToast: CustomDialogController = new CustomDialogController({
+    builder: CustomToast({
+      msg: this.toastText,
+    }),
+    autoCancel: false,
+    alignment: DialogAlignment.Center,
+    offset: { dx: 0, dy: -20 },
+    gridCount: 1,
+    customStyle: true,
+    maskColor:"#00000000"
+  })
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
     this.anonymousPhone = HuaweiAuth.sharedInstance().anonymousPhone||""
     this.anonymousPhone = HuaweiAuth.sharedInstance().anonymousPhone||""
@@ -44,17 +61,7 @@ struct OneKeyLoginPage {
             if (!this.agreeProtocol) {
             if (!this.agreeProtocol) {
               return
               return
             }
             }
-            HuaweiAuth.sharedInstance().oneKeyLogin().then((authorizeCode) => {
-              //TODO: 调用服务端接口登录
-
-              ToastUtils.shortToast("获取到授权code: " + authorizeCode + "，由于需要后台接口支持，暂时先跳转其他登录方式")
-              setTimeout(() => {
-                router.replaceUrl({url: WDRouterPage.loginPage.url()})
-              }, 3000)
-
-            }).catch((error: BusinessError) => {
-
-            })
+            this.requestLogin()
           })
           })
       }
       }
       .padding({ left: 25, right: 25 })
       .padding({ left: 25, right: 25 })
@@ -113,4 +120,47 @@ struct OneKeyLoginPage {
     }.margin({ top: 15, right: 15 })
     }.margin({ top: 15, right: 15 })
     .width("100%")
     .width("100%")
   }
   }
+
+  async requestLogin() {
+    try {
+      let authorizeCode = await HuaweiAuth.sharedInstance().oneKeyLogin()
+
+      let data = await this.viewModel.huaweiOneKeyLogin(authorizeCode)
+
+      Logger.debug(TAG, "requestLogin: " + data.jwtToken)
+      this.showToastTip('登录成功')
+
+      ///同步兴趣tag
+      let interestsModel = new InterestsHobbiesModel()
+      interestsModel.updateInterests()
+      this.queryUserDetail()
+      EmitterUtils.sendEvent(EmitterEventId.PEOPLE_SHIP_ATTENTION)
+
+    } catch (error) {
+      if (typeof error == "string") {
+        this.showToastTip(error)
+      } else {
+        (error as BusinessError)
+        this.showToastTip("登录失败")
+      }
+    }
+  }
+
+  showToastTip(msg:string){
+    this.toastText = msg
+    this.dialogToast.open()
+  }
+
+  queryUserDetail(){
+    this.viewModel.queryUserDetail().then(()=>{
+      router.back({
+        url: `${WDRouterPage.getBundleInfo()}`
+      }
+      )
+    }).catch(()=>{
+      router.back({
+        url: `${WDRouterPage.getBundleInfo()}`
+      })
+    })
+  }
 }
 }

+import { AppUtils, DeviceUtil, Logger, UserDataLocal } from 'wdKit/Index';
+import { HttpBizUtil, HttpUrlUtils, ResponseDTO } from 'wdNetwork/Index';
+
+export class ReportDeviceInfo {
+  static reportDeviceInfo() {
+    const userId = UserDataLocal.getUserId() || ""
+    const url = HttpUrlUtils.reportDeviceInfo()
+
+    let bean: Record<string, string | number> = {};
+    bean['deviceId'] = DeviceUtil.clientId()
+    bean['appVersion'] = AppUtils.getAppVersionCode()
+    bean['platform'] = 3    /// 1Android 2iOS
+    bean['userId'] = userId
+    bean['brand'] = DeviceUtil.getMarketName()
+    bean['modelSystemVersion'] = DeviceUtil.getDisplayVersion()
+    bean['tenancy'] = 3 ///1-视界 2-英文版 3-中文版
+
+    return new Promise<ReportDeviceInfoRes>((success, fail) => {
+      HttpBizUtil.post<ResponseDTO<ReportDeviceInfoRes>>(url,bean).then((data: ResponseDTO<ReportDeviceInfoRes>) => {
+        if (!data) {
+          fail("数据为空")
+          return
+        }
+        if (data.code != 0) {
+          fail(data.message)
+          return
+        }
+        success(data.data!)
+      }, (error: Error) => {
+        fail(error.message)
+        Logger.debug("ReportDeviceInfo", error.toString())
+      })
+    })
+
+  }
+}
+
+export class ReportDeviceInfoRes {
+  clean : number = 0
+  touristNickName : string = ""
+}

@@ -16,12 +16,15 @@ struct ImageAndTextDetailPage {
     }
     }
   }
   }
 
 
-  pageTransition(){
-    // 定义页面进入时的效果，从右边侧滑入
-    PageTransitionEnter({ type: RouteType.None, duration: 300 })
+  pageTransition() {
+    // 为目标页面时，进入：从右边侧滑入，退出：是右侧划出；跳转别的页面：左侧划出，返回：左侧划入。
+    PageTransitionEnter({ type: RouteType.Push, duration: 300 })
       .slide(SlideEffect.Right)
       .slide(SlideEffect.Right)
-    // 定义页面退出时的效果，向右边侧滑出
-    PageTransitionExit({ type: RouteType.None, duration: 300 })
+    PageTransitionEnter({ type: RouteType.Pop, duration: 300 })
+      .slide(SlideEffect.Left)
+    PageTransitionExit({ type: RouteType.Push, duration: 300 })
+      .slide(SlideEffect.Left)
+    PageTransitionExit({ type: RouteType.Pop, duration: 300 })
       .slide(SlideEffect.Right)
       .slide(SlideEffect.Right)
   }
   }
 
 

@@ -8,6 +8,7 @@ import router from '@ohos.router';
 import { promptAction } from '@kit.ArkUI';
 import { promptAction } from '@kit.ArkUI';
 import { UpgradeTipDialog } from "./upgradePage/UpgradeTipDialog"
 import { UpgradeTipDialog } from "./upgradePage/UpgradeTipDialog"
 import { ProcessUtils } from 'wdRouter/Index';
 import { ProcessUtils } from 'wdRouter/Index';
+import { StartupManager } from '../startupmanager/StartupManager';
 
 
 const TAG = 'MainPage';
 const TAG = 'MainPage';
 
 
@@ -27,6 +28,8 @@ struct MainPage {
 
 
   aboutToAppear() {
   aboutToAppear() {
 
 
+    StartupManager.sharedInstance().appReachMainPage()
+
     this.breakpointSystem.register()
     this.breakpointSystem.register()
 
 
     let context = getContext(this) as common.UIAbilityContext
     let context = getContext(this) as common.UIAbilityContext

@@ -18,11 +18,14 @@ struct SpacialTopicPage {
   }
   }
 
 
   pageTransition() {
   pageTransition() {
-    // 定义页面进入时的效果，从右边侧滑入
-    PageTransitionEnter({ type: RouteType.None, duration: 300 })
+    // 为目标页面时，进入：从右边侧滑入，退出：是右侧划出；跳转别的页面：左侧划出，返回：左侧划入。
+    PageTransitionEnter({ type: RouteType.Push, duration: 300 })
       .slide(SlideEffect.Right)
       .slide(SlideEffect.Right)
-    // 定义页面退出时的效果，向右边侧滑出
-    PageTransitionExit({ type: RouteType.None, duration: 300 })
+    PageTransitionEnter({ type: RouteType.Pop, duration: 300 })
+      .slide(SlideEffect.Left)
+    PageTransitionExit({ type: RouteType.Push, duration: 300 })
+      .slide(SlideEffect.Left)
+    PageTransitionExit({ type: RouteType.Pop, duration: 300 })
       .slide(SlideEffect.Right)
       .slide(SlideEffect.Right)
   }
   }
 
 

@@ -90,6 +90,9 @@ export class StartupManager {
   appReachMainPage() : Promise<void> {
   appReachMainPage() : Promise<void> {
     return new Promise((resolve) => {
     return new Promise((resolve) => {
       Logger.debug(TAG, "App 进入首页，开始其他任务初始化")
       Logger.debug(TAG, "App 进入首页，开始其他任务初始化")
+
+      LoginModule.reportDeviceInfo()
+
       //TODO:
       //TODO:
 
 
       resolve()
       resolve()

+import { insightIntent, InsightIntentExecutor } from '@kit.AbilityKit';
+import { window } from '@kit.ArkUI';
+import { BusinessError } from '@kit.BasicServicesKit';
+
+/**
+ * 意图调用
+ */
+export default class InsightIntentExecutorImpl extends InsightIntentExecutor {
+  private static readonly ViewColumn = 'ViewColumn';
+  /**
+   * override 执行前台UIAbility意图
+   *
+   * @param name 意图名称
+   * @param param 意图参数
+   * @param pageLoader 窗口
+   * @returns 意图调用结果
+   */
+  onExecuteInUIAbilityForegroundMode(name: string, param: Record<string, Object>, pageLoader: window.WindowStage):
+    Promise<insightIntent.ExecuteResult> {
+    // 根据意图名称分发处理逻辑
+    switch (name) {
+      case InsightIntentExecutorImpl.ViewColumn:
+        return this.jumpToView(param, pageLoader);
+      default:
+        break;
+    }
+    return Promise.resolve({
+      code: -1,
+      result: {
+        message: 'unknown intent'
+      }
+    } as insightIntent.ExecuteResult)
+  }
+  /**
+   * 实现跳转新闻页面功能
+   *
+   * @param param 意图参数
+   * @param pageLoader 窗口
+   */
+  private jumpToView(param: Record<string, Object>, pageLoader: window.WindowStage): Promise<insightIntent.ExecuteResult> {
+    return new Promise((resolve, reject) => {
+      // TODO 实现意图调用，loadContent的入参为歌曲落地页路径，例如：pages/SongPage
+      pageLoader.loadContent('pages/MainPage')
+        .then(() => {
+          let entityId: string = (param.items as Array<object>)?.[0]?.['entityId'];
+          // TODO 调用成功的情况，此处可以打印日志
+          resolve({
+            code: 0,
+            result: {
+              message: 'Intent execute success'
+            }
+          });
+        })
+        .catch((err: BusinessError) => {
+          // TODO 调用失败的情况
+          resolve({
+            code: -1,
+            result: {
+              message: 'Intent execute failed'
+            }
+          })
+        });
+    })
+  }
+}

+{
+  "insightIntents": [
+    {
+      "intentName": "ViewColumn",
+      "domain": "",
+      "intentVersion": "1.0.1",
+      "srcEntry": "./ets/utils/InsightIntentExecutorImpl.ets",
+      "uiAbility": {
+        "ability": "EntryAbility",
+        "executeMode": [
+          "background",
+          "foreground"
+        ]
+      }
+    }
+  ]
+}