Merge remote-tracking branch 'origin/main'

@@ -67,15 +67,15 @@ export const enum CompStyle {
 
 
 
 
 
 
-  Card_Adv_4 = 4, //4：轮播图     5：三图广告    6：小图广告    7：长通栏广告   8：大图广告    9：视频广告    10：展会广告    11：冠名广告    12：顶部长通栏广告
-  Card_Adv_5 = 5,
-  Card_Adv_6 = 5,
-  Card_Adv_7 = 7,
-  Card_Adv_8 = 8,
-  Card_Adv_9 = 9,
-  Card_Adv_10 = 10,
-  Card_Adv_11 = 11,
-  Card_Adv_12 = 12,
+  Card_Adv_4 = 4, //4：轮播图
+  Card_Adv_5 = 5, //  5：三图广告
+  Card_Adv_6 = 6, // 6：小图广告
+  Card_Adv_7 = 7, // 7：长通栏广告
+  Card_Adv_8 = 8, // 8：大图广告
+  Card_Adv_9 = 9, //   9：视频广告
+  Card_Adv_10 = 10, // 10：展会广告
+  Card_Adv_11 = 11, // 11：冠名广告
+  Card_Adv_12 = 12, //  12：顶部长通栏广告
 
 
   /**
   /**
    *  本地稿件和组件样式
    *  本地稿件和组件样式

@@ -11,6 +11,13 @@ export enum EmitterEventId {
   // 跳转首页指定频道，事件id
   // 跳转首页指定频道，事件id
   JUMP_HOME_CHANNEL = 4,
   JUMP_HOME_CHANNEL = 4,
 
 
-  LOCATION = 5
+  LOCATION = 5,
+
+  // App回到前台
+  APP_ENTER_FOREGROUD = 100,
+  // App进入后台
+  APP_ENTER_BACKGROUD = 101,
+
+
 }
 }
 
 

@@ -5,3 +5,5 @@ export { WDRouterPage } from './src/main/ets/router/WDRouterPage'
 export { registerRouter } from './src/main/ets/router/Action2Page'
 export { registerRouter } from './src/main/ets/router/Action2Page'
 
 
 export { ProcessUtils } from './src/main/ets/utils/ProcessUtils'
 export { ProcessUtils } from './src/main/ets/utils/ProcessUtils'
+
+export { RouterJumpInterceptor, JumpInterceptorAction } from './src/main/ets/router/RouterJumpInterceptor'

+import { WDRouterPage } from './WDRouterPage';
+
+export interface JumpInterceptorAction {
+  on(params?: object, singleMode?: boolean): boolean
+}
+
+// TODO：待优化
+// 临时解决跳转页面之前方法拦截，比如登录先走一键登录，直播请求接口等
+//
+export class RouterJumpInterceptor {
+
+  private static actions: Record<string, JumpInterceptorAction> = {}
+
+  static getInterceptorAction(jumpPage: WDRouterPage): JumpInterceptorAction | undefined {
+    return RouterJumpInterceptor.actions[jumpPage.url()]
+  }
+
+  static register(jumpPage: WDRouterPage, interceptorAction: JumpInterceptorAction) {
+    RouterJumpInterceptor.actions[jumpPage.url()] = interceptorAction
+  }
+
+
+}

@@ -66,6 +66,7 @@ export class WDRouterPage {
   // 动态详情页
   // 动态详情页
   static dynamicDetailPage = new WDRouterPage("phone", "ets/pages/detail/DynamicDetailPage");
   static dynamicDetailPage = new WDRouterPage("phone", "ets/pages/detail/DynamicDetailPage");
   static loginPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginPage");
   static loginPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginPage");
+  static oneKeyLoginPage = new WDRouterPage("wdLogin", "ets/pages/login/OneKeyLoginPage");
   static forgetPasswordPage = new WDRouterPage("wdLogin", "ets/pages/login/ForgetPasswordPage");
   static forgetPasswordPage = new WDRouterPage("wdLogin", "ets/pages/login/ForgetPasswordPage");
   //我的  预约
   //我的  预约
   static appointmentListPage = new WDRouterPage("wdComponent", "ets/components/page/AppointmentListPage");
   static appointmentListPage = new WDRouterPage("wdComponent", "ets/components/page/AppointmentListPage");

@@ -3,6 +3,7 @@ import { Action } from 'wdBean'
 import { ToastUtils } from 'wdKit'
 import { ToastUtils } from 'wdKit'
 import { Action2Page } from './Action2Page'
 import { Action2Page } from './Action2Page'
 import { WDRouterPage } from './WDRouterPage'
 import { WDRouterPage } from './WDRouterPage'
+import { RouterJumpInterceptor } from './RouterJumpInterceptor'
 
 
 export class WDRouterRule {
 export class WDRouterRule {
   static jumpWithAction(action?: Action) {
   static jumpWithAction(action?: Action) {
@@ -16,6 +17,11 @@ export class WDRouterRule {
 
 
   static jumpWithPage(page?: WDRouterPage, params?: object, singleMode?: boolean) {
   static jumpWithPage(page?: WDRouterPage, params?: object, singleMode?: boolean) {
     if (page) {
     if (page) {
+      let action = RouterJumpInterceptor.getInterceptorAction(page)
+      if (action && action.on(params, singleMode)) {
+        return
+      }
+
       let mode = router.RouterMode.Standard
       let mode = router.RouterMode.Standard
       if (singleMode) {
       if (singleMode) {
         mode = router.RouterMode.Single
         mode = router.RouterMode.Single
@@ -36,6 +42,10 @@ export class WDRouterRule {
 
 
   static jumpWithReplacePage(page?: WDRouterPage, params?: object) {
   static jumpWithReplacePage(page?: WDRouterPage, params?: object) {
     if (page) {
     if (page) {
+      let action = RouterJumpInterceptor.getInterceptorAction(page)
+      if (action && action.on(params)) {
+        return
+      }
       if (params) {
       if (params) {
         // router.pushUrl({   url: 'pages/routerpage2', , params: params })
         // router.pushUrl({   url: 'pages/routerpage2', , params: params })
         router.replaceUrl({ url: page.url(), params: params })
         router.replaceUrl({ url: page.url(), params: params })

@@ -17,7 +17,7 @@ const TAG = 'ProcessUtils';
  */
  */
 export class ProcessUtils {
 export class ProcessUtils {
   /**
   /**
-   *  广告中心的业务广告跳转方法（ 现用在挂角广告）
+   *  广告中心的业务广告跳转方法（ 现用在挂角广告、信息流页面广告）
    * @param advContent
    * @param advContent
    */
    */
   static openAdvDetail(matInfo: CompAdvMatInfoBean) {
   static openAdvDetail(matInfo: CompAdvMatInfoBean) {
@@ -157,7 +157,7 @@ export class ProcessUtils {
    * 图集详情页
    * 图集详情页
    * @param content
    * @param content
    * */
    * */
-  public static gotoMultiPictureListPage(photoList: PhotoListBean[], swiperIndex?:number) {
+  public static gotoMultiPictureListPage(photoList: PhotoListBean[], swiperIndex?: number) {
     let taskAction: Action = {
     let taskAction: Action = {
       type: 'JUMP_DETAIL_PAGE',
       type: 'JUMP_DETAIL_PAGE',
       params: {
       params: {
@@ -187,8 +187,14 @@ export class ProcessUtils {
     let taskAction: Action = {
     let taskAction: Action = {
       type: 'JUMP_INNER_NEW_PAGE',
       type: 'JUMP_INNER_NEW_PAGE',
       params: {
       params: {
+        contentID: content?.objectId,
         url: content.linkUrl,
         url: content.linkUrl,
         pageID: 'SPACIAL_TOPIC_PAGE',
         pageID: 'SPACIAL_TOPIC_PAGE',
+        extra: {
+          relType: content?.relType,
+          relId: content?.relId,
+          channelId: content?.channelId,
+        } as ExtraDTO
       } as Params,
       } as Params,
     };
     };
     WDRouterRule.jumpWithAction(taskAction)
     WDRouterRule.jumpWithAction(taskAction)
@@ -423,11 +429,10 @@ export class ProcessUtils {
 
 
   /**
   /**
    * 跳转人民号主页
    * 跳转人民号主页
-   *@params creatorId 创作者id
+   * @params creatorId 创作者id
    */
    */
   public static gotoPeopleShipHomePage(creatorId: string) {
   public static gotoPeopleShipHomePage(creatorId: string) {
-    let params = {'creatorId': creatorId} as Record<string, string>;
+    let params = { 'creatorId': creatorId } as Record<string, string>;
     WDRouterRule.jumpWithPage(WDRouterPage.peopleShipHomePage, params)
     WDRouterRule.jumpWithPage(WDRouterPage.peopleShipHomePage, params)
   }
   }
-
 }
 }

-import HashMap from '@ohos.util.HashMap';
 import { Callback } from 'wdJsBridge';
 import { Callback } from 'wdJsBridge';
 import { Message, IImgListData } from 'wdJsBridge/src/main/ets/bean/Message';
 import { Message, IImgListData } from 'wdJsBridge/src/main/ets/bean/Message';
-import { Logger } from 'wdKit';
+import { Logger, SPHelper } from 'wdKit';
 import { H5CallNativeType } from './H5CallNativeType';
 import { H5CallNativeType } from './H5CallNativeType';
 import { H5OperateType } from './H5OperateType';
 import { H5OperateType } from './H5OperateType';
-import { ContentConstants } from 'wdConstant';
+import { ContentConstants, SpConstants } from 'wdConstant';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import router from '@ohos.router';
 import router from '@ohos.router';
 import Url from '@ohos.url'
 import Url from '@ohos.url'
 import { ContentDTO, PhotoListBean } from 'wdBean';
 import { ContentDTO, PhotoListBean } from 'wdBean';
-import { ResponseDTO, WDHttp, HttpUrlUtils } from 'wdNetwork';
+import { handleJsCallAppService } from './JsCallAppService'
 
 
 const TAG = 'JsBridgeBiz'
 const TAG = 'JsBridgeBiz'
 
 
@@ -20,6 +19,19 @@ class AppInfo {
   // TODO 完善
   // TODO 完善
 }
 }
 
 
+class AppLoginAuthInfo {
+  "X-Ca-Stage": string = ''
+  userType: number = SPHelper.default.getSync(SpConstants.USER_Type, '') as number
+  userName: string = SPHelper.default.getSync(SpConstants.USER_NAME, '') as string
+  userID: string = SPHelper.default.getSync(SpConstants.USER_ID, '') as string
+  "RMRB-X-TOKEN": string = SPHelper.default.getSync(SpConstants.USER_TEMP_TOKEN, '') as string
+  phoneNumber: string = SPHelper.default.getSync(SpConstants.USER_PHONE, '') as string
+  nickName: string = ''
+  isLogined: string = SPHelper.default.getSync(SpConstants.USER_STATUS, '') as string
+  creatorID: string = SPHelper.default.getSync(SpConstants.USER_CREATOR_ID, '') as string
+  Authorization: string = ''
+}
+
 /**
 /**
  * h5调用native代码
  * h5调用native代码
  * @param data
  * @param data
@@ -39,7 +51,7 @@ export function performJSCallNative(data: Message, call: Callback) {
     case H5CallNativeType.jsCall_getArticleDetailBussinessData:
     case H5CallNativeType.jsCall_getArticleDetailBussinessData:
       break;
       break;
     case H5CallNativeType.jsCall_callAppService:
     case H5CallNativeType.jsCall_callAppService:
-      handleJsCallCallAppService(data, (res: string) => {
+      handleJsCallAppService(data, (res: string) => {
         call(res)
         call(res)
       })
       })
       break;
       break;
@@ -49,6 +61,9 @@ export function performJSCallNative(data: Message, call: Callback) {
     case H5CallNativeType.jsCall_appInnerLinkMethod:
     case H5CallNativeType.jsCall_appInnerLinkMethod:
       handleJsCallAppInnerLinkMethod(data)
       handleJsCallAppInnerLinkMethod(data)
       break;
       break;
+    case H5CallNativeType.jsCall_getAppLoginAuthInfo:
+      call(handleJsCallGetAppLoginAuthInfo())
+      break;
     default:
     default:
       break;
       break;
   }
   }
@@ -64,21 +79,6 @@ function handleJsCallCurrentPageOperate(data: Message) {
   }
   }
 }
 }
 
 
-function handleJsCallCallAppService(data: Message, callback: (res: string) => void) {
-  let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-  let url: string = HttpUrlUtils.getHost() + data?.data?.url
-  if (data?.data?.method === 'get') {
-    WDHttp.get<ResponseDTO<string>>(url, headers).then((res: ResponseDTO<string>) => {
-      callback(JSON.stringify(res))
-    })
-  }
-  if (data?.data?.method === 'post') {
-    WDHttp.post<ResponseDTO<string>>(url, data?.data?.parameters, headers).then(res => {
-      callback(JSON.stringify(res))
-    })
-  }
-}
-
 /**
 /**
  * 获取App公共信息
  * 获取App公共信息
  */
  */
@@ -90,12 +90,11 @@ function getAppPublicInfo(): string {
   info.networkStatus = 1
   info.networkStatus = 1
   let result = JSON.stringify(info)
   let result = JSON.stringify(info)
   Logger.debug(TAG, 'getAppPublicInfo: ' + JSON.stringify(info))
   Logger.debug(TAG, 'getAppPublicInfo: ' + JSON.stringify(info))
-
   return result;
   return result;
 }
 }
 
 
 function handleJsCallReceiveH5Data(data: Message) {
 function handleJsCallReceiveH5Data(data: Message) {
-  switch (data?.data?.dataSource) {
+  switch (String(data?.data?.dataSource)) {
     case '3':
     case '3':
       let imgListData: IImgListData = JSON.parse(data?.data?.imgListData || "{}")
       let imgListData: IImgListData = JSON.parse(data?.data?.imgListData || "{}")
       let imgArr = imgListData?.imgArr || []
       let imgArr = imgListData?.imgArr || []
@@ -110,7 +109,7 @@ function handleJsCallReceiveH5Data(data: Message) {
           }
           }
           return photo
           return photo
         })
         })
-        ProcessUtils.gotoMultiPictureListPage(photoList,swiperIndex)
+        ProcessUtils.gotoMultiPictureListPage(photoList, swiperIndex)
       }
       }
       break;
       break;
     case '5':
     case '5':
@@ -183,3 +182,9 @@ function handleJsCallAppInnerLinkMethod(data: Message) {
     }
     }
   }
   }
 }
 }
+
+function handleJsCallGetAppLoginAuthInfo() {
+  let appLoginAuthInfo = new AppLoginAuthInfo()
+  let result = JSON.stringify(appLoginAuthInfo)
+  return result;
+}

+import HashMap from '@ohos.util.HashMap';
+import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
+import { H5ReceiveDataJsonBean, postBatchAttentionStatusResult } from 'wdBean';
+import { ResponseDTO, WDHttp, HttpUrlUtils } from 'wdNetwork';
+
+const TAG = 'JsCallAppService'
+
+
+export function handleJsCallAppService(data: Message, callback: (res: string) => void) {
+  let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
+  let url: string = HttpUrlUtils.getHost() + data?.data?.url
+
+  let responseMap: ResponseDTO<postBatchAttentionStatusResult> = {} as ResponseDTO<postBatchAttentionStatusResult>
+
+  let h5ReceiveDataJson: H5ReceiveDataJsonBean<ResponseDTO<postBatchAttentionStatusResult>> = {
+    netError: '0',
+    responseMap
+  } as H5ReceiveDataJsonBean<ResponseDTO<postBatchAttentionStatusResult>>
+
+  // if (data?.data?.method === 'get') {
+  //   WDHttp.get<ResponseDTO<postBatchAttentionStatusResult>>(url, headers).then((res: ResponseDTO<postBatchAttentionStatusResult>) => {
+  //     callback(JSON.stringify(res))
+  //   })
+  // }
+  if (data?.data?.method === 'post' && data?.data?.url === '/api/rmrb-interact/interact/zh/c/batchAttention/status') {
+    WDHttp.post<ResponseDTO<postBatchAttentionStatusResult>>(url, data?.data?.parameters, headers).then((res: ResponseDTO<postBatchAttentionStatusResult>) => {
+      h5ReceiveDataJson.responseMap = res
+      callback(JSON.stringify(h5ReceiveDataJson))
+    })
+  }
+}

 export interface H5ReceiveDataExtraBean {
 export interface H5ReceiveDataExtraBean {
   creatorId: string;
   creatorId: string;
+  cnsTraceId: string;
   isLogin: string;
   isLogin: string;
+  loadImageOnlyWifiSwitch: string;
   networkStatus: number;
   networkStatus: number;
-  loadImageOnlyWifiSwitch: string
+  darkMode: string;
+  fontSizes: string;
 }
 }

 import { ResponseBean } from './ResponseBean';
 import { ResponseBean } from './ResponseBean';
 
 
-export interface H5ReceiveDataJsonBean {
-  contentId: string;
-  contentType: string;
-  topicId: string;
-  channelId: string;
-  compId: string;
-  sourcePage: string;
+export interface H5ReceiveDataJsonBean<T = ResponseBean> {
+  contentId?: string;
+  contentType?: string;
+  topicId?: string;
+  channelId?: string;
+  compId?: string;
+  sourcePage?: string;
   netError: string;
   netError: string;
-  responseMap: ResponseBean;
+  responseMap: T;
 
 
 }
 }

 import { ContentDetailDTO } from '../detail/ContentDetailDTO';
 import { ContentDetailDTO } from '../detail/ContentDetailDTO';
 
 
-export interface ResponseBean{
-  success:boolean;
+export interface ResponseBean<T = ContentDetailDTO[]> {
+  success: boolean;
 
 
   // 服务请求响应值/微服务响应状态码”
   // 服务请求响应值/微服务响应状态码”
   code: number;
   code: number;
@@ -10,8 +10,7 @@ export interface ResponseBean{
   message: string;
   message: string;
 
 
   // 响应结果
   // 响应结果
-  data:ContentDetailDTO[];
-
+  data: T
   // 请求响应时间戳（unix格式）
   // 请求响应时间戳（unix格式）
   timestamp?: number;
   timestamp?: number;
 }
 }

@@ -24,7 +24,6 @@ import { ZhGridLayout02 } from './compview/ZhGridLayout02';
 import { Card2Component } from './cardview/Card2Component';
 import { Card2Component } from './cardview/Card2Component';
 import { Card5Component } from './cardview/Card5Component';
 import { Card5Component } from './cardview/Card5Component';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
-import { CardAdvComponent } from './cardViewAdv/CardAdvComponent';
 import { AdvCardParser } from './cardViewAdv/AdvCardParser';
 import { AdvCardParser } from './cardViewAdv/AdvCardParser';
 
 
 /**
 /**

@@ -13,7 +13,6 @@ import {
 import DetailViewModel from '../viewmodel/DetailViewModel';
 import DetailViewModel from '../viewmodel/DetailViewModel';
 import { ImageAndTextWebComponent } from './ImageAndTextWebComponent';
 import { ImageAndTextWebComponent } from './ImageAndTextWebComponent';
 import { OperRowListView } from './view/OperRowListView';
 import { OperRowListView } from './view/OperRowListView';
-import router from '@ohos.router';
 import { RecommendList } from '../components/view/RecommendList'
 import { RecommendList } from '../components/view/RecommendList'
 import { CommonConstants } from 'wdConstant';
 import { CommonConstants } from 'wdConstant';
 import { HttpUrlUtils } from 'wdNetwork/Index';
 import { HttpUrlUtils } from 'wdNetwork/Index';
@@ -21,10 +20,11 @@ import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
 import { PageRepository } from '../repository/PageRepository';
 import { PageRepository } from '../repository/PageRepository';
 import { detailedSkeleton } from './skeleton/detailSkeleton';
 import { detailedSkeleton } from './skeleton/detailSkeleton';
+import { CommentComponent } from '../components/comment/view/CommentComponent'
 
 
 const PATTERN_DATE_CN_RN: string = 'yyyy年MM月dd日 HH:mm';
 const PATTERN_DATE_CN_RN: string = 'yyyy年MM月dd日 HH:mm';
 
 
-const TAG = 'ImageAndTextPageComponent'
+const TAG: string = 'ImageAndTextPageComponent'
 
 
 @Component
 @Component
 export struct ImageAndTextPageComponent {
 export struct ImageAndTextPageComponent {
@@ -75,9 +75,55 @@ export struct ImageAndTextPageComponent {
               isPageEnd: $isPageEnd
               isPageEnd: $isPageEnd
             })
             })
             Column() {
             Column() {
+              // 点赞
+              if (this.contentDetailData[0]?.openLikes) {
+                Row() {
+                  Row() {
+                    if (this.newsStatusOfUser?.likeStatus === '1') {
+                      Image(this.contentDetailData[0]?.likesStyle === 1 ? $r('app.media.ic_like_check') : (this.contentDetailData[0]?.likesStyle === 2 ? $r('app.media.icon_prayer_active') : $r('app.media.icon_candle_active')))
+                        .width(24)
+                        .height(24)
+                        .margin({ right: 5 })
+                    } else {
+                      Image(this.contentDetailData[0]?.likesStyle === 1 ? $r('app.media.icon_like') : (this.contentDetailData[0]?.likesStyle === 2 ? $r('app.media.icon_prayer') : $r('app.media.icon_candle')))
+                        .width(24)
+                        .height(24)
+                        .margin({ right: 5 })
+                    }
+                    if(this.interactData?.likeNum !== '0'){
+                      Text(`${this.interactData?.likeNum}`)
+                        .fontSize(16)
+                        .fontColor(this.newsStatusOfUser?.likeStatus === '1' ? '#ED2800' : '#999999')
+                        .fontWeight(500)
+                    }
+                  }
+                  .width(140)
+                  .height(36)
+                  .justifyContent(FlexAlign.Center)
+                  .alignItems(VerticalAlign.Center)
+                  .borderRadius(20)
+                  .border({
+                    width: 1,
+                    color: '#EDEDED',
+                  })
+                  .onClick(() => {
+                    this.toggleLikeStatus()
+                  })
+
+                }.width(CommonConstants.FULL_WIDTH).height(80)
+                .justifyContent(FlexAlign.Center)
+
+                Divider().strokeWidth(6).color('#f5f5f5')
+              }
               if (this.recommendList.length > 0) {
               if (this.recommendList.length > 0) {
                 RecommendList({ recommendList: this.recommendList })
                 RecommendList({ recommendList: this.recommendList })
               }
               }
+              // 评论
+              if(this.contentDetailData[0]?.openComment){
+                // CommentComponent({
+                //
+                // })
+              }
             }
             }
           }
           }
 
 
@@ -95,42 +141,6 @@ export struct ImageAndTextPageComponent {
         if (this.contentDetailData?.length) {
         if (this.contentDetailData?.length) {
           OperRowListView({contentDetailData: this.contentDetailData[0]})
           OperRowListView({contentDetailData: this.contentDetailData[0]})
         }
         }
-       /* Row() {
-          Image($r('app.media.icon_arrow_left'))
-            .width(24)
-            .height(24)
-            .onClick((event: ClickEvent) => {
-              router.back()
-            })
-
-          Row() {
-            Image($r('app.media.icon_comment'))
-              .width(24)
-              .height(24)
-              .margin({ right: 24 })
-              .id('comment')
-
-            Image($r('app.media.icon_star'))
-              .width(24)
-              .height(24)
-              .margin({ right: 24 })
-
-            Image($r('app.media.icon_listen'))
-              .width(24)
-              .height(24)
-              .margin({ right: 24 })
-
-            Image($r('app.media.icon_forward'))
-              .width(24)
-              .height(24)
-
-          }
-        }
-        .width(CommonConstants.FULL_WIDTH)
-        .height(56)
-        .padding({ left: 15, right: 15, bottom: 50, top: 20 })
-        .justifyContent(FlexAlign.SpaceBetween)
-        .backgroundColor(Color.White)*/
       }
       }
 
 
     }
     }

