From 9575841a43de398cd59354084353a496c53fb6d6 Mon Sep 17 00:00:00 2001 From: dengxiaoyu Date: Sat, 27 Jul 2024 11:06:31 +0800 Subject: [PATCH 1/7] change app label Signed-off-by: dengxiaoyu --- application/AppScope/app.json | 4 ++-- application/AppScope/app.json5 | 4 ++-- application/BUILD.gn | 8 ++++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/application/AppScope/app.json b/application/AppScope/app.json index 414cf16a..5693f586 100644 --- a/application/AppScope/app.json +++ b/application/AppScope/app.json @@ -2,8 +2,8 @@ "app": { "bundleName": "com.ohos.dhardwareui", "vendor": "example", - "versionCode": 10000017, - "versionName": "1.0.17", + "versionCode": 10000018, + "versionName": "1.0.18", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 11, diff --git a/application/AppScope/app.json5 b/application/AppScope/app.json5 index ba975b82..6a591518 100644 --- a/application/AppScope/app.json5 +++ b/application/AppScope/app.json5 @@ -16,8 +16,8 @@ "app": { "bundleName": "com.ohos.dhardwareui", "vendor": "example", - "versionCode": 10000017, - "versionName": "1.0.17", + "versionCode": 10000018, + "versionName": "1.0.18", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 11, diff --git a/application/BUILD.gn b/application/BUILD.gn index 58ebe93b..112947c5 100644 --- a/application/BUILD.gn +++ b/application/BUILD.gn @@ -14,8 +14,7 @@ import("//build/ohos.gni") import("./DHardware_UI.gni") -ohos_hap("DHardware_UI") { - hap_profile = "entry/src/main/module.json" +ohos_app("DHardware_UI") { deps = [ ":DHardware_UI_js_assets", ":DHardware_UI_resources", @@ -27,6 +26,11 @@ ohos_hap("DHardware_UI") { subsystem_name = "applications" js_build_mode = "release" module_install_dir = "app/DHardware_UI" + sdk_home = "//prebuilts/ohos-sdk/linux" + sdk_type_name = [ "sdk.dir" ] + assemble_type = "assembleHap" + build_level = "module" + build_modules = [ "entry" ] if (defined(sign_hap_py_path)) { certificate_profile = "${certificate_profile_path}" key_alias = "DHardwareUI Release" -- Gitee From 288fc581a29c416b79ba6dc5e9f221676c4924a5 Mon Sep 17 00:00:00 2001 From: dengxiaoyu Date: Sat, 27 Jul 2024 11:27:43 +0800 Subject: [PATCH 2/7] change app label Signed-off-by: dengxiaoyu --- application/build-profile.json5 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/application/build-profile.json5 b/application/build-profile.json5 index 2de87c5f..cb27cc74 100644 --- a/application/build-profile.json5 +++ b/application/build-profile.json5 @@ -32,8 +32,7 @@ { "name": "release" } - ], - "signingConfigs": [] + ] }, "modules": [ { -- Gitee From 4ff31cf3caee9e06d57ee6eb8800c33c25675313 Mon Sep 17 00:00:00 2001 From: dengxiaoyu Date: Sat, 27 Jul 2024 12:12:05 +0800 Subject: [PATCH 3/7] change app label Signed-off-by: dengxiaoyu --- application/build-profile.json5 | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/application/build-profile.json5 b/application/build-profile.json5 index cb27cc74..ef12c501 100644 --- a/application/build-profile.json5 +++ b/application/build-profile.json5 @@ -19,18 +19,10 @@ { "name": "default", "signingConfig": "default", - "compileSdkVersion": 11, - "compatibleSdkVersion": 11, - "targetSdkVersion": 11, - "runtimeOS": "OpenHarmony" - } - ], - "buildModeSet": [ - { - "name": "debug" - }, - { - "name": "release" + "compileSdkVersion": 12, + "compatibleSdkVersion": 12, + "targetSdkVersion": 12, + "runtimeOS": "OpenHarmony", } ] }, -- Gitee From b10ed9054953300b8f1102559f4768dfc1fc18f2 Mon Sep 17 00:00:00 2001 From: dengxiaoyu Date: Sat, 27 Jul 2024 19:46:55 +0800 Subject: [PATCH 4/7] add constants Signed-off-by: dengxiaoyu --- .../ets/common/constants/CommonConstants.ets | 27 ++++ .../src/main/ets/pages/ContinueSwitch.ets | 137 ++++++++++-------- .../entry/src/main/ets/utils/Logger.ets | 44 ++++++ 3 files changed, 149 insertions(+), 59 deletions(-) create mode 100644 application/entry/src/main/ets/common/constants/CommonConstants.ets create mode 100644 application/entry/src/main/ets/utils/Logger.ets diff --git a/application/entry/src/main/ets/common/constants/CommonConstants.ets b/application/entry/src/main/ets/common/constants/CommonConstants.ets new file mode 100644 index 00000000..306713e0 --- /dev/null +++ b/application/entry/src/main/ets/common/constants/CommonConstants.ets @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export default class CommonConstants { + //ContinueSwitch page : + static readonly IMAGE_COUNT:number = 85; + static readonly IMG_ANIMATOR_OVER_DURATION:number = 1000; + static readonly IMG_ANIMATOR_NORMAL_DURATION:number = 30; + static readonly SWITCH_STATUS_OPEN:string = '1'; + static readonly SWITCH_STATUS_CLOSE:string = '0'; + static readonly GENERAL_PHONE_GAP_LENGTH:number = 16; + static readonly PC_PAD_GAP_LENGTH:number = 24; + static readonly PC_LIST_HEIGHT:number = 48; + static readonly PHONE_LIST_HEIGHT:number = 56; +} \ No newline at end of file diff --git a/application/entry/src/main/ets/pages/ContinueSwitch.ets b/application/entry/src/main/ets/pages/ContinueSwitch.ets index de638863..46b5e194 100644 --- a/application/entry/src/main/ets/pages/ContinueSwitch.ets +++ b/application/entry/src/main/ets/pages/ContinueSwitch.ets @@ -21,6 +21,8 @@ import { BusinessError } from '@ohos.base'; import { EditableLeftIconType, EditableTitleBar } from '@ohos.arkui.advanced.EditableTitleBar'; import mediaQuery from '@ohos.mediaquery'; import ConfigurationConstant from '@ohos.app.ability.ConfigurationConstant'; +import CommonConstants from '../common/constants/CommonConstants'; +import { Logger } from '../utils/Logger'; const TAG = '[ContinueSwitch_Page] : '; let context = getContext(this) as common.UIAbilityContext; @@ -32,8 +34,8 @@ interface switchStatus { } let switchState: switchStatus = { - open: '1', - close: '0' + open: CommonConstants.SWITCH_STATUS_OPEN, + close: CommonConstants.SWITCH_STATUS_CLOSE } @Entry @@ -45,8 +47,8 @@ struct ContinueSwitch { @State screenHeight: number = 0; @State screenWidth: number = 0; @State shortSideSize: number = 0; - @State videoHeight: number = 0; - @State videoWidth: number = 0; + @State imageAnimatorHeight: number = 0; + @State imageAnimatorWidth: number = 0; @State textWidth: number = 0; @State gapLength: number = 0; @State videoSrc: Resource = $rawfile('continue_center.mp4'); @@ -55,13 +57,17 @@ struct ContinueSwitch { @State portraitFunc: mediaQuery.MediaQueryResult | void | null = null; @State isVideoVisible: Visibility = Visibility.Hidden; @State contentHeight: number = 0; + @State imageArray: Array = []; + @State animationState: AnimationStatus = AnimationStatus.Running; + @State reverse: boolean = false; + @State iterations: number = -1; private videoController: VideoController | undefined = undefined; private listener: mediaQuery.MediaQueryListener = mediaQuery.matchMediaSync('(dark-mode:true)'); private extContext?: common.UIExtensionContext; private scroller: Scroller = new Scroller(); onPortrait(mediaQueryResult: mediaQuery.MediaQueryResult) { - console.log(TAG + 'onPortrait in'); + Logger.info(TAG + 'onPortrait in'); if (mediaQueryResult.matches as boolean) { this.videoSrc = $rawfile('continue_dark_center.mp4'); this.extContext?.getApplicationContext().setColorMode(ConfigurationConstant.ColorMode.COLOR_MODE_DARK); @@ -71,25 +77,36 @@ struct ContinueSwitch { } } - getVideoSize() { - console.log(TAG + 'getVideoSize in, deviceInfo.deviceType : ' + deviceInfo.deviceType); + /** + * @description Calculate the ImageAnimator size + * Calculation rule: + * 1.general phone & pad : screen height/2 compare with width,shorter is ImageAnimator width + * 2.pc: screen height/2 compare with width,shorter is ImageAnimator height + * 3.ratio: 3:2 + * @param height + * @param width + */ + getImageAnimatorSize(height: Length, width: Length) { + Logger.info(TAG + 'getImageAnimatorSize in, deviceInfo.deviceType : ' + deviceInfo.deviceType); + let totalHeight = height as number; + this.shortSideSize = width < totalHeight / 2 ? width as number : totalHeight / 2 as number; if (deviceInfo.deviceType === 'phone' || deviceInfo.deviceType === 'tablet') { - this.videoWidth = this.shortSideSize * 0.8; - this.videoHeight = this.shortSideSize * 0.8 * 2 / 3; + this.imageAnimatorWidth = this.shortSideSize * 0.8; + this.imageAnimatorHeight = this.shortSideSize * 0.8 * 2 / 3; } else if (deviceInfo.deviceType === '2in1') { - this.videoWidth = this.shortSideSize * 0.8 * 3 / 2; - this.videoHeight = this.shortSideSize * 0.8; + this.imageAnimatorWidth = this.shortSideSize * 0.8 * 3 / 2; + this.imageAnimatorHeight = this.shortSideSize * 0.8; } - console.log(TAG + 'this.shortSideSize = ' + this.shortSideSize + ', this.videoWidth = ' + this.videoWidth + ', this.videoHeight = ' + this.videoHeight); + Logger.info(TAG + 'this.shortSideSize = ' + this.shortSideSize + ', this.imageAnimatorWidth = ' + this.imageAnimatorWidth + ', this.imageAnimatorHeight = ' + this.imageAnimatorHeight); } getStringSync() { - console.log(TAG + 'getStringSync in'); + Logger.info(TAG + 'getStringSync in'); try { context.resourceManager.getStringValue($r('app.string.continue_title') .id, (error: BusinessError, value: string) => { if (error != null) { - console.error(TAG + 'error is ' + error); + Logger.error(TAG + 'error is ' + error); } else { this.title = value; console.info(TAG + ' this.title : ' + this.title); @@ -98,7 +115,17 @@ struct ContinueSwitch { } catch (error) { let code: number = (error as BusinessError).code; let message: string = (error as BusinessError).message; - console.error(TAG + `callback getStringValue failed,error code: ${code},message: ${message}.`); + Logger.error(TAG + `callback getStringValue failed,error code: ${code},message: ${message}.`); + } + } + + getImageArray() { + Logger.info(TAG + 'getStringSync in'); + for (let i = 0; i <= CommonConstants.IMAGE_COUNT; ++i) { + this.imageArray.push({ + src: $r(`app.media.continue_${i}`), + duration: (i == CommonConstants.IMAGE_COUNT) ? CommonConstants.IMG_ANIMATOR_OVER_DURATION : CommonConstants.IMG_ANIMATOR_NORMAL_DURATION + }) } } @@ -114,13 +141,13 @@ struct ContinueSwitch { } onPageShow() { - console.log(TAG + 'onPageShow in'); + Logger.info(TAG + 'onPageShow in'); this.getGapLength(); display.getAllDisplays((err, data) => { this.screenWidth = px2vp(data[0].width); this.screenHeight = px2vp(data[0].height); this.contentHeight = this.screenHeight; - console.log(TAG + 'screenWidth = ' + this.screenWidth + '; screenHeight = ' + this.screenHeight); + Logger.info(TAG + 'screenWidth = ' + this.screenWidth + '; screenHeight = ' + this.screenHeight); }) if (this.videoController) { this.videoController.start(); @@ -129,20 +156,21 @@ struct ContinueSwitch { } aboutToAppear() { - console.log(TAG + 'aboutToAppear in'); + Logger.info(TAG + 'aboutToAppear in'); let value = settings.getValueSync(context, 'Continue_Switch_Status', switchState.open); this.isSwitchOn = value != switchState.close ? true : false; - console.log(TAG + ' this.isSwitchOn : ' + this.isSwitchOn + '; value: ' + value); + Logger.info(TAG + ' this.isSwitchOn : ' + this.isSwitchOn + '; value: ' + value); AppStorage.setOrCreate('isSwitchOn', this.isSwitchOn); - console.log(TAG + 'AppStorage.get(isSwitchOn) : ' + AppStorage.get('isSwitchOn')); + Logger.info(TAG + 'AppStorage.get(isSwitchOn) : ' + AppStorage.get('isSwitchOn')); if (this.isSwitchOn) { let status: boolean = settings.setValueSync(context, 'Continue_Switch_Status', switchState.open); - console.log(TAG + 'set value success :' + status + '; set:Continue_Switch_Status is 1'); + Logger.info(TAG + 'set value success :' + status + '; set:Continue_Switch_Status is 1'); } this.getStringSync(); + this.getImageArray(); this.listener.on('change', (mediaQueryResult: mediaQuery.MediaQueryResult) => { this.onPortrait(mediaQueryResult); @@ -151,22 +179,22 @@ struct ContinueSwitch { } getGapLength() { - console.log(TAG + 'getGapLength in, deviceInfo.deviceType : ' + deviceInfo.deviceType); + Logger.info(TAG + 'getGapLength in, deviceInfo.deviceType : ' + deviceInfo.deviceType); if (deviceInfo.deviceType == 'phone') { - this.gapLength = 16; + this.gapLength = CommonConstants.GENERAL_PHONE_GAP_LENGTH; } else if (deviceInfo.deviceType == '2in1' || deviceInfo.deviceType == 'tablet') { - this.gapLength = 24; + this.gapLength = CommonConstants.PC_PAD_GAP_LENGTH; } - console.log(TAG + 'this.gapLength : ' + this.gapLength); + Logger.info(TAG + 'this.gapLength : ' + this.gapLength); } onBackPress() { - console.log(TAG + 'onBackPress in'); + Logger.info(TAG + 'onBackPress in'); } async awaitTime(time: number) { setTimeout(() => { - console.log(TAG, 'awaitTime is' + time); + Logger.info(TAG + 'awaitTime is' + time); }, time) } @@ -181,7 +209,7 @@ struct ContinueSwitch { if (this.continueSession) { this.continueSession.sendData({ 'action': 'pop' }) } else { - console.error(TAG + 'continueSession is undefined'); + Logger.error(TAG + 'continueSession is undefined'); } } }) @@ -189,26 +217,19 @@ struct ContinueSwitch { Scroll(this.scroller) { Column() { - Video({ src: this.videoSrc, controller: this.videoController }) - .autoPlay(true) - .loop(true) - .objectFit(ImageFit.Contain) - .muted(true) - .controls(false) - .width(this.videoWidth) - .height(this.videoHeight) - .margin({ left: 35, right: 35, bottom: 24 }) - .backgroundColor($r('sys.color.ohos_id_color_sub_background')) - .visibility(this.isVideoVisible) - .onPrepared(async (event) => { - console.info(TAG + 'onPrepared is ' + event.duration); - if (this.videoController) { - this.videoController.start(); - } - }) + ImageAnimator() + .images(this.imageArray) + .state(this.animationState) + .reverse(this.reverse) + .fillMode(this.iterations) + .iterations(this.iterations) + .width(this.imageAnimatorWidth) + .height(this.imageAnimatorHeight) .onStart(() => { - console.info(TAG + 'onStart in'); - this.isVideoVisible = Visibility.Visible; + console.info(TAG + 'ImageAnimator Start'); + }) + .onFinish(() => { + console.info(TAG + 'ImageAnimator Finish'); }) Text($r('app.string.continue_desc')) @@ -220,7 +241,7 @@ struct ContinueSwitch { .width('100%') .maxLines(10) .onAreaChange((oldArea: Area, newArea: Area) => { - console.log(TAG + 'Text:continue desc, oldArea.height = ' + oldArea.height + ', newArea.height = ' + newArea.height); + Logger.info(TAG + 'Text:continue desc, oldArea.height = ' + oldArea.height + ', newArea.height = ' + newArea.height); }) Column() { @@ -240,19 +261,19 @@ struct ContinueSwitch { .height(20) .hoverEffect(HoverEffect.None) .onChange((isOn: boolean) => { - console.log(TAG + 'isOn:' + isOn); + Logger.info(TAG + 'isOn:' + isOn); this.isSwitchOn = isOn; AppStorage.setAndLink('isSwitchOn', isOn); if (isOn) { let status: boolean = settings.setValueSync(context, 'Continue_Switch_Status', switchState.open); - console.log(TAG + 'is set success :' + status + '; set:Continue_Switch_Status is on'); + Logger.info(TAG + 'is set success :' + status + '; set:Continue_Switch_Status is on'); } else { let status: boolean = settings.setValueSync(context, 'Continue_Switch_Status', switchState.close); - console.log(TAG + 'is set success :' + status + '; set:Continue_Switch_Status is close'); + Logger.info(TAG + 'is set success :' + status + '; set:Continue_Switch_Status is close'); } }) } - .height(this.is2in1 ? 48 : 56) + .height(this.is2in1 ? CommonConstants.PC_LIST_HEIGHT : CommonConstants.PHONE_LIST_HEIGHT) .width('100%') .padding({ left: 12, right: 12 }) .backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) @@ -270,7 +291,7 @@ struct ContinueSwitch { .textAlign(TextAlign.Start) .width('100%') .onAreaChange((oldArea: Area, newArea: Area) => { - console.log(TAG + 'Text:continue_privacy_text, continue desc, oldArea.height = ' + oldArea.height + ', newArea.height = ' + newArea.height); + Logger.info(TAG + 'Text:continue_privacy_text, continue desc, oldArea.height = ' + oldArea.height + ', newArea.height = ' + newArea.height); }) } .padding({ left: 8, right: 8 }) @@ -299,18 +320,16 @@ struct ContinueSwitch { console.info('Scroll Stop'); }) .onAreaChange((oldArea: Area, newArea: Area) => { - console.log(TAG + 'Scroll, oldArea.height = ' + oldArea.height + ', newArea.height = ' + newArea.height); + Logger.info(TAG + 'Scroll, oldArea.height = ' + oldArea.height + ', newArea.height = ' + newArea.height); }) } .width('100%') .height('100%') .backgroundColor($r('sys.color.ohos_id_color_sub_background')) .onAreaChange((oldArea: Area, newArea: Area) => { - console.log(TAG + 'build column , oldArea.height = ' + oldArea.height + ', newArea.height = ' + newArea.height); - let fullHeight = newArea.height as number; - this.shortSideSize = newArea.width < fullHeight / 2 ? newArea.width as number : fullHeight / 2 as number; - this.getVideoSize(); - console.log(TAG + 'this.shortSideSize = ' + this.shortSideSize + ', this.videoWidth = ' + this.videoWidth + ', this.videoHeight = ' + this.videoHeight); + Logger.info(TAG + 'build column , oldArea.height = ' + oldArea.height + ', newArea.height = ' + newArea.height); + this.getImageAnimatorSize(newArea.height, newArea.width); + Logger.info(TAG + 'this.shortSideSize = ' + this.shortSideSize + ', this.imageAnimatorWidth = ' + this.imageAnimatorWidth + ', this.imageAnimatorHeight = ' + this.imageAnimatorHeight); }) } } \ No newline at end of file diff --git a/application/entry/src/main/ets/utils/Logger.ets b/application/entry/src/main/ets/utils/Logger.ets new file mode 100644 index 00000000..a1c44c86 --- /dev/null +++ b/application/entry/src/main/ets/utils/Logger.ets @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import hilog from '@ohos.hilog'; + +class LoggerModel { + private domain: number; + private prefix: string; + + constructor(prefix: string) { + this.prefix = prefix; + this.domain = 0xFF00; + } + + debug(message: string): void { + hilog.debug(this.domain, this.prefix, message); + } + + info(message: string): void { + hilog.info(this.domain, this.prefix, message); + } + + warn(message: string): void { + hilog.warn(this.domain, this.prefix, message); + } + + error(message: string): void { + hilog.error(this.domain, this.prefix, message); + } +} + +export let Logger = new LoggerModel('[DHardware_UI]'); \ No newline at end of file -- Gitee From 66fba695d8811df5606f322a82a91e07fd815975 Mon Sep 17 00:00:00 2001 From: dengxiaoyu Date: Mon, 29 Jul 2024 09:57:07 +0800 Subject: [PATCH 5/7] del app gn Signed-off-by: dengxiaoyu --- application/BUILD.gn | 8 +-- application/build-profile.json5 | 2 +- .../src/main/ets/pages/ContinueSwitch.ets | 57 ++++++++++--------- .../entry/src/main/ets/utils/Logger.ets | 2 +- 4 files changed, 33 insertions(+), 36 deletions(-) diff --git a/application/BUILD.gn b/application/BUILD.gn index 112947c5..58ebe93b 100644 --- a/application/BUILD.gn +++ b/application/BUILD.gn @@ -14,7 +14,8 @@ import("//build/ohos.gni") import("./DHardware_UI.gni") -ohos_app("DHardware_UI") { +ohos_hap("DHardware_UI") { + hap_profile = "entry/src/main/module.json" deps = [ ":DHardware_UI_js_assets", ":DHardware_UI_resources", @@ -26,11 +27,6 @@ ohos_app("DHardware_UI") { subsystem_name = "applications" js_build_mode = "release" module_install_dir = "app/DHardware_UI" - sdk_home = "//prebuilts/ohos-sdk/linux" - sdk_type_name = [ "sdk.dir" ] - assemble_type = "assembleHap" - build_level = "module" - build_modules = [ "entry" ] if (defined(sign_hap_py_path)) { certificate_profile = "${certificate_profile_path}" key_alias = "DHardwareUI Release" diff --git a/application/build-profile.json5 b/application/build-profile.json5 index ef12c501..bae5519c 100644 --- a/application/build-profile.json5 +++ b/application/build-profile.json5 @@ -22,7 +22,7 @@ "compileSdkVersion": 12, "compatibleSdkVersion": 12, "targetSdkVersion": 12, - "runtimeOS": "OpenHarmony", + "runtimeOS": "OpenHarmony" } ] }, diff --git a/application/entry/src/main/ets/pages/ContinueSwitch.ets b/application/entry/src/main/ets/pages/ContinueSwitch.ets index 46b5e194..cdbe8196 100644 --- a/application/entry/src/main/ets/pages/ContinueSwitch.ets +++ b/application/entry/src/main/ets/pages/ContinueSwitch.ets @@ -22,7 +22,7 @@ import { EditableLeftIconType, EditableTitleBar } from '@ohos.arkui.advanced.Edi import mediaQuery from '@ohos.mediaquery'; import ConfigurationConstant from '@ohos.app.ability.ConfigurationConstant'; import CommonConstants from '../common/constants/CommonConstants'; -import { Logger } from '../utils/Logger'; +import { logger } from '../utils/logger'; const TAG = '[ContinueSwitch_Page] : '; let context = getContext(this) as common.UIAbilityContext; @@ -67,7 +67,7 @@ struct ContinueSwitch { private scroller: Scroller = new Scroller(); onPortrait(mediaQueryResult: mediaQuery.MediaQueryResult) { - Logger.info(TAG + 'onPortrait in'); + logger.info(TAG + 'onPortrait in'); if (mediaQueryResult.matches as boolean) { this.videoSrc = $rawfile('continue_dark_center.mp4'); this.extContext?.getApplicationContext().setColorMode(ConfigurationConstant.ColorMode.COLOR_MODE_DARK); @@ -87,7 +87,7 @@ struct ContinueSwitch { * @param width */ getImageAnimatorSize(height: Length, width: Length) { - Logger.info(TAG + 'getImageAnimatorSize in, deviceInfo.deviceType : ' + deviceInfo.deviceType); + logger.info(TAG + 'getImageAnimatorSize in, deviceInfo.deviceType : ' + deviceInfo.deviceType); let totalHeight = height as number; this.shortSideSize = width < totalHeight / 2 ? width as number : totalHeight / 2 as number; if (deviceInfo.deviceType === 'phone' || deviceInfo.deviceType === 'tablet') { @@ -97,16 +97,16 @@ struct ContinueSwitch { this.imageAnimatorWidth = this.shortSideSize * 0.8 * 3 / 2; this.imageAnimatorHeight = this.shortSideSize * 0.8; } - Logger.info(TAG + 'this.shortSideSize = ' + this.shortSideSize + ', this.imageAnimatorWidth = ' + this.imageAnimatorWidth + ', this.imageAnimatorHeight = ' + this.imageAnimatorHeight); + logger.info(TAG + 'this.shortSideSize = ' + this.shortSideSize + ', this.imageAnimatorWidth = ' + this.imageAnimatorWidth + ', this.imageAnimatorHeight = ' + this.imageAnimatorHeight); } getStringSync() { - Logger.info(TAG + 'getStringSync in'); + logger.info(TAG + 'getStringSync in'); try { context.resourceManager.getStringValue($r('app.string.continue_title') .id, (error: BusinessError, value: string) => { if (error != null) { - Logger.error(TAG + 'error is ' + error); + logger.error(TAG + 'error is ' + error); } else { this.title = value; console.info(TAG + ' this.title : ' + this.title); @@ -115,16 +115,17 @@ struct ContinueSwitch { } catch (error) { let code: number = (error as BusinessError).code; let message: string = (error as BusinessError).message; - Logger.error(TAG + `callback getStringValue failed,error code: ${code},message: ${message}.`); + logger.error(TAG + `callback getStringValue failed,error code: ${code},message: ${message}.`); } } getImageArray() { - Logger.info(TAG + 'getStringSync in'); + logger.info(TAG + 'getStringSync in'); for (let i = 0; i <= CommonConstants.IMAGE_COUNT; ++i) { this.imageArray.push({ src: $r(`app.media.continue_${i}`), - duration: (i == CommonConstants.IMAGE_COUNT) ? CommonConstants.IMG_ANIMATOR_OVER_DURATION : CommonConstants.IMG_ANIMATOR_NORMAL_DURATION + duration: (i == CommonConstants.IMAGE_COUNT) ? CommonConstants.IMG_ANIMATOR_OVER_DURATION + : CommonConstants.IMG_ANIMATOR_NORMAL_DURATION }) } } @@ -141,13 +142,13 @@ struct ContinueSwitch { } onPageShow() { - Logger.info(TAG + 'onPageShow in'); + logger.info(TAG + 'onPageShow in'); this.getGapLength(); display.getAllDisplays((err, data) => { this.screenWidth = px2vp(data[0].width); this.screenHeight = px2vp(data[0].height); this.contentHeight = this.screenHeight; - Logger.info(TAG + 'screenWidth = ' + this.screenWidth + '; screenHeight = ' + this.screenHeight); + logger.info(TAG + 'screenWidth = ' + this.screenWidth + '; screenHeight = ' + this.screenHeight); }) if (this.videoController) { this.videoController.start(); @@ -156,17 +157,17 @@ struct ContinueSwitch { } aboutToAppear() { - Logger.info(TAG + 'aboutToAppear in'); + logger.info(TAG + 'aboutToAppear in'); let value = settings.getValueSync(context, 'Continue_Switch_Status', switchState.open); this.isSwitchOn = value != switchState.close ? true : false; - Logger.info(TAG + ' this.isSwitchOn : ' + this.isSwitchOn + '; value: ' + value); + logger.info(TAG + ' this.isSwitchOn : ' + this.isSwitchOn + '; value: ' + value); AppStorage.setOrCreate('isSwitchOn', this.isSwitchOn); - Logger.info(TAG + 'AppStorage.get(isSwitchOn) : ' + AppStorage.get('isSwitchOn')); + logger.info(TAG + 'AppStorage.get(isSwitchOn) : ' + AppStorage.get('isSwitchOn')); if (this.isSwitchOn) { let status: boolean = settings.setValueSync(context, 'Continue_Switch_Status', switchState.open); - Logger.info(TAG + 'set value success :' + status + '; set:Continue_Switch_Status is 1'); + logger.info(TAG + 'set value success :' + status + '; set:Continue_Switch_Status is 1'); } this.getStringSync(); @@ -179,22 +180,22 @@ struct ContinueSwitch { } getGapLength() { - Logger.info(TAG + 'getGapLength in, deviceInfo.deviceType : ' + deviceInfo.deviceType); + logger.info(TAG + 'getGapLength in, deviceInfo.deviceType : ' + deviceInfo.deviceType); if (deviceInfo.deviceType == 'phone') { this.gapLength = CommonConstants.GENERAL_PHONE_GAP_LENGTH; } else if (deviceInfo.deviceType == '2in1' || deviceInfo.deviceType == 'tablet') { this.gapLength = CommonConstants.PC_PAD_GAP_LENGTH; } - Logger.info(TAG + 'this.gapLength : ' + this.gapLength); + logger.info(TAG + 'this.gapLength : ' + this.gapLength); } onBackPress() { - Logger.info(TAG + 'onBackPress in'); + logger.info(TAG + 'onBackPress in'); } async awaitTime(time: number) { setTimeout(() => { - Logger.info(TAG + 'awaitTime is' + time); + logger.info(TAG + 'awaitTime is' + time); }, time) } @@ -209,7 +210,7 @@ struct ContinueSwitch { if (this.continueSession) { this.continueSession.sendData({ 'action': 'pop' }) } else { - Logger.error(TAG + 'continueSession is undefined'); + logger.error(TAG + 'continueSession is undefined'); } } }) @@ -241,7 +242,7 @@ struct ContinueSwitch { .width('100%') .maxLines(10) .onAreaChange((oldArea: Area, newArea: Area) => { - Logger.info(TAG + 'Text:continue desc, oldArea.height = ' + oldArea.height + ', newArea.height = ' + newArea.height); + logger.info(TAG + 'Text:continue desc, oldArea.height = ' + oldArea.height + ', newArea.height = ' + newArea.height); }) Column() { @@ -261,15 +262,15 @@ struct ContinueSwitch { .height(20) .hoverEffect(HoverEffect.None) .onChange((isOn: boolean) => { - Logger.info(TAG + 'isOn:' + isOn); + logger.info(TAG + 'isOn:' + isOn); this.isSwitchOn = isOn; AppStorage.setAndLink('isSwitchOn', isOn); if (isOn) { let status: boolean = settings.setValueSync(context, 'Continue_Switch_Status', switchState.open); - Logger.info(TAG + 'is set success :' + status + '; set:Continue_Switch_Status is on'); + logger.info(TAG + 'is set success :' + status + '; set:Continue_Switch_Status is on'); } else { let status: boolean = settings.setValueSync(context, 'Continue_Switch_Status', switchState.close); - Logger.info(TAG + 'is set success :' + status + '; set:Continue_Switch_Status is close'); + logger.info(TAG + 'is set success :' + status + '; set:Continue_Switch_Status is close'); } }) } @@ -291,7 +292,7 @@ struct ContinueSwitch { .textAlign(TextAlign.Start) .width('100%') .onAreaChange((oldArea: Area, newArea: Area) => { - Logger.info(TAG + 'Text:continue_privacy_text, continue desc, oldArea.height = ' + oldArea.height + ', newArea.height = ' + newArea.height); + logger.info(TAG + 'Text:continue_privacy_text, continue desc, oldArea.height = ' + oldArea.height + ', newArea.height = ' + newArea.height); }) } .padding({ left: 8, right: 8 }) @@ -320,16 +321,16 @@ struct ContinueSwitch { console.info('Scroll Stop'); }) .onAreaChange((oldArea: Area, newArea: Area) => { - Logger.info(TAG + 'Scroll, oldArea.height = ' + oldArea.height + ', newArea.height = ' + newArea.height); + logger.info(TAG + 'Scroll, oldArea.height = ' + oldArea.height + ', newArea.height = ' + newArea.height); }) } .width('100%') .height('100%') .backgroundColor($r('sys.color.ohos_id_color_sub_background')) .onAreaChange((oldArea: Area, newArea: Area) => { - Logger.info(TAG + 'build column , oldArea.height = ' + oldArea.height + ', newArea.height = ' + newArea.height); + logger.info(TAG + 'build column , oldArea.height = ' + oldArea.height + ', newArea.height = ' + newArea.height); this.getImageAnimatorSize(newArea.height, newArea.width); - Logger.info(TAG + 'this.shortSideSize = ' + this.shortSideSize + ', this.imageAnimatorWidth = ' + this.imageAnimatorWidth + ', this.imageAnimatorHeight = ' + this.imageAnimatorHeight); + logger.info(TAG + 'this.shortSideSize = ' + this.shortSideSize + ', this.imageAnimatorWidth = ' + this.imageAnimatorWidth + ', this.imageAnimatorHeight = ' + this.imageAnimatorHeight); }) } } \ No newline at end of file diff --git a/application/entry/src/main/ets/utils/Logger.ets b/application/entry/src/main/ets/utils/Logger.ets index a1c44c86..90683537 100644 --- a/application/entry/src/main/ets/utils/Logger.ets +++ b/application/entry/src/main/ets/utils/Logger.ets @@ -41,4 +41,4 @@ class LoggerModel { } } -export let Logger = new LoggerModel('[DHardware_UI]'); \ No newline at end of file +export let logger = new LoggerModel('[DHardware_UI]'); \ No newline at end of file -- Gitee From f15ca849fb58eef68e494f4aeb289e9796b7790f Mon Sep 17 00:00:00 2001 From: dengxiaoyu Date: Mon, 29 Jul 2024 02:43:01 +0000 Subject: [PATCH 6/7] update application/build-profile.json5. Signed-off-by: dengxiaoyu --- application/build-profile.json5 | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/application/build-profile.json5 b/application/build-profile.json5 index bae5519c..2de87c5f 100644 --- a/application/build-profile.json5 +++ b/application/build-profile.json5 @@ -19,12 +19,21 @@ { "name": "default", "signingConfig": "default", - "compileSdkVersion": 12, - "compatibleSdkVersion": 12, - "targetSdkVersion": 12, + "compileSdkVersion": 11, + "compatibleSdkVersion": 11, + "targetSdkVersion": 11, "runtimeOS": "OpenHarmony" } - ] + ], + "buildModeSet": [ + { + "name": "debug" + }, + { + "name": "release" + } + ], + "signingConfigs": [] }, "modules": [ { -- Gitee From 109f7e9ab91e91a36704595b37ff63882eac5c4f Mon Sep 17 00:00:00 2001 From: dengxiaoyu Date: Mon, 29 Jul 2024 11:59:58 +0800 Subject: [PATCH 7/7] add png sequence Signed-off-by: dengxiaoyu --- .../ets/common/constants/CommonConstants.ets | 7 ++++ .../src/main/ets/pages/ContinueSwitch.ets | 32 ++++++++++++------ .../main/resources/base/media/continue_1.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_10.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_11.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_12.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_13.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_14.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_15.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_16.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_17.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_18.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_19.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_2.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_20.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_21.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_22.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_23.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_24.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_25.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_26.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_27.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_28.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_29.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_3.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_30.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_31.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_32.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_33.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_34.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_35.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_36.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_37.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_38.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_39.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_4.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_40.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_41.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_42.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_43.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_44.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_45.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_46.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_47.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_48.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_49.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_5.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_50.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_51.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_52.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_53.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_54.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_55.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_56.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_57.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_58.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_59.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_6.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_60.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_61.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_62.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_63.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_64.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_65.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_66.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_67.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_68.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_69.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_7.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_70.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_71.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_72.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_73.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_74.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_75.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_76.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_77.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_78.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_79.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_8.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_80.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_81.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_82.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_83.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_84.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_85.png | Bin 0 -> 120 bytes .../main/resources/base/media/continue_9.png | Bin 0 -> 120 bytes 87 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 application/entry/src/main/resources/base/media/continue_1.png create mode 100644 application/entry/src/main/resources/base/media/continue_10.png create mode 100644 application/entry/src/main/resources/base/media/continue_11.png create mode 100644 application/entry/src/main/resources/base/media/continue_12.png create mode 100644 application/entry/src/main/resources/base/media/continue_13.png create mode 100644 application/entry/src/main/resources/base/media/continue_14.png create mode 100644 application/entry/src/main/resources/base/media/continue_15.png create mode 100644 application/entry/src/main/resources/base/media/continue_16.png create mode 100644 application/entry/src/main/resources/base/media/continue_17.png create mode 100644 application/entry/src/main/resources/base/media/continue_18.png create mode 100644 application/entry/src/main/resources/base/media/continue_19.png create mode 100644 application/entry/src/main/resources/base/media/continue_2.png create mode 100644 application/entry/src/main/resources/base/media/continue_20.png create mode 100644 application/entry/src/main/resources/base/media/continue_21.png create mode 100644 application/entry/src/main/resources/base/media/continue_22.png create mode 100644 application/entry/src/main/resources/base/media/continue_23.png create mode 100644 application/entry/src/main/resources/base/media/continue_24.png create mode 100644 application/entry/src/main/resources/base/media/continue_25.png create mode 100644 application/entry/src/main/resources/base/media/continue_26.png create mode 100644 application/entry/src/main/resources/base/media/continue_27.png create mode 100644 application/entry/src/main/resources/base/media/continue_28.png create mode 100644 application/entry/src/main/resources/base/media/continue_29.png create mode 100644 application/entry/src/main/resources/base/media/continue_3.png create mode 100644 application/entry/src/main/resources/base/media/continue_30.png create mode 100644 application/entry/src/main/resources/base/media/continue_31.png create mode 100644 application/entry/src/main/resources/base/media/continue_32.png create mode 100644 application/entry/src/main/resources/base/media/continue_33.png create mode 100644 application/entry/src/main/resources/base/media/continue_34.png create mode 100644 application/entry/src/main/resources/base/media/continue_35.png create mode 100644 application/entry/src/main/resources/base/media/continue_36.png create mode 100644 application/entry/src/main/resources/base/media/continue_37.png create mode 100644 application/entry/src/main/resources/base/media/continue_38.png create mode 100644 application/entry/src/main/resources/base/media/continue_39.png create mode 100644 application/entry/src/main/resources/base/media/continue_4.png create mode 100644 application/entry/src/main/resources/base/media/continue_40.png create mode 100644 application/entry/src/main/resources/base/media/continue_41.png create mode 100644 application/entry/src/main/resources/base/media/continue_42.png create mode 100644 application/entry/src/main/resources/base/media/continue_43.png create mode 100644 application/entry/src/main/resources/base/media/continue_44.png create mode 100644 application/entry/src/main/resources/base/media/continue_45.png create mode 100644 application/entry/src/main/resources/base/media/continue_46.png create mode 100644 application/entry/src/main/resources/base/media/continue_47.png create mode 100644 application/entry/src/main/resources/base/media/continue_48.png create mode 100644 application/entry/src/main/resources/base/media/continue_49.png create mode 100644 application/entry/src/main/resources/base/media/continue_5.png create mode 100644 application/entry/src/main/resources/base/media/continue_50.png create mode 100644 application/entry/src/main/resources/base/media/continue_51.png create mode 100644 application/entry/src/main/resources/base/media/continue_52.png create mode 100644 application/entry/src/main/resources/base/media/continue_53.png create mode 100644 application/entry/src/main/resources/base/media/continue_54.png create mode 100644 application/entry/src/main/resources/base/media/continue_55.png create mode 100644 application/entry/src/main/resources/base/media/continue_56.png create mode 100644 application/entry/src/main/resources/base/media/continue_57.png create mode 100644 application/entry/src/main/resources/base/media/continue_58.png create mode 100644 application/entry/src/main/resources/base/media/continue_59.png create mode 100644 application/entry/src/main/resources/base/media/continue_6.png create mode 100644 application/entry/src/main/resources/base/media/continue_60.png create mode 100644 application/entry/src/main/resources/base/media/continue_61.png create mode 100644 application/entry/src/main/resources/base/media/continue_62.png create mode 100644 application/entry/src/main/resources/base/media/continue_63.png create mode 100644 application/entry/src/main/resources/base/media/continue_64.png create mode 100644 application/entry/src/main/resources/base/media/continue_65.png create mode 100644 application/entry/src/main/resources/base/media/continue_66.png create mode 100644 application/entry/src/main/resources/base/media/continue_67.png create mode 100644 application/entry/src/main/resources/base/media/continue_68.png create mode 100644 application/entry/src/main/resources/base/media/continue_69.png create mode 100644 application/entry/src/main/resources/base/media/continue_7.png create mode 100644 application/entry/src/main/resources/base/media/continue_70.png create mode 100644 application/entry/src/main/resources/base/media/continue_71.png create mode 100644 application/entry/src/main/resources/base/media/continue_72.png create mode 100644 application/entry/src/main/resources/base/media/continue_73.png create mode 100644 application/entry/src/main/resources/base/media/continue_74.png create mode 100644 application/entry/src/main/resources/base/media/continue_75.png create mode 100644 application/entry/src/main/resources/base/media/continue_76.png create mode 100644 application/entry/src/main/resources/base/media/continue_77.png create mode 100644 application/entry/src/main/resources/base/media/continue_78.png create mode 100644 application/entry/src/main/resources/base/media/continue_79.png create mode 100644 application/entry/src/main/resources/base/media/continue_8.png create mode 100644 application/entry/src/main/resources/base/media/continue_80.png create mode 100644 application/entry/src/main/resources/base/media/continue_81.png create mode 100644 application/entry/src/main/resources/base/media/continue_82.png create mode 100644 application/entry/src/main/resources/base/media/continue_83.png create mode 100644 application/entry/src/main/resources/base/media/continue_84.png create mode 100644 application/entry/src/main/resources/base/media/continue_85.png create mode 100644 application/entry/src/main/resources/base/media/continue_9.png diff --git a/application/entry/src/main/ets/common/constants/CommonConstants.ets b/application/entry/src/main/ets/common/constants/CommonConstants.ets index 306713e0..a2654763 100644 --- a/application/entry/src/main/ets/common/constants/CommonConstants.ets +++ b/application/entry/src/main/ets/common/constants/CommonConstants.ets @@ -24,4 +24,11 @@ export default class CommonConstants { static readonly PC_PAD_GAP_LENGTH:number = 24; static readonly PC_LIST_HEIGHT:number = 48; static readonly PHONE_LIST_HEIGHT:number = 56; + static readonly TEXT_LIST_ALIGN_DISTANCE:number = 12; + static readonly PC_BORDER_RADIUS:number = 16; + static readonly NON_PC_BORDER_RADIUS:number = 20; + static readonly CONTINUE_DESC_TEXT_MARGIN_BOTTOM:number = 32; + static readonly CONTINUE_PRIVACY_TEXT_MARGIN_TOP:number = 8; + static readonly CONTINUE_SWITCH_WIDTH:number = 36; + static readonly CONTINUE_SWITCH_HEIGHT:number = 20; } \ No newline at end of file diff --git a/application/entry/src/main/ets/pages/ContinueSwitch.ets b/application/entry/src/main/ets/pages/ContinueSwitch.ets index cdbe8196..3817aceb 100644 --- a/application/entry/src/main/ets/pages/ContinueSwitch.ets +++ b/application/entry/src/main/ets/pages/ContinueSwitch.ets @@ -97,7 +97,8 @@ struct ContinueSwitch { this.imageAnimatorWidth = this.shortSideSize * 0.8 * 3 / 2; this.imageAnimatorHeight = this.shortSideSize * 0.8; } - logger.info(TAG + 'this.shortSideSize = ' + this.shortSideSize + ', this.imageAnimatorWidth = ' + this.imageAnimatorWidth + ', this.imageAnimatorHeight = ' + this.imageAnimatorHeight); + logger.info(TAG + 'this.shortSideSize = ' + this.shortSideSize + ', this.imageAnimatorWidth = ' + + this.imageAnimatorWidth + ', this.imageAnimatorHeight = ' + this.imageAnimatorHeight); } getStringSync() { @@ -236,13 +237,14 @@ struct ContinueSwitch { Text($r('app.string.continue_desc')) .fontSize($r('sys.float.ohos_id_text_size_body2')) .fontWeight(FontWeight.Regular) - .margin({ bottom: 32 }) + .margin({ bottom: CommonConstants.CONTINUE_DESC_TEXT_MARGIN_BOTTOM }) .fontColor($r('sys.color.ohos_id_color_text_secondary')) .textAlign(TextAlign.Center) .width('100%') .maxLines(10) .onAreaChange((oldArea: Area, newArea: Area) => { - logger.info(TAG + 'Text:continue desc, oldArea.height = ' + oldArea.height + ', newArea.height = ' + newArea.height); + logger.info(TAG + 'Text:continue desc, oldArea.height = ' + oldArea.height + + ', newArea.height = ' + newArea.height); }) Column() { @@ -258,8 +260,8 @@ struct ContinueSwitch { .accessibilityLevel('no') Toggle({ type: ToggleType.Switch, isOn: this.isSwitchOn }) - .width(36) - .height(20) + .width(CommonConstants.CONTINUE_SWITCH_WIDTH) + .height(CommonConstants.CONTINUE_SWITCH_HEIGHT) .hoverEffect(HoverEffect.None) .onChange((isOn: boolean) => { logger.info(TAG + 'isOn:' + isOn); @@ -276,9 +278,12 @@ struct ContinueSwitch { } .height(this.is2in1 ? CommonConstants.PC_LIST_HEIGHT : CommonConstants.PHONE_LIST_HEIGHT) .width('100%') - .padding({ left: 12, right: 12 }) + .padding({ + left: CommonConstants.TEXT_LIST_ALIGN_DISTANCE, + right: CommonConstants.TEXT_LIST_ALIGN_DISTANCE + }) .backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) - .borderRadius(this.is2in1 ? 16 : 20) + .borderRadius(this.is2in1 ? CommonConstants.PC_BORDER_RADIUS : CommonConstants.NON_PC_BORDER_RADIUS) .accessibilityText(this.title) }.width('100%') @@ -287,15 +292,19 @@ struct ContinueSwitch { Text($r('app.string.continue_privacy_text')) .fontSize($r('sys.float.ohos_id_text_size_body3')) .fontWeight(FontWeight.Regular) - .margin({ top: 8 }) + .margin({ top: CommonConstants.CONTINUE_PRIVACY_TEXT_MARGIN_TOP}) .fontColor($r('sys.color.ohos_id_color_text_secondary')) .textAlign(TextAlign.Start) .width('100%') .onAreaChange((oldArea: Area, newArea: Area) => { - logger.info(TAG + 'Text:continue_privacy_text, continue desc, oldArea.height = ' + oldArea.height + ', newArea.height = ' + newArea.height); + logger.info(TAG + 'Text:continue_privacy_text, continue desc, oldArea.height = ' + oldArea.height + + ', newArea.height = ' + newArea.height); }) } - .padding({ left: 8, right: 8 }) + .padding({ + left: CommonConstants.TEXT_LIST_ALIGN_DISTANCE, + right: CommonConstants.TEXT_LIST_ALIGN_DISTANCE + }) }.width('100%') } @@ -330,7 +339,8 @@ struct ContinueSwitch { .onAreaChange((oldArea: Area, newArea: Area) => { logger.info(TAG + 'build column , oldArea.height = ' + oldArea.height + ', newArea.height = ' + newArea.height); this.getImageAnimatorSize(newArea.height, newArea.width); - logger.info(TAG + 'this.shortSideSize = ' + this.shortSideSize + ', this.imageAnimatorWidth = ' + this.imageAnimatorWidth + ', this.imageAnimatorHeight = ' + this.imageAnimatorHeight); + logger.info(TAG + 'this.shortSideSize = ' + this.shortSideSize + ', this.imageAnimatorWidth = ' + + this.imageAnimatorWidth + ', this.imageAnimatorHeight = ' + this.imageAnimatorHeight); }) } } \ No newline at end of file diff --git a/application/entry/src/main/resources/base/media/continue_1.png b/application/entry/src/main/resources/base/media/continue_1.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_10.png b/application/entry/src/main/resources/base/media/continue_10.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_11.png b/application/entry/src/main/resources/base/media/continue_11.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_12.png b/application/entry/src/main/resources/base/media/continue_12.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_13.png b/application/entry/src/main/resources/base/media/continue_13.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_14.png b/application/entry/src/main/resources/base/media/continue_14.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_15.png b/application/entry/src/main/resources/base/media/continue_15.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_16.png b/application/entry/src/main/resources/base/media/continue_16.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_17.png b/application/entry/src/main/resources/base/media/continue_17.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_18.png b/application/entry/src/main/resources/base/media/continue_18.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_19.png b/application/entry/src/main/resources/base/media/continue_19.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_2.png b/application/entry/src/main/resources/base/media/continue_2.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_20.png b/application/entry/src/main/resources/base/media/continue_20.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_21.png b/application/entry/src/main/resources/base/media/continue_21.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_22.png b/application/entry/src/main/resources/base/media/continue_22.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_23.png b/application/entry/src/main/resources/base/media/continue_23.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_24.png b/application/entry/src/main/resources/base/media/continue_24.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_25.png b/application/entry/src/main/resources/base/media/continue_25.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_26.png b/application/entry/src/main/resources/base/media/continue_26.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_27.png b/application/entry/src/main/resources/base/media/continue_27.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_28.png b/application/entry/src/main/resources/base/media/continue_28.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_29.png b/application/entry/src/main/resources/base/media/continue_29.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_3.png b/application/entry/src/main/resources/base/media/continue_3.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_30.png b/application/entry/src/main/resources/base/media/continue_30.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_31.png b/application/entry/src/main/resources/base/media/continue_31.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_32.png b/application/entry/src/main/resources/base/media/continue_32.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_33.png b/application/entry/src/main/resources/base/media/continue_33.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_34.png b/application/entry/src/main/resources/base/media/continue_34.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_35.png b/application/entry/src/main/resources/base/media/continue_35.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_36.png b/application/entry/src/main/resources/base/media/continue_36.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_37.png b/application/entry/src/main/resources/base/media/continue_37.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_38.png b/application/entry/src/main/resources/base/media/continue_38.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_39.png b/application/entry/src/main/resources/base/media/continue_39.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_4.png b/application/entry/src/main/resources/base/media/continue_4.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_40.png b/application/entry/src/main/resources/base/media/continue_40.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_41.png b/application/entry/src/main/resources/base/media/continue_41.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_42.png b/application/entry/src/main/resources/base/media/continue_42.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_43.png b/application/entry/src/main/resources/base/media/continue_43.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_44.png b/application/entry/src/main/resources/base/media/continue_44.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_45.png b/application/entry/src/main/resources/base/media/continue_45.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_46.png b/application/entry/src/main/resources/base/media/continue_46.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_47.png b/application/entry/src/main/resources/base/media/continue_47.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_48.png b/application/entry/src/main/resources/base/media/continue_48.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_49.png b/application/entry/src/main/resources/base/media/continue_49.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_5.png b/application/entry/src/main/resources/base/media/continue_5.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_50.png b/application/entry/src/main/resources/base/media/continue_50.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_51.png b/application/entry/src/main/resources/base/media/continue_51.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_52.png b/application/entry/src/main/resources/base/media/continue_52.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_53.png b/application/entry/src/main/resources/base/media/continue_53.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_54.png b/application/entry/src/main/resources/base/media/continue_54.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_55.png b/application/entry/src/main/resources/base/media/continue_55.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_56.png b/application/entry/src/main/resources/base/media/continue_56.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_57.png b/application/entry/src/main/resources/base/media/continue_57.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_58.png b/application/entry/src/main/resources/base/media/continue_58.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_59.png b/application/entry/src/main/resources/base/media/continue_59.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_6.png b/application/entry/src/main/resources/base/media/continue_6.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_60.png b/application/entry/src/main/resources/base/media/continue_60.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_61.png b/application/entry/src/main/resources/base/media/continue_61.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_62.png b/application/entry/src/main/resources/base/media/continue_62.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_63.png b/application/entry/src/main/resources/base/media/continue_63.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_64.png b/application/entry/src/main/resources/base/media/continue_64.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_65.png b/application/entry/src/main/resources/base/media/continue_65.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_66.png b/application/entry/src/main/resources/base/media/continue_66.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_67.png b/application/entry/src/main/resources/base/media/continue_67.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_68.png b/application/entry/src/main/resources/base/media/continue_68.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_69.png b/application/entry/src/main/resources/base/media/continue_69.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_7.png b/application/entry/src/main/resources/base/media/continue_7.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_70.png b/application/entry/src/main/resources/base/media/continue_70.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_71.png b/application/entry/src/main/resources/base/media/continue_71.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_72.png b/application/entry/src/main/resources/base/media/continue_72.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_73.png b/application/entry/src/main/resources/base/media/continue_73.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_74.png b/application/entry/src/main/resources/base/media/continue_74.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_75.png b/application/entry/src/main/resources/base/media/continue_75.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_76.png b/application/entry/src/main/resources/base/media/continue_76.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_77.png b/application/entry/src/main/resources/base/media/continue_77.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_78.png b/application/entry/src/main/resources/base/media/continue_78.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_79.png b/application/entry/src/main/resources/base/media/continue_79.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_8.png b/application/entry/src/main/resources/base/media/continue_8.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_80.png b/application/entry/src/main/resources/base/media/continue_80.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_81.png b/application/entry/src/main/resources/base/media/continue_81.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_82.png b/application/entry/src/main/resources/base/media/continue_82.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_83.png b/application/entry/src/main/resources/base/media/continue_83.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_84.png b/application/entry/src/main/resources/base/media/continue_84.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_85.png b/application/entry/src/main/resources/base/media/continue_85.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 diff --git a/application/entry/src/main/resources/base/media/continue_9.png b/application/entry/src/main/resources/base/media/continue_9.png new file mode 100644 index 0000000000000000000000000000000000000000..0c68a42e0d7a911a4c2faaae600be35cdff2ac18 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaMs(j9#r85lP9 zbN@+X1@buyJR*x382Ao@Fyrz36)8YLUQZXt5Q*^Q8(UvDs4=h|VTya1RN)SkVDNPH Kb6Mw<&;$Uo+8o^g literal 0 HcmV?d00001 -- Gitee