ref |> 对接华为账号登录接口

Signed-off-by: xugenyuan <xugenyuan@wondertek.com.cn>

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

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

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