@@ -12,6 +12,7 @@ import { WdWebLocalComponent } from 'wdWebComponent';
 import { NativeCallH5Type } from 'wdWebComponent/src/main/ets/pages/NativeCallH5Type';
 import { NativeCallH5Type } from 'wdWebComponent/src/main/ets/pages/NativeCallH5Type';
 import { BridgeWebViewControl } from 'wdJsBridge/Index';
 import { BridgeWebViewControl } from 'wdJsBridge/Index';
 
 
+const TAG: string = 'ImageAndTextWebComponent'
 @Component
 @Component
 export struct ImageAndTextWebComponent {
 export struct ImageAndTextWebComponent {
   action: Action = {} as Action
   action: Action = {} as Action
@@ -60,9 +61,12 @@ export struct ImageAndTextWebComponent {
       // TODO 对接user信息、登录情况
       // TODO 对接user信息、登录情况
       let h5ReceiveDataExtraBean: H5ReceiveDataExtraBean = {
       let h5ReceiveDataExtraBean: H5ReceiveDataExtraBean = {
         creatorId: creatorId,
         creatorId: creatorId,
+        cnsTraceId: '',
         isLogin: isLogin,
         isLogin: isLogin,
-        networkStatus: Number(NetworkUtil.isNetConnected()),
         loadImageOnlyWifiSwitch: '2',
         loadImageOnlyWifiSwitch: '2',
+        networkStatus: Number(NetworkUtil.isNetConnected()),
+        darkMode: 'light',
+        fontSizes: 'normalsize'
 
 
       } as H5ReceiveDataExtraBean
       } as H5ReceiveDataExtraBean
       let h5ReceiveDataJsonBean: H5ReceiveDataJsonBean = {
       let h5ReceiveDataJsonBean: H5ReceiveDataJsonBean = {
@@ -83,7 +87,6 @@ export struct ImageAndTextWebComponent {
       this.h5ReceiveAppData.dataExt = h5ReceiveDataExtraBean
       this.h5ReceiveAppData.dataExt = h5ReceiveDataExtraBean
       this.dataPrepared = true
       this.dataPrepared = true
       this.trySendData2H5()
       this.trySendData2H5()
-
     }
     }
 
 
   }
   }

-import { Action, H5ReceiveDetailBean } from 'wdBean';
+import { Action, H5ReceiveDetailBean, ContentDetailDTO } from 'wdBean';
 import { WdWebComponent } from 'wdWebComponent';
 import { WdWebComponent } from 'wdWebComponent';
 import router from '@ohos.router';
 import router from '@ohos.router';
 import { CommonConstants } from 'wdConstant'
 import { CommonConstants } from 'wdConstant'
 import { BridgeWebViewControl } from 'wdJsBridge/Index';
 import { BridgeWebViewControl } from 'wdJsBridge/Index';
 import { detailedSkeleton } from './skeleton/detailSkeleton'
 import { detailedSkeleton } from './skeleton/detailSkeleton'
 import { NativeCallH5Type } from 'wdWebComponent/src/main/ets/pages/NativeCallH5Type';
 import { NativeCallH5Type } from 'wdWebComponent/src/main/ets/pages/NativeCallH5Type';
-const TAG = 'SpacialTopicPageComponent'
+import { OperRowListView } from './view/OperRowListView';
+import DetailViewModel from '../viewmodel/DetailViewModel';
+
+const TAG: string = 'SpacialTopicPageComponent'
 
 
 @Component
 @Component
 export struct SpacialTopicPageComponent {
 export struct SpacialTopicPageComponent {
@@ -14,6 +17,7 @@ export struct SpacialTopicPageComponent {
   action: Action = {} as Action
   action: Action = {} as Action
   @State webUrl: string = '';
   @State webUrl: string = '';
   @State isPageEnd: boolean = false
   @State isPageEnd: boolean = false
+  @State contentDetailData: ContentDetailDTO [] = [] as ContentDetailDTO []
   private h5ReceiveAppData: H5ReceiveDetailBean = { dataSource: '2' } as H5ReceiveDetailBean
   private h5ReceiveAppData: H5ReceiveDetailBean = { dataSource: '2' } as H5ReceiveDetailBean
   private webPrepared = false;
   private webPrepared = false;
   private dataPrepared = false;
   private dataPrepared = false;
@@ -37,11 +41,33 @@ export struct SpacialTopicPageComponent {
       })
       })
   }
   }
 
 
