Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

@@ -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) {

@@ -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';
 
 
 /**
 /**

 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';
-
-/** 
- * @Description:    广告---小图卡
- * @Author:         
- * @Email:          liyubing@wondertek.com.cn
- * @CreateDate:     
- * @UpdateRemark:   更新说明
- * @Version:        1.0
+
+import measure from '@ohos.measure';
+import { DisplayUtils } from 'wdKit/Index';
+
+const TAG: string = 'CardAdvSmallImageComponent';
+
+/**
+ * @Description: 广告---小图卡
+ * @Author:
+ * @Email: liyubing@wondertek.com.cn
+ * @CreateDate:
+ * @UpdateRemark: 更新说明
+ * @Version: 1.0
  */
  */
 @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(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(CommonConstants.FULL_WIDTH)
+    .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() {

 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)
   }
   }
 }
 }

@@ -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"
       }
       }
-    ],
+    ]
   }
   }
 }
 }