diff --git a/ui/Settings_FaceAuth/.idea/vcs.xml b/ui/Settings_FaceAuth/.idea/vcs.xml index 288b36b..6841f35 100644 --- a/ui/Settings_FaceAuth/.idea/vcs.xml +++ b/ui/Settings_FaceAuth/.idea/vcs.xml @@ -1,6 +1,7 @@ + diff --git a/ui/Settings_FaceAuth/entry/build.gradle b/ui/Settings_FaceAuth/entry/build.gradle index 53aaded..09fe071 100644 --- a/ui/Settings_FaceAuth/entry/build.gradle +++ b/ui/Settings_FaceAuth/entry/build.gradle @@ -20,6 +20,7 @@ ohos { defaultConfig { compatibleSdkVersion 8 } + arkEnabled false buildTypes { release { proguardOpt { diff --git a/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/component/backComponent.ets b/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/component/backComponent.ets index dc826ca..e422ca0 100644 --- a/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/component/backComponent.ets +++ b/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/component/backComponent.ets @@ -15,7 +15,6 @@ import Log from '../utils/log.ets' import commonControler from '../controller/commonController.ets' -import Constants from '../config/constant.ets' @Preview @Component diff --git a/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/component/confirmDialog.ets b/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/component/confirmDialog.ets index 6279ab3..79da47d 100644 --- a/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/component/confirmDialog.ets +++ b/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/component/confirmDialog.ets @@ -14,9 +14,7 @@ */ import Log from '../utils/log.ets' -import Constants from '../config/constant.ets' import DefaultConstants from '../config/defaultConstant.ets' -import UserIDMModel from '../model/userIDMModel.ets' @CustomDialog export default struct ConfirmDialog { diff --git a/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/config/config.ets b/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/config/config.ets index 3c4966a..4471130 100644 --- a/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/config/config.ets +++ b/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/config/config.ets @@ -14,7 +14,6 @@ */ import Log from '../utils/log.ets' -import deviceInfo from '@ohos.deviceInfo' import display from '@ohos.display'; class Config { diff --git a/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/controller/enrollingController.ets b/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/controller/enrollingController.ets index 1cde268..bede59f 100644 --- a/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/controller/enrollingController.ets +++ b/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/controller/enrollingController.ets @@ -15,7 +15,6 @@ import Log from '../utils/log.ets' import router from '@system.router'; -import Config from '../config/config.ets' import CommonController from '../controller/commonController.ets' import UserIDMModel from '../model/userIDMModel.ets' diff --git a/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/controller/faceConfigController.ets b/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/controller/faceConfigController.ets index 525f8bc..9d18557 100644 --- a/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/controller/faceConfigController.ets +++ b/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/controller/faceConfigController.ets @@ -14,9 +14,7 @@ */ import Log from '../utils/log.ets' -import UserAuthModel from '../model/userAuthModel.ets' import UserIDMModel from '../model/userIDMModel.ets' -import router from '@system.router'; import CommonController from '../controller/commonController.ets' class FaceConfigController { diff --git a/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/model/userIDMModel.ets b/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/model/userIDMModel.ets index a3aadbe..1d5b1da 100644 --- a/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/model/userIDMModel.ets +++ b/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/model/userIDMModel.ets @@ -14,7 +14,6 @@ */ import Log from '../utils/log.ets' -import CommonController from '../controller/commonController.ets' import account_osAccount from '@ohos.account.osAccount'; class UserIDMModel { @@ -39,11 +38,7 @@ class UserIDMModel { } async getChallenge() { - return new Promise((resolve)=> { - this.userIdentityManager.openSession((data) => { - resolve(data) - }) - }) + return await this.userIdentityManager.openSession() } uin8Array2String(inArray: Uint8Array): string { diff --git a/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/pages/enrollIntro.ets b/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/pages/enrollIntro.ets index 5cb9aa9..98186e4 100644 --- a/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/pages/enrollIntro.ets +++ b/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/pages/enrollIntro.ets @@ -18,7 +18,6 @@ import BackComponent from '../component/backComponent.ets' import Log from '../utils/log.ets' import CommonController from '../controller/commonController.ets' import Constants from '../config/constant.ets' -import Config from '../config/config.ets' @Entry @Component diff --git a/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/pages/enrolling.ets b/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/pages/enrolling.ets index b6e156b..2ab6296 100644 --- a/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/pages/enrolling.ets +++ b/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/pages/enrolling.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -import router from '@system.router'; import BackComponent from '../component/backComponent.ets' import Log from '../utils/log.ets' import CommonController from '../controller/commonController.ets' diff --git a/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/pages/entryView.ets b/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/pages/entryView.ets index a6103d6..a2e25b3 100644 --- a/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/pages/entryView.ets +++ b/ui/Settings_FaceAuth/entry/src/main/ets/enrollmentstartview/pages/entryView.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -import router from '@system.router'; import BackComponent from '../component/backComponent.ets' import Log from '../utils/log.ets' import Constants from '../config/constant.ets'