+  private async getDetail() {
+    let contentId: string = ''
+    let relId: string = ''
+    let relType: string = ''
+    if (this.action && this.action.params) {
+      if (this.action.params.contentID) {
+        contentId = this.action.params.contentID;
+      }
+      if (this.action && this.action.params && this.action.params.extra) {
+        if (this.action.params.extra.relId) {
+          relId = this.action.params.extra.relId;
+        }
+        if (this.action.params.extra.relType) {
+          relType = this.action.params.extra.relType
+        }
+
+      }
+      let detailBeans = await DetailViewModel.getDetailPageData(relId, contentId, relType)
+      if (detailBeans && detailBeans.length > 0) {
+        this.contentDetailData = detailBeans;
+        this.trySendData2H5()
+      }
+    }
+  }
+
   build() {
   build() {
     Column() {
     Column() {
-      if (!this.isPageEnd) {
-        detailedSkeleton()
-      }
       Stack({ alignContent: Alignment.Bottom }) {
       Stack({ alignContent: Alignment.Bottom }) {
         Column() {
         Column() {
           WdWebComponent({
           WdWebComponent({
@@ -52,62 +78,23 @@ export struct SpacialTopicPageComponent {
             isPageEnd: $isPageEnd
             isPageEnd: $isPageEnd
           })
           })
         }
         }
-        .padding({ bottom: 56 })
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
         .height(CommonConstants.FULL_HEIGHT)
         .height(CommonConstants.FULL_HEIGHT)
+        .padding({ bottom: 126 })
 
 
-        //底部交互区
-        Row() {
-          Image($r('app.media.icon_arrow_left'))
-            .width(24)
-            .height(24)
-            .onClick((event: ClickEvent) => {
-              router.back()
-            })
-
-          Row() {
-            Image($r('app.media.icon_comment'))
-              .width(24)
-              .height(24)
-              .margin({ right: 24 })
-              .id('comment')
-
-            Image($r('app.media.icon_star'))
-              .width(24)
-              .height(24)
-              .margin({ right: 24 })
-
-            Image($r('app.media.icon_listen'))
-              .width(24)
-              .height(24)
-              .margin({ right: 24 })
-
-            Image($r('app.media.icon_forward'))
-              .width(24)
-              .height(24)
-
-          }
+        if (!this.isPageEnd) {
+          detailedSkeleton()
         }
         }
-        .width(CommonConstants.FULL_WIDTH)
-        .height(56)
-        .padding({ left: 15, right: 15, bottom: 20, top: 20 })
-        .justifyContent(FlexAlign.SpaceBetween)
-        .backgroundColor(Color.White)
-
+        //底部交互区
+        OperRowListView({ contentDetailData: this.contentDetailData[0] })
       }
       }
     }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
     }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
-    .backgroundColor(Color.White)
   }
   }
 
 
   aboutToAppear() {
   aboutToAppear() {
-    let action: Action = router.getParams() as Action
-    if (action) {
-      this.webUrl = action.params?.url || ''
+    if (this.action) {
+      this.webUrl = this.action.params?.url || ''
     }
     }
-    this.trySendData2H5()
-  }
-
-  aboutToDisappear() {
-
+    this.getDetail()
   }
   }
 }
 }

 import { CompStyle } from 'wdConstant';
 import { CompStyle } from 'wdConstant';
 import { CompDTO } from 'wdBean';
 import { CompDTO } from 'wdBean';
-import { CardAdvComponent } from './CardAdvComponent';
 import { CardAdvThreeImageComponent } from './CardAdvThreeImageComponent';
 import { CardAdvThreeImageComponent } from './CardAdvThreeImageComponent';
 import { CardAdvSmallImageComponent } from './CardAdvSmallImageComponent';
 import { CardAdvSmallImageComponent } from './CardAdvSmallImageComponent';
 import { CardAdvLongImageComponent } from './CardAdvLongImageComponent';
 import { CardAdvLongImageComponent } from './CardAdvLongImageComponent';

@@ -22,12 +22,12 @@ export struct CardAdvBigImageComponent {
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
 
 
-    console.error('ZZZXXXXX', '--------aboutToAppear-----')
+    console.error('ZZZXXXXX', '----大图卡----aboutToAppear-----')
   }
   }
 
 
   aboutToDisappear(): void {
   aboutToDisappear(): void {
 
 
-    console.error('ZZZXXXXX', '--------aboutToDisappear-----')
+    console.error('ZZZXXXXX', '---大图卡-----aboutToDisappear-----')
   }
   }
 
 
   build() {
   build() {

-//全标题 "appStyle":"2",
-import { CompDTO, ContentDTO } from 'wdBean';
-import { CommonConstants } from 'wdConstant/Index';
-import { ProcessUtils } from 'wdRouter';
-import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
-import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
-
-const TAG: string = 'Card2Component';
-
-/** 
- * @Description:    类描述
- * @Author:         
- * @Email:          liyubing@wondertek.com.cn
- * @CreateDate:     
- * @UpdateRemark:   更新说明
- * @Version:        1.0
- */
-@Component
-export struct CardAdvComponent {
-
-  @State compDTO: CompDTO = {} as CompDTO
-
-  aboutToAppear(): void {
-
-    console.error('ZZZXXXXX', '--------aboutToAppear-----')
-  }
-
-  aboutToDisappear(): void {
-
-    console.error('ZZZXXXXX', '--------aboutToDisappear-----')
-  }
-
-  build() {
-
-    Column() {
-      Text(this.compDTO.matInfo.advTitle)
-        .fontSize($r('app.float.font_size_17'))
-        .fontColor($r('app.color.color_222222'))
-        .maxLines(3)
-        .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
-        .align(Alignment.Start)
-    }
-    .width(CommonConstants.FULL_WIDTH)
-    .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
-      top: $r('app.float.card_comp_pagePadding_tb'),
-      bottom: $r('app.float.card_comp_pagePadding_tb')
-    })
-    .onClick((event: ClickEvent) => {
-      //ProcessUtils.processPage(this.contentDTO)
-    })
-  }
-}
-
-@Extend(Text)
-function bottomTextStyle() {
-  .fontSize(12)
-  .fontColor('#B0B0B0')
-}

@@ -22,12 +22,12 @@ export struct CardAdvGanMiComponent {
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
 
 
-    console.error('ZZZXXXXX', '--------aboutToAppear-----')
+    console.error('ZZZXXXXX', '--冠名广告------aboutToAppear-----')
   }
   }
 
 
   aboutToDisappear(): void {
   aboutToDisappear(): void {
 
 
-    console.error('ZZZXXXXX', '--------aboutToDisappear-----')
+    console.error('ZZZXXXXX', '--冠名广告------aboutToDisappear-----')
   }
   }
 
 
   build() {
   build() {

@@ -22,12 +22,12 @@ export struct CardAdvLongImageComponent {
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
 
 
-    console.error('ZZZXXXXX', '--------aboutToAppear-----')
+    console.error('ZZZXXXXX', '--长通栏广告 和 顶部长通栏广告------aboutToAppear-----')
   }
   }
 
 
   aboutToDisappear(): void {
   aboutToDisappear(): void {
 
 
-    console.error('ZZZXXXXX', '--------aboutToDisappear-----')
+    console.error('ZZZXXXXX', '--长通栏广告 和 顶部长通栏广告------aboutToDisappear-----')
   }
   }
 
 
   build() {
   build() {

 //全标题 "appStyle":"2",
 //全标题 "appStyle":"2",
-import { CompDTO, ContentDTO } from 'wdBean';
-import { CommonConstants } from 'wdConstant/Index';
+import { CompDTO } from 'wdBean';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
-import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
-import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 
 
-const TAG: string = 'Card2Component';
+import measure from '@ohos.measure';
+import { DisplayUtils } from 'wdKit/Index';
+
+const TAG: string = 'CardAdvSmallImageComponent';
 
 
 /**
 /**
  * @Description: 广告---小图卡
  * @Description: 广告---小图卡
@@ -17,30 +17,89 @@ const TAG: string = 'Card2Component';
  */
  */
 @Component
 @Component
 export struct CardAdvSmallImageComponent {
 export struct CardAdvSmallImageComponent {
-
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
+  @State isBigThreeLine: boolean = false // 标题的行数大于等于3行 是true
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
 
 
-    console.error('ZZZXXXXX', '--------aboutToAppear-----')
+    console.error('ZZZXXXXX', '----小图卡----aboutToAppear-----')
+    // 计算标题文本行数
+    let screenWith = DisplayUtils.getDeviceWidth();
+    screenWith = screenWith * 0.62
+    let titleNameLineNum = this.getTextLineNum(this.compDTO.matInfo.advTitle, screenWith, 25, 18)
+    this.isBigThreeLine = titleNameLineNum >= 3;
   }
   }
 
 
   aboutToDisappear(): void {
   aboutToDisappear(): void {
 
 
-    console.error('ZZZXXXXX', '--------aboutToDisappear-----')
+    console.error('ZZZXXXXX', '---小图卡-----aboutToDisappear-----')
   }
   }
 
 
   build() {
   build() {
 
 
-    Column() {
+    RelativeContainer() {
+
+      // 广告标题
       Text(this.compDTO.matInfo.advTitle)
       Text(this.compDTO.matInfo.advTitle)
-        .fontSize($r('app.float.font_size_17'))
+        .fontSize('18fp')
         .fontColor($r('app.color.color_222222'))
         .fontColor($r('app.color.color_222222'))
         .maxLines(3)
         .maxLines(3)
+        .lineHeight(25)
         .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
         .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
-        .align(Alignment.Start)
+        .width('62%')
+        .alignRules({
+          top: { anchor: '__container__', align: VerticalAlign.Top },
+          left: { anchor: '__container__', align: HorizontalAlign.Start },
+        })
+        .id("title_name")
+      // 广告图
+      Image(this.compDTO.matInfo.matImageUrl[0])
+        .width('34%')
+        .aspectRatio(3 / 2)
+        .borderRadius(4)
+        .id('adv_imag')
+        .alignRules({
+          top: { anchor: 'title_name', align: VerticalAlign.Top },
+          left: { anchor: 'title_name', align: HorizontalAlign.End },
+
+        })
+        .margin({ left: 12 })
+
+      Row() {
+        Text($r('app.string.comp_advertisement')).fontSize('12fp').fontColor($r('app.color.color_B0B0B0'))
+
+        Blank()
+
+        Stack() {
+          Image($r('app.media.comp_adv_close'))
+            .width(9)
+            .height(9)
+            .borderRadius({
+              topLeft: '4vp',
+              topRight: '4vp',
+              bottomLeft: '4vp',
+              bottomRight: '4vp'
+            })
         }
         }
-    .width(CommonConstants.FULL_WIDTH)
+        .width(18)
+        .height(14)
+        .borderWidth(0.5)
+        .borderColor($r('app.color.color_EDEDED'))
+        .borderRadius(4)
+
+      }.width('62%').alignRules({
+        bottom: { anchor: this.isBigThreeLine ? '' : 'adv_imag', align: VerticalAlign.Bottom },
+        right: { anchor: this.isBigThreeLine ? '' : 'adv_imag', align: HorizontalAlign.Start },
+
+        top: { anchor: this.isBigThreeLine ? 'title_name' : '', align: VerticalAlign.Bottom },
+        left: { anchor: this.isBigThreeLine ? 'title_name' : '', align: HorizontalAlign.Start },
+      }).id('bottom_adv').margin({
+        right: this.isBigThreeLine ? 0 : 12,
+        top: this.isBigThreeLine ? 8 : 0,
+      })
+    }
+    .width("100%")
+    .height(this.isBigThreeLine ? 127 : 106)
     .padding({
     .padding({
       left: $r('app.float.card_comp_pagePadding_lf'),
       left: $r('app.float.card_comp_pagePadding_lf'),
       right: $r('app.float.card_comp_pagePadding_lf'),
       right: $r('app.float.card_comp_pagePadding_lf'),
@@ -48,13 +107,31 @@ export struct CardAdvSmallImageComponent {
       bottom: $r('app.float.card_comp_pagePadding_tb')
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
-      //ProcessUtils.processPage(this.contentDTO)
+      ProcessUtils.openAdvDetail(this.compDTO.matInfo)
+    })
+  }
+
+  // 获取文本几行
+  private getTextLineNum(text: string, constraintWidth: number, lineHeight: number, fontSize: number | string | Resource) {
+    let size = this.topMeasureText(text, constraintWidth, lineHeight, fontSize)
+    let height: number = Number(size.height)
+    return Math.ceil(px2vp(height) / lineHeight)
+  }
+
+  private topMeasureText(text: string, constraintWidth: number, lineHeight: number, fontSize: number | string | Resource) {
+    return measure.measureTextSize({
+      textContent: text,
+      fontSize: fontSize,
+      lineHeight: lineHeight,
+      constraintWidth: constraintWidth,
     })
     })
   }
   }
 }
 }
 
 
+
 @Extend(Text)
 @Extend(Text)
 function bottomTextStyle() {
 function bottomTextStyle() {
   .fontSize(12)
   .fontSize(12)
   .fontColor('#B0B0B0')
   .fontColor('#B0B0B0')
 }
 }
+

@@ -22,12 +22,12 @@ export struct CardAdvThreeImageComponent {
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
 
 
-    console.error('ZZZXXXXX', '--------aboutToAppear-----')
+    console.error('ZZZXXXXX', '---三图卡-----aboutToAppear-----')
   }
   }
 
 
   aboutToDisappear(): void {
   aboutToDisappear(): void {
 
 
-    console.error('ZZZXXXXX', '--------aboutToDisappear-----')
+    console.error('ZZZXXXXX', '----三图卡----aboutToDisappear-----')
   }
   }
 
 
   build() {
   build() {

@@ -22,12 +22,12 @@ export struct CardAdvVideoComponent {
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
 
 
-    console.error('ZZZXXXXX', '--------aboutToAppear-----')
+    console.error('ZZZXXXXX', '--视频广告------aboutToAppear-----')
   }
   }
 
 
   aboutToDisappear(): void {
   aboutToDisappear(): void {
 
 
-    console.error('ZZZXXXXX', '--------aboutToDisappear-----')
+    console.error('ZZZXXXXX', '---视频广告-----aboutToDisappear-----')
   }
   }
 
 
   build() {
   build() {

@@ -22,12 +22,12 @@ export struct CardAdvVideoExComponent {
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
 
 
-    console.error('ZZZXXXXX', '--------aboutToAppear-----')
+    console.error('ZZZXXXXX', '--冠名广告------aboutToAppear-----')
   }
   }
 
 
   aboutToDisappear(): void {
   aboutToDisappear(): void {
 
 
-    console.error('ZZZXXXXX', '--------aboutToDisappear-----')
+    console.error('ZZZXXXXX', '----冠名广告----aboutToDisappear-----')
   }
   }
 
 
   build() {
   build() {

@@ -11,6 +11,7 @@ const MY_CHANNEL_TIP2: string = '拖动调整频道顺序'
 const MORE_CHANNEL: string = '更多频道'
 const MORE_CHANNEL: string = '更多频道'
 const LOCAL_CHANNEL: string = '地方频道'
 const LOCAL_CHANNEL: string = '地方频道'
 
 
+const TAG: string = 'ChannelSubscriptionLayout'
 
 
 @CustomDialog
 @CustomDialog
 struct ChannelDialog {
 struct ChannelDialog {

@@ -107,7 +107,7 @@ export struct DetailPlayVLivePage {
         (data) => {
         (data) => {
           if (data.length > 0) {
           if (data.length > 0) {
             this.liveDetailsBean = data[0]
             this.liveDetailsBean = data[0]
-            this.liveState = 'end' // this.liveDetailsBean.liveInfo?.liveState //直播新闻-直播状态  wait待开播running直播中end已结束cancel已取消paused暂停
+            this.liveState = this.liveDetailsBean.liveInfo?.liveState //直播新闻-直播状态  wait待开播running直播中end已结束cancel已取消paused暂停
             if (this.liveDetailsBean.fullColumnImgUrls && this.liveDetailsBean.fullColumnImgUrls.length > 0) {
             if (this.liveDetailsBean.fullColumnImgUrls && this.liveDetailsBean.fullColumnImgUrls.length > 0) {
               this.imgUrl = this.liveDetailsBean.fullColumnImgUrls[0].url
               this.imgUrl = this.liveDetailsBean.fullColumnImgUrls[0].url
             }
             }

 export { add } from "./src/main/ets/utils/Calc"
 export { add } from "./src/main/ets/utils/Calc"
 export { SettingPasswordParams } from "./src/main/ets/pages/login/SettingPasswordLayout"
 export { SettingPasswordParams } from "./src/main/ets/pages/login/SettingPasswordLayout"
+
+export { LoginModule } from './src/main/ets/LoginModule'

+import HuaweiAuth from './utils/HuaweiAuth'
+import { JumpInterceptorAction, RouterJumpInterceptor, WDRouterPage } from 'wdRouter'
+import { BusinessError } from '@kit.BasicServicesKit'
+import { router } from '@kit.ArkUI'
+import { AccountManagerUtils } from 'wdKit/Index'
+
+class LoginJumpHandler implements JumpInterceptorAction {
+  
+  /// 说明是调用了跳转 WDRouterPage.loginPage 页面的行为
+  on(params?: object | undefined, singleMode?: boolean | undefined): boolean {
+
+    HuaweiAuth.sharedInstance().fetchAnonymousPhone().then((anonymousPhone) => {
+
+      router.pushUrl({url: WDRouterPage.oneKeyLoginPage.url()})
+    }).catch((error: string) => {
+      router.pushUrl({url: WDRouterPage.loginPage.url()})
+    })
+    return true
+  }
+}
+
+export class LoginModule {
+
+  static startup() {
+
+    /// 初始化华为一键登录相关
+    if (HuaweiAuth.enable) {
+
+      HuaweiAuth.sharedInstance().registerEvents()
+
+      AccountManagerUtils.isLogin().then((login) => {
+        if (!login) {
+          HuaweiAuth.sharedInstance().rePrefetchAnonymousPhone()
+        }
+      })
+      RouterJumpInterceptor.register(WDRouterPage.loginPage, new LoginJumpHandler())
+    }
+
+  }
+}

@@ -9,6 +9,10 @@ import { WDRouterPage } from 'wdRouter/src/main/ets/router/WDRouterPage';
 import { WDRouterRule } from 'wdRouter/src/main/ets/router/WDRouterRule';
 import { WDRouterRule } from 'wdRouter/src/main/ets/router/WDRouterRule';
 import { Params } from '../../../../../../../commons/wdRouter/oh_modules/wdBean/src/main/ets/bean/content/Params'
 import { Params } from '../../../../../../../commons/wdRouter/oh_modules/wdBean/src/main/ets/bean/content/Params'
 import {InterestsHobbiesModel} from '../../../../../../../products/phone/src/main/ets/pages/viewModel/InterestsHobbiesModel'
 import {InterestsHobbiesModel} from '../../../../../../../products/phone/src/main/ets/pages/viewModel/InterestsHobbiesModel'
+import HuaweiAuth from '../../utils/HuaweiAuth'
+import { loginComponentManager, LoginWithHuaweiIDButton } from '@hms.core.account.LoginComponent'
+import { BusinessError } from '@ohos.base'
+
 @Extend(Row)
 @Extend(Row)
 function otherStyle() {
 function otherStyle() {
   .backgroundImageSize(ImageSize.Cover)
   .backgroundImageSize(ImageSize.Cover)
@@ -56,7 +60,6 @@ struct LoginPage {
   })
   })
   loginViewModel = new LoginViewModel()
   loginViewModel = new LoginViewModel()
   @State isProtocol:boolean=false
   @State isProtocol:boolean=false
-
   onCodeSend() {
   onCodeSend() {
     Logger.debug(TAG, "isCodeSend:" + this.isCodeSend + "")
     Logger.debug(TAG, "isCodeSend:" + this.isCodeSend + "")
     if (this.isCodeSend) {
     if (this.isCodeSend) {

@@ -15,6 +15,7 @@ struct LoginProtocolWebview {
   userProtocol = "https://cdnpeoplefrontuat.aikan.pdnews.cn/rmrb/rmrb-protocol-zh-web/0.0.1/app/protocol-1005.html"
   userProtocol = "https://cdnpeoplefrontuat.aikan.pdnews.cn/rmrb/rmrb-protocol-zh-web/0.0.1/app/protocol-1005.html"
   privateProtocol = 'https://cdnpeoplefrontuat.aikan.pdnews.cn/rmrb/rmrb-protocol-zh-web/0.0.1/app/protocol-1001.html'
   privateProtocol = 'https://cdnpeoplefrontuat.aikan.pdnews.cn/rmrb/rmrb-protocol-zh-web/0.0.1/app/protocol-1001.html'
   logoutProtocol = 'https://cdnpeoplefrontuat.aikan.pdnews.cn/rmrb/rmrb-protocol-zh-web/0.0.1/app/protocol-1003.html'
   logoutProtocol = 'https://cdnpeoplefrontuat.aikan.pdnews.cn/rmrb/rmrb-protocol-zh-web/0.0.1/app/protocol-1003.html'
+  huaweiAuthProtocol = 'https://privacy.consumer.huawei.com/legal/id/authentication-terms.htm?code=CN&language=zh-CN'
 
 
   async aboutToAppear() {
   async aboutToAppear() {
     if (router.getParams()) {
     if (router.getParams()) {
@@ -30,6 +31,9 @@ struct LoginProtocolWebview {
       }else if(params.contentID == "3"){ //注销协议
       }else if(params.contentID == "3"){ //注销协议
         this.webUrl = await SPHelper.default.get(SpConstants.LOGOUT_PROTOCOL, this.logoutProtocol) as string
         this.webUrl = await SPHelper.default.get(SpConstants.LOGOUT_PROTOCOL, this.logoutProtocol) as string
         this.webviewController.loadUrl(this.webUrl)
         this.webviewController.loadUrl(this.webUrl)
+      } else if(params.contentID == "4"){ //华为用户认证协议
+        this.webUrl = this.huaweiAuthProtocol
+        this.webviewController.loadUrl(this.webUrl)
       }
       }
     }
     }
 
 

+import { router } from '@kit.ArkUI'
+import { Params } from 'wdBean/Index'
+import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
+import HuaweiAuth from '../../utils/HuaweiAuth'
+import { BusinessError } from '@kit.BasicServicesKit'
+
+@Entry
+@Component
+struct OneKeyLoginPage {
+  anonymousPhone: string = ''
+  @State agreeProtocol: boolean = false
+
+  aboutToAppear(): void {
+    this.anonymousPhone = HuaweiAuth.sharedInstance().anonymousPhone||""
+  }
+
+  build() {
+    Column() {
+      this.CloseRow()
+
+      Image($r("app.media.login_logo"))
+        .width(120)
+        .height(66)
+        .margin({ top: 78, bottom: 74})
+        .align(Alignment.Center)
+
+      Text(this.anonymousPhone)
+        .fontSize(30)
+        .fontWeight(600)
+        .fontColor("#222222")
+        .margin({bottom: 10})
+        .align(Alignment.Center)
+
+      this.ProtocolRow()
+
+      Row() {
+        Button("华为账号一键登录")
+          .type(ButtonType.Normal)
+          .height(48)
+          .backgroundColor(!this.agreeProtocol ? Color.Grey : Color.Red)
+          .width("100%")
+          .onClick((event) => {
+            if (!this.agreeProtocol) {
+              return
+            }
+            HuaweiAuth.sharedInstance().oneKeyLogin().then((authorizeCode) => {
+
+              //TODO: 调用服务端接口登录
+            }).catch((error: BusinessError) => {
+
+            })
+          })
+      }
+      .padding({ left: 25, right: 25 })
+      .margin({top: 15})
+
+      Button("其他手机号登录")
+        .type(ButtonType.Normal)
+        .align(Alignment.Center)
+        .foregroundColor("#666666")
+        .backgroundColor(Color.White)
+        .onClick((event) => {
+          router.replaceUrl({url: WDRouterPage.loginPage.url()})
+        })
+    }
+  }
+
+  @Builder ProtocolRow() {
+    Row({space: 4}) {
+      Image(this.agreeProtocol ? $r('app.media.login_checkbox_select') : $r('app.media.login_checkbox_unselected'))
+        .width(15)
+        .height(15)
+        .onClick(() => {
+          this.agreeProtocol = !this.agreeProtocol
+        })
+      Text() {
+        Span("我已阅读并同意").fontColor("#999999").fontSize(12)
+        Span("《用户协议》").fontColor("#ED2800").fontSize(12).onClick(() => {
+          let bean = { contentID: "1", pageID: "" } as Params
+          WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
+        })
+        Span("、").fontColor("#999999").fontSize(12)
+        Span("《隐私政策》").fontColor("#ED2800").fontSize(12).onClick(() => {
+          let bean = { contentID: "2", pageID: "" } as Params
+          WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
+        })
+        Span("和").fontColor("#999999").fontSize(12)
+        Span("《华为账号用户认证协议》").fontColor("#ED2800").fontSize(12).onClick(() => {
+          let bean = { contentID: "4", pageID: "" } as Params
+          WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
+        })
+      }
+      .layoutWeight(1)
+    }
+    .margin({top: 15})
+    .padding({ left: 25, right: 25 })
+    .width('100%')
+  }
+
+  @Builder CloseRow() {
+    Row() {
+      Blank()
+      Image($r('app.media.login_closed'))
+        .width(24)
+        .height(24)
+        .onClick(() => router.back())
+    }.margin({ top: 15, right: 15 })
+    .width("100%")
+  }
+}

+import { authentication, extendService } from '@kit.AccountKit';
+import { AccountManagerUtils, EmitterEventId, EmitterUtils, Logger } from 'wdKit/Index';
+import { util } from '@kit.ArkTS';
+import { DEFAULT } from '@ohos/hypium';
+import { BusinessError } from '@kit.BasicServicesKit';
+
+const TAG = "HuaweiOneKeyAuth"
+
+export default class HuaweiAuth {
+
+  // 是否开启
+  static enable = false
+  // 匿名手机号
+  private _anonymousPhone?: string
+  get anonymousPhone() {
+    return this._anonymousPhone
+  }
+
+  private static instance: HuaweiAuth
+  static sharedInstance(): HuaweiAuth {
+    if (!HuaweiAuth.instance) {
+      HuaweiAuth.instance = new HuaweiAuth()
+    }
+    return HuaweiAuth.instance
+  }
+
+  registerEvents() {
+    // 注册用户退出登录，取一次用来下次使用
+    EmitterUtils.receiveEvent(EmitterEventId.FORCE_USER_LOGIN_OUT, ((str?: string) => {
+      HuaweiAuth.sharedInstance().rePrefetchAnonymousPhone()
+    }))
+    EmitterUtils.receiveEvent(EmitterEventId.APP_ENTER_FOREGROUD, ((str?: string) => {
+      AccountManagerUtils.isLogin().then((login) => {
+        if (!login) {
+          HuaweiAuth.sharedInstance().rePrefetchAnonymousPhone()
+        }
+      })
+    }))
+  }
+
+  // 重新预取手机号（App启动未登录、回前台未登录、和退出登录 时调用提前取号）
+  rePrefetchAnonymousPhone() {
+    this._anonymousPhone = undefined
+    this.fetchAnonymousPhone()
+  }
+
+  // 要登录时，先调用。如果获取到手机号了 则弹起一键登录页面
+  fetchAnonymousPhone() : Promise<string> {
+
+    return new Promise((resolve, fail) => {
+      if (this.anonymousPhone) {
+        resolve(this.anonymousPhone)
+        return
+      }
+
+      let authRequest = new authentication.HuaweiIDProvider().createAuthorizationWithHuaweiIDRequest();
+      // 权限有 phone 、email、realTimePhone、quickLoginMobilePhone，这里用获取匿名手机号
+      authRequest.scopes = ['quickLoginAnonymousPhone'];
+      authRequest.state = util.generateRandomUUID();
+      authRequest.forceAuthorization = false;
+      let controller = new authentication.AuthenticationController(getContext(this));
+      try {
+        controller.executeRequest(authRequest).then((response: authentication.AuthorizationWithHuaweiIDResponse) => {
+          let anonymousPhone = response.data?.extraInfo?.quickLoginAnonymousPhone;
+          if (anonymousPhone) {
+            Logger.info(TAG, 'get anonymousPhone, ' + JSON.stringify(response));
+            this._anonymousPhone = anonymousPhone as string
+            resolve(this._anonymousPhone)
+            return;
+          }
+
+          Logger.info(TAG, 'get anonymousPhone is empty. ' + JSON.stringify(response));
+          fail("获取匿名手机号为空")
+        }).catch((err: BusinessError) => {
+          Logger.error(TAG, 'get anonymousPhone failed. ' + JSON.stringify(err));
+          fail("获取匿名手机号失败")
+        })
+      } catch (err) {
+        Logger.error(TAG, 'get anonymousPhone fail. ' + JSON.stringify(err));
+        fail("获取匿名手机号失败")
+      }
+    })
+  }
+
+  // 华为账号一键登录授权
+  // 返回结果为 Authorization Code
+  oneKeyLogin() : Promise<string> {
+
+    let loginRequest = new authentication.HuaweiIDProvider().createLoginWithHuaweiIDRequest();
+    // 当用户未登录华为帐号时，是否强制拉起华为帐号登录界面
+    loginRequest.forceLogin = true;
+    loginRequest.state = util.generateRandomUUID();
+
+    return new Promise((resolve, fail) => {
+
+      try {
+        let controller = new authentication.AuthenticationController(getContext(this));
+        controller.executeRequest(loginRequest, (err, data) => {
+          if (err) {
+            Logger.error(TAG, 'login fail, ' + JSON.stringify(err))
+            fail(err)
+            return;
+          }
+          let loginWithHuaweiIDResponse = data as authentication.LoginWithHuaweiIDResponse;
+          let state = loginWithHuaweiIDResponse.state;
+          if (state != undefined && loginRequest.state != state) {
+            Logger.error(TAG, 'login fail, The state is different' + JSON.stringify(loginWithHuaweiIDResponse))
+            fail({
+              code: 99999,
+              name: "一键登录",
+              message:"状态错误：" + `请求状态 ${loginRequest.state}, 结果状态 ${state}`
+            } as BusinessError)
+            return;
+          }
+
+          Logger.info(TAG, 'login success, ' + JSON.stringify(loginWithHuaweiIDResponse));
+          let loginWithHuaweiIDCredential = loginWithHuaweiIDResponse.data!;
+          let authorizationCode = loginWithHuaweiIDCredential.authorizationCode;
+          resolve(authorizationCode!)
+        });
+      } catch (error) {
+        Logger.error(TAG, 'login fail, ' +  JSON.stringify(error))
+        fail(error)
+      }
+    });
+  }
+
+  // 打开账户中心
+  openAccountCenter() {
+    try {
+      extendService.startAccountCenter(getContext(this), (err, data) => {
+        if (err) {
+          Logger.info(TAG, 'startAccountCenterWithCallback fail,error: ' + JSON.stringify(err));
+          return;
+        }
+        Logger.info(TAG, 'startAccountCenterWithCallback success');
+      });
+    } catch (error) {
+      Logger.error(TAG, 'startAccountCenterWithCallback fail,error: ' + JSON.stringify(error));
+    }
+  }
+}

@@ -6,6 +6,7 @@
     "pages/login/LoginProtocolWebview",
     "pages/login/LoginProtocolWebview",
     "pages/login/SettingPasswordPage",
     "pages/login/SettingPasswordPage",
     "pages/login/SettingPasswordLayout",
     "pages/login/SettingPasswordLayout",
-    "pages/guide/GuidePages"
+    "pages/guide/GuidePages",
+    "pages/login/OneKeyLoginPage"
   ]
   ]
 }
 }

@@ -16,6 +16,7 @@
     "wdRouter": "file:../../commons/wdRouter",
     "wdRouter": "file:../../commons/wdRouter",
     "wdNetwork": "file:../../commons/wdNetwork",
     "wdNetwork": "file:../../commons/wdNetwork",
     "wdHwAbility": "file:../../features/wdHwAbility",
     "wdHwAbility": "file:../../features/wdHwAbility",
-    "wdJsBridge": "file:../../commons/wdJsBridge"
+    "wdJsBridge": "file:../../commons/wdJsBridge",
+    "wdLogin": "file:../../features/wdLogin"
   }
   }
 }
 }

@@ -15,12 +15,14 @@ import {
   WindowModel
   WindowModel
 } from 'wdKit';
 } from 'wdKit';
 import { HostEnum, HostManager, WDHttp } from 'wdNetwork';
 import { HostEnum, HostManager, WDHttp } from 'wdNetwork';
+import { LoginModule } from 'wdLogin/src/main/ets/LoginModule';
 
 
 export default class EntryAbility extends UIAbility {
 export default class EntryAbility extends UIAbility {
   onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void {
   onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void {
     SPHelper.init(this.context);
     SPHelper.init(this.context);
     hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onCreate');
     hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onCreate');
     registerRouter();
     registerRouter();
+    LoginModule.startup()
     NetworkManager.getInstance().init()
     NetworkManager.getInstance().init()
     WDHttp.initHttpHeader()
     WDHttp.initHttpHeader()
     const spHostUrl = SPHelper.default.getSync('hostUrl', '') as string
     const spHostUrl = SPHelper.default.getSync('hostUrl', '') as string
@@ -94,10 +96,14 @@ export default class EntryAbility extends UIAbility {
   onForeground(): void {
   onForeground(): void {
     // Ability has brought to foreground
     // Ability has brought to foreground
     hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onForeground');
     hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onForeground');
+
+    EmitterUtils.sendEmptyEvent(EmitterEventId.APP_ENTER_FOREGROUD)
   }
   }
 
 
   onBackground(): void {
   onBackground(): void {
     // Ability has back to background
     // Ability has back to background
     hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onBackground');
     hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onBackground');
+
+    EmitterUtils.sendEmptyEvent(EmitterEventId.APP_ENTER_BACKGROUD)
   }
   }
 }
 }

 import { Action } from 'wdBean';
 import { Action } from 'wdBean';
 import { SpacialTopicPageComponent } from 'wdComponent'
 import { SpacialTopicPageComponent } from 'wdComponent'
+import { CommonConstants } from 'wdConstant'
 import { Logger } from 'wdKit'
 import { Logger } from 'wdKit'
 import router from '@ohos.router';
 import router from '@ohos.router';
 
 
-const TAG = 'SpacialPage';
+const TAG = 'SpacialTopicPage';
 
 
 @Entry
 @Entry
 @Component
 @Component
@@ -12,11 +13,11 @@ struct SpacialTopicPage {
 
 
   build() {
   build() {
     Column() {
     Column() {
-      SpacialTopicPageComponent()
-    }
+      SpacialTopicPageComponent({ action: this.action })
+    }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
   }
   }
 
 
-  pageTransition(){
+  pageTransition() {
     // 定义页面进入时的效果，从右边侧滑入
     // 定义页面进入时的效果，从右边侧滑入
     PageTransitionEnter({ type: RouteType.None, duration: 300 })
     PageTransitionEnter({ type: RouteType.None, duration: 300 })
       .slide(SlideEffect.Right)
       .slide(SlideEffect.Right)
@@ -25,7 +26,6 @@ struct SpacialTopicPage {
       .slide(SlideEffect.Right)
       .slide(SlideEffect.Right)
   }
   }
 
 
-
   aboutToAppear() {
   aboutToAppear() {
     Logger.info(TAG, 'aboutToAppear');
     Logger.info(TAG, 'aboutToAppear');
     let action: Action = router.getParams() as Action
     let action: Action = router.getParams() as Action

@@ -28,7 +28,6 @@ struct DefaultWebPage {
             isPageEnd: $isPageEnd
             isPageEnd: $isPageEnd
           })
           })
         }
         }
-        .padding({ bottom: 56 })
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
         .height(CommonConstants.FULL_HEIGHT)
         .height(CommonConstants.FULL_HEIGHT)
       }
       }

@@ -34,6 +34,10 @@
         ]
         ]
       }
       }
     ],
     ],
+    "metadata": [{
+      "name": "client_id",
+      "value": "220837707901830144"
+    }],
     "requestPermissions": [
     "requestPermissions": [
       {
       {
         "name": "ohos.permission.CAMERA",
         "name": "ohos.permission.CAMERA",
@@ -88,6 +92,6 @@
       {
       {
         "name": "ohos.permission.INTERNET"
         "name": "ohos.permission.INTERNET"
       }
       }
-    ],
+    ]
   }
   }
 }
 }