From fcccdfade0e8e70a9b8640d1ac4b09198126495e Mon Sep 17 00:00:00 2001 From: sunxuhui Date: Thu, 14 Dec 2023 11:16:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: sunxuhui --- .../{tool => BenchMark_tool}/1.bat | 12 ++-- .../benchMark_Component/BenchMark_tool/2.bat | 7 +++ .../benchMark_Component/BenchMark_tool/3.bat | 1 + .../{tool => BenchMark_tool}/BenchMark.py | 2 +- .../BenchMark_file.py | 2 +- .../BenchMark_tool/BenchMark_js.py | 62 +++++++++++++++++++ .../{tool => BenchMark_tool}/trace.py | 0 .../arkui/benchMark_Component/README.md | 43 +++++++++++++ .../alphabetIndexer/AlphabetIndexerHome.ets | 2 +- ... AlphabetIndexerSelectedBgColorSample.ets} | 8 +-- .../ets/pages/base/menu/MenuCreateSample.ets | 4 +- .../base/rating/RatingStarStyleSample.ets | 2 +- .../pages/base/rating/RatingStarsSample.ets | 2 +- .../SelectFirstExpandCollapseSample.ets | 12 +++- .../base/select/SelectFirstExpandSample.ets | 15 +++-- .../SelectSecondExpandCollapseSample.ets | 12 +++- .../base/select/SelectSecondExpandSample.ets | 17 +++-- .../TextPickerMouseScrollSample.ets | 6 +- .../container/grid/GridEdgeEffectSample.ets | 12 ++-- .../grid/GridManualScrollingSample.ets | 12 ++-- .../pages/container/grid/GridMarginSample.ets | 4 +- .../container/grid/GridScrollBySample.ets | 14 ++--- .../container/grid/GridScrollEdgeSample.ets | 14 ++--- .../container/grid/GridScrollToSample.ets | 14 ++--- ...ample.ets => SideBarContainerCBSample.ets} | 4 +- ...e.ets => SideBarContainerDragCoSample.ets} | 4 +- ...e.ets => SideBarContainerDragSBSample.ets} | 4 +- .../sideBarContainer/SideBarContainerHome.ets | 20 +++--- ...e.ets => SideBarContainerMaxSBWSample.ets} | 4 +- ...le.ets => SideBarContainerMinCWSample.ets} | 4 +- ...e.ets => SideBarContainerMinSBWSample.ets} | 4 +- ...e.ets => SideBarContainerShowCBSample.ets} | 4 +- ...e.ets => SideBarContainerShowSBSample.ets} | 4 +- ...ets => SideBarContainerSideBarPSample.ets} | 0 ...ets => SideBarContainerSideBarWSample.ets} | 4 +- .../pages/container/tabs/TabsWidthSample.ets | 4 +- .../resources/base/profile/main_pages.json | 22 +++---- .../src/ohosTest/ets/test/Ability.test.ets | 36 +++++++---- .../arkui/benchMark_Component/tool/2.bat | 7 --- 39 files changed, 262 insertions(+), 142 deletions(-) rename performance/arkui/benchMark_Component/{tool => BenchMark_tool}/1.bat (48%) create mode 100644 performance/arkui/benchMark_Component/BenchMark_tool/2.bat create mode 100644 performance/arkui/benchMark_Component/BenchMark_tool/3.bat rename performance/arkui/benchMark_Component/{tool => BenchMark_tool}/BenchMark.py (99%) rename performance/arkui/benchMark_Component/{tool => BenchMark_tool}/BenchMark_file.py (90%) create mode 100644 performance/arkui/benchMark_Component/BenchMark_tool/BenchMark_js.py rename performance/arkui/benchMark_Component/{tool => BenchMark_tool}/trace.py (100%) create mode 100644 performance/arkui/benchMark_Component/README.md rename performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/alphabetIndexer/{AlphabetIndexerSelectedBackgroundColorSample.ets => AlphabetIndexerSelectedBgColorSample.ets} (93%) rename performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/{SideBarContainerControlButtonSample.ets => SideBarContainerCBSample.ets} (96%) rename performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/{SideBarContainerDragContentSample.ets => SideBarContainerDragCoSample.ets} (99%) rename performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/{SideBarContainerDragSideBarSample.ets => SideBarContainerDragSBSample.ets} (99%) rename performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/{SideBarContainerMaxSideBarWidthSample.ets => SideBarContainerMaxSBWSample.ets} (96%) rename performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/{SideBarContainerMinContentWidthSample.ets => SideBarContainerMinCWSample.ets} (96%) rename performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/{SideBarContainerMinSideBarWidthSample.ets => SideBarContainerMinSBWSample.ets} (96%) rename performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/{SideBarContainerShowControlButtonSample.ets => SideBarContainerShowCBSample.ets} (97%) rename performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/{SideBarContainerShowSideBarSample.ets => SideBarContainerShowSBSample.ets} (98%) rename performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/{SideBarContainerSideBarPositionSample.ets => SideBarContainerSideBarPSample.ets} (100%) rename performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/{SideBarContainerSideBarWidthSample.ets => SideBarContainerSideBarWSample.ets} (98%) delete mode 100644 performance/arkui/benchMark_Component/tool/2.bat diff --git a/performance/arkui/benchMark_Component/tool/1.bat b/performance/arkui/benchMark_Component/BenchMark_tool/1.bat similarity index 48% rename from performance/arkui/benchMark_Component/tool/1.bat rename to performance/arkui/benchMark_Component/BenchMark_tool/1.bat index ace928300..9250d1cb2 100644 --- a/performance/arkui/benchMark_Component/tool/1.bat +++ b/performance/arkui/benchMark_Component/BenchMark_tool/1.bat @@ -4,12 +4,12 @@ for /f "tokens=* delims= " %%a in ("%ymd%") do set ymd=%%a set hms=%time:~0,2%%time:~3,2%% for /f "tokens=* delims= " %%a in ("%hms%") do set hms=%%a set filename=benchmark_next.ftrace -hdc_std wait-for-device shell mount -o remount,rw / -hdc_std shell "setenforce 0" -hdc_std shell "bytrace -t 360 -b 204800 --overwrite ace > /data/%filename%" -hdc_std shell "sed -i '1,2d' /data/%filename%" -hdc_std file recv /data/%filename% -python trace.py -p D://BenchMark/%filename% +hdc wait-for-device shell mount -o remount,rw / +hdc shell "setenforce 0" +hdc shell "bytrace -t 360 -b 204800 --overwrite ace > /data/%filename%" +hdc shell "sed -i '1,2d' /data/%filename%" +hdc file recv /data/%filename% +python trace.py -p D://BenchMark_tool/%filename% python BenchMark_file.py python BenchMark.py diff --git a/performance/arkui/benchMark_Component/BenchMark_tool/2.bat b/performance/arkui/benchMark_Component/BenchMark_tool/2.bat new file mode 100644 index 000000000..be32cc050 --- /dev/null +++ b/performance/arkui/benchMark_Component/BenchMark_tool/2.bat @@ -0,0 +1,7 @@ + +hdc app install -r entry-default-signed.hap +hdc app install -r entry-ohosTest-signed.hap +hdc shell aa test -b cn.openharmony.benchmarksample -m entry_test -s unittest /ets/testrunner/OpenHarmonyTestRunner -s class ActsAbilityTest -s timeout 6000000 + + +pause \ No newline at end of file diff --git a/performance/arkui/benchMark_Component/BenchMark_tool/3.bat b/performance/arkui/benchMark_Component/BenchMark_tool/3.bat new file mode 100644 index 000000000..f8d8d1721 --- /dev/null +++ b/performance/arkui/benchMark_Component/BenchMark_tool/3.bat @@ -0,0 +1 @@ + python BenchMark_js.py \ No newline at end of file diff --git a/performance/arkui/benchMark_Component/tool/BenchMark.py b/performance/arkui/benchMark_Component/BenchMark_tool/BenchMark.py similarity index 99% rename from performance/arkui/benchMark_Component/tool/BenchMark.py rename to performance/arkui/benchMark_Component/BenchMark_tool/BenchMark.py index 59fa3046e..75e3e77a4 100644 --- a/performance/arkui/benchMark_Component/tool/BenchMark.py +++ b/performance/arkui/benchMark_Component/BenchMark_tool/BenchMark.py @@ -4,7 +4,7 @@ from openpyxl.styles import Alignment samples = [] components = [] file_contents = [] -file_path = 'D:/BenchMark/benchmark_next.ftrace' +file_path = 'D:/BenchMark_tool/benchmark_next.ftrace' content = "LoadJsWithModule Execute Page code : pages" last_line_content = 'tracing_mark_write: trace_event_clock_sync: parent_ts' diff --git a/performance/arkui/benchMark_Component/tool/BenchMark_file.py b/performance/arkui/benchMark_Component/BenchMark_tool/BenchMark_file.py similarity index 90% rename from performance/arkui/benchMark_Component/tool/BenchMark_file.py rename to performance/arkui/benchMark_Component/BenchMark_tool/BenchMark_file.py index 0c4e80e1b..208ab38bc 100644 --- a/performance/arkui/benchMark_Component/tool/BenchMark_file.py +++ b/performance/arkui/benchMark_Component/BenchMark_tool/BenchMark_file.py @@ -1,6 +1,6 @@ import openpyxl -file_path = 'D:/BenchMark/benchmark_next.ftrace' +file_path = 'D:/BenchMark_tool/benchmark_next.ftrace' with open(file_path, 'r+', encoding='ISO-8859-1') as file: content = file.read() # 读取文件内容 new_content = content.replace(".N..", "....") diff --git a/performance/arkui/benchMark_Component/BenchMark_tool/BenchMark_js.py b/performance/arkui/benchMark_Component/BenchMark_tool/BenchMark_js.py new file mode 100644 index 000000000..a3a0a6a1d --- /dev/null +++ b/performance/arkui/benchMark_Component/BenchMark_tool/BenchMark_js.py @@ -0,0 +1,62 @@ +import openpyxl +from openpyxl.styles import Alignment +import pandas as pd +import re + +samples = [] +components = [] +file_path = 'D:/BenchMark_tool/BenchMark_js.txt' + +workbook = openpyxl.Workbook() # 创建工作簿 +# worksheet = workbook.create_sheet(title='BenchMark') # 创建工作表 +worksheet = workbook.active # 选择默认的表单 +worksheet['A1'] = '组件名称' +worksheet['B1'] = '时间' +worksheet.column_dimensions['A'].width = 30 +worksheet.column_dimensions['B'].width = 30 + +# 获取sample +def find_samples(file_path): + with open(file_path, 'r') as file: + lines = file.readlines() + print("len(lines)：", len(lines)) + count = 0 + lineTime = 0 + for index, line in enumerate(lines): + if 'please check Timer Name' in line: + continue + line_name = line.split(':')[3] + if 'ms' in line: + line_time = float(line.split(':')[4].split('ms')[0]) + else: + line_time = float(line.split(':')[4].split('s')[0]) * 1000 + if index < len(lines)-1 and line_name == lines[index+1].split(':')[3]: + count+=1 + lineTime += line_time + if index < len(lines)-1 and line_name != lines[index+1].split(':')[3]: + count+=1 + lineTime += line_time + worksheet['A%s' % str(index+1)] = line_name + worksheet['B%s' % str(index+1)] = lineTime / count / 20 + count = 0 + lineTime = 0 + if index == len(lines)-1: + count+=1 + lineTime += line_time + worksheet['A%s' % str(index+1)] = line_name + worksheet['B%s' % str(index+1)] = lineTime / count / 20 + count = 0 + lineTime = 0 + workbook.save(filename='BenchMark_js.xlsx') # 保存工作簿 + +find_samples(file_path) + + + +# 读取Excel文件 +data = pd.read_excel('BenchMark_js.xlsx') +# 删除空行 +data = data.dropna() +# 保存修改后的Excel文件 +data.to_excel('BenchMark_js.xlsx', index=False) + diff --git a/performance/arkui/benchMark_Component/tool/trace.py b/performance/arkui/benchMark_Component/BenchMark_tool/trace.py similarity index 100% rename from performance/arkui/benchMark_Component/tool/trace.py rename to performance/arkui/benchMark_Component/BenchMark_tool/trace.py diff --git a/performance/arkui/benchMark_Component/README.md b/performance/arkui/benchMark_Component/README.md new file mode 100644 index 000000000..d805bec28 --- /dev/null +++ b/performance/arkui/benchMark_Component/README.md @@ -0,0 +1,43 @@ +# benchMark_Component + +#### 介绍 +ArkUI组件性能测试用例 + +#### 目录结构 +``` +├── BenchMark_tool //解析trace数据工具 +├── entry +│   └── src +|      └── main //测试用例代码 +|      └── ohosTest //单元测试 +``` + +#### 使用说明 + +1. 安装python最新版本 + +2. 安装openpyxl、pandas + +3. 将项目根目录下的BenchMark_tool文件夹复制到电脑D盘根目录下 + +4. 抓取C++层trace数据（组件布局耗时数据） + + 运行单元测试（每次运行3-5个Function）![image-20231212160052752](C:\Users\Administrator\AppData\Roaming\Typora\typora-user-images\image-20231212160052752.png) + + 将生成的两个hap包复制到D://BenchMark_tool文件夹中 + + ![image-20231212160211450](C:\Users\Administrator\AppData\Roaming\Typora\typora-user-images\image-20231212160211450.png) + + 修改bytrace执行时间，将D://BenchMark_tool/1.bat中hdc_std shell "bytrace -t 360 -b 204800 --overwrite ace > /data/%filename%"命令中-t后边的360替换为当前单元测试的执行时间（单位秒） + + 执行D://BenchMark_tool/1.bat脚本，紧接着执行2.bat脚本；等待脚本执行结束会在BenchMark_tool文件中生成BenchMark.xlsx + +5. 抓取js层组件创建耗时数据 + + 在D://BenchMark_tool下新建BenchMark_js.txt文件，将DevEco Studio控制台打印的数据（如下图数据）复制到BenchMark_js.txt文件中并保存，执行3.bat，等待脚本执行结束会在BenchMark_tool文件中生成BenchMark_js.xlsx + + ![image-20231213094019476](C:\Users\Administrator\AppData\Roaming\Typora\typora-user-images\image-20231213094019476.png) + + + + diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/alphabetIndexer/AlphabetIndexerHome.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/alphabetIndexer/AlphabetIndexerHome.ets index 81a81c51f..f73ebc7e9 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/alphabetIndexer/AlphabetIndexerHome.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/alphabetIndexer/AlphabetIndexerHome.ets @@ -31,7 +31,7 @@ struct AlphabetIndexerHome { CommonButton({buttonName:'AlphabetIndexerCreate',buttonUrl:'pages/base/alphabetIndexer/AlphabetIndexerCreateSample'}); CommonButton({buttonName:'AlphabetIndexerSelectedColor',buttonUrl:'pages/base/alphabetIndexer/AlphabetIndexerSelectedColorSample'}); CommonButton({buttonName:'AlphabetIndexerPopupColor',buttonUrl:'pages/base/alphabetIndexer/AlphabetIndexerPopupColorSample'}); - CommonButton({buttonName:'AlphabetIndexerSelectedBackgroundColor',buttonUrl:'pages/base/alphabetIndexer/AlphabetIndexerSelectedBackgroundColorSample'}); + CommonButton({buttonName:'AlphabetIndexerSelectedBgColorSample',buttonUrl:'pages/base/alphabetIndexer/AlphabetIndexerSelectedBgColorSample'}); CommonButton({buttonName:'AlphabetIndexerPopupBackground',buttonUrl:'pages/base/alphabetIndexer/AlphabetIndexerPopupBackgroundSample'}); CommonButton({buttonName:'AlphabetIndexerSelectedFont',buttonUrl:'pages/base/alphabetIndexer/AlphabetIndexerSelectedFontSample'}); CommonButton({buttonName:'AlphabetIndexerPopupFont',buttonUrl:'pages/base/alphabetIndexer/AlphabetIndexerPopupFontSample'}); diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/alphabetIndexer/AlphabetIndexerSelectedBackgroundColorSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/alphabetIndexer/AlphabetIndexerSelectedBgColorSample.ets similarity index 93% rename from performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/alphabetIndexer/AlphabetIndexerSelectedBackgroundColorSample.ets rename to performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/alphabetIndexer/AlphabetIndexerSelectedBgColorSample.ets index 57dfc7249..4f908d8e2 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/alphabetIndexer/AlphabetIndexerSelectedBackgroundColorSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/alphabetIndexer/AlphabetIndexerSelectedBgColorSample.ets @@ -18,8 +18,8 @@ import { TimeHelper } from '../../../util/TimeHelper' @Entry @Component -struct AlphabetIndexerSelectedBackgroundColorSample { - timeHelper: TimeHelper = new TimeHelper('AlphabetIndexerSelectedBackgroundColorSample'); +struct AlphabetIndexerSelectedBgColorSample { + timeHelper: TimeHelper = new TimeHelper('AlphabetIndexerSelectedBgColorSample'); @State selectedBackgroundColor: Color = Color.Red; value: string[] = ['A', 'B', 'C']; @@ -36,7 +36,7 @@ struct AlphabetIndexerSelectedBackgroundColorSample { }.width('100%') ForEach(ArrEntity.arr, (index: number) => { - if (this.selectedBackgroundColor == Color.Yellow && this.timeHelper.printTime(true)) { + if (this.selectedBackgroundColor != null && this.timeHelper.printTime(true)) { } AlphabetIndexer({ arrayValue: this.value, selected: 0 }).selectedBackgroundColor(this.selectedBackgroundColor); @@ -60,7 +60,7 @@ struct AlphabetIndexerSelectedBackgroundColorSample { AlphabetIndexer({ arrayValue: this.value, selected: 0 }).selectedBackgroundColor(this.selectedBackgroundColor); AlphabetIndexer({ arrayValue: this.value, selected: 0 }).selectedBackgroundColor(this.selectedBackgroundColor); - if (this.selectedBackgroundColor == Color.Yellow && this.timeHelper.printTime(false)) { + if (this.selectedBackgroundColor != null && this.timeHelper.printTime(false)) { } }, (item: number) => JSON.stringify(item)) diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/menu/MenuCreateSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/menu/MenuCreateSample.ets index 2a9523d95..078643dac 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/menu/MenuCreateSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/menu/MenuCreateSample.ets @@ -18,8 +18,8 @@ import { TimeHelper } from '../../../util/TimeHelper' @Entry @Component -struct DividerCreateSample { - timeHelper: TimeHelper = new TimeHelper('DividerCreateSample'); +struct MenuCreateSample { + timeHelper: TimeHelper = new TimeHelper('MenuCreateSample'); build() { Scroll() { diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/rating/RatingStarStyleSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/rating/RatingStarStyleSample.ets index 1fde0092b..9b7d66d2a 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/rating/RatingStarStyleSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/rating/RatingStarStyleSample.ets @@ -35,7 +35,7 @@ struct RatingStarStyletyleSample { }.width('100%') ForEach(ArrEntity.arr, (index: number) => { - if (this.ratingStarStyle == 200 && this.timeHelper.printTime(true)) { + if (this.ratingStarStyle == 10 && this.timeHelper.printTime(true)) { } Rating().starStyle({ backgroundUri: '/common/notCompleteStar.svg', foregroundUri: '/common/completeStar.svg', secondaryUri: '/common/halfStar.svg' }) diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/rating/RatingStarsSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/rating/RatingStarsSample.ets index 17aff1deb..b80a06553 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/rating/RatingStarsSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/rating/RatingStarsSample.ets @@ -35,7 +35,7 @@ struct RatingStarsSample { }.width('100%') ForEach(ArrEntity.arr, (index: number) => { - if (this.ratingStars == 200 && this.timeHelper.printTime(true)) { + if (this.ratingStars == 10 && this.timeHelper.printTime(true)) { } Rating().stars(this.ratingStars) diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/select/SelectFirstExpandCollapseSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/select/SelectFirstExpandCollapseSample.ets index e96430c01..9e0fb4357 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/select/SelectFirstExpandCollapseSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/select/SelectFirstExpandCollapseSample.ets @@ -13,12 +13,13 @@ * limitations under the License. */ -import { TimeHelper } from '../../../util/TimeHelper' +import { TimeHelper } from '../../../util/TimeHelper'; @Entry @Component struct SelectFirstExpandCollapseSample { timeHelper: TimeHelper = new TimeHelper('SelectFirstExpandCollapseSample'); + @State isExpand: boolean = false; selectOption: SelectOption[] = [{ value: 'aaa', icon: $r('app.media.app_icon') }, { value: 'bbb', icon: $r('app.media.app_icon') }, { value: 'ccc', icon: $r('app.media.app_icon') }, @@ -28,10 +29,15 @@ struct SelectFirstExpandCollapseSample { build() { Scroll() { Flex({ direction: FlexDirection.Row, wrap: FlexWrap.Wrap }) { - + if (this.isExpand && this.timeHelper.printTime(true)) { + } Select(this.selectOption) .id('SelectFirstExpandCollapse') - + .onClick(() => { + this.isExpand = true; + }) + if (this.isExpand && this.timeHelper.printTime(false)) { + } } .width('100%') }.margin({ bottom: 60 }) diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/select/SelectFirstExpandSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/select/SelectFirstExpandSample.ets index 5418c063c..81eef4c02 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/select/SelectFirstExpandSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/select/SelectFirstExpandSample.ets @@ -13,13 +13,13 @@ * limitations under the License. */ -import { TimeHelper } from '../../../util/TimeHelper' +import { TimeHelper } from '../../../util/TimeHelper'; @Entry @Component struct SelectFirstExpandSample { timeHelper: TimeHelper = new TimeHelper('SelectFirstExpandSample'); - // @State selectWidth: number = 100; + @State isExpand: boolean = false; selectOption: SelectOption[] = [{ value: 'aaa', icon: $r('app.media.app_icon') }, { value: 'bbb', icon: $r('app.media.app_icon') }, { value: 'ccc', icon: $r('app.media.app_icon') }, @@ -29,16 +29,15 @@ struct SelectFirstExpandSample { build() { Scroll() { Flex({ direction: FlexDirection.Row, wrap: FlexWrap.Wrap }) { - - if (this.timeHelper.printTime(true)) { + if (this.isExpand && this.timeHelper.printTime(true)) { } - Select(this.selectOption) .id('SelectFirstExpand') - - if (this.timeHelper.printTime(false)) { + .onClick(() => { + this.isExpand = true; + }) + if (this.isExpand && this.timeHelper.printTime(false)) { } - } .width('100%') }.margin({ bottom: 60 }) diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/select/SelectSecondExpandCollapseSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/select/SelectSecondExpandCollapseSample.ets index 92843d0e4..83118de6f 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/select/SelectSecondExpandCollapseSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/select/SelectSecondExpandCollapseSample.ets @@ -13,12 +13,13 @@ * limitations under the License. */ -import { TimeHelper } from '../../../util/TimeHelper' +import { TimeHelper } from '../../../util/TimeHelper'; @Entry @Component struct SelectSecondExpandCollapseSample { timeHelper: TimeHelper = new TimeHelper('SelectSecondExpandCollapseSample'); + @State isExpand: boolean = false; selectOption: SelectOption[] = [{ value: 'aaa', icon: $r('app.media.app_icon') }, { value: 'bbb', icon: $r('app.media.app_icon') }, { value: 'ccc', icon: $r('app.media.app_icon') }, @@ -28,10 +29,15 @@ struct SelectSecondExpandCollapseSample { build() { Scroll() { Flex({ direction: FlexDirection.Row, wrap: FlexWrap.Wrap }) { - + if (this.isExpand && this.timeHelper.printTime(true)) { + } Select(this.selectOption) .id('SelectSecondExpandCollapse') - + .onClick(() => { + this.isExpand = true; + }) + if (this.isExpand && this.timeHelper.printTime(false)) { + } } .width('100%') }.margin({ bottom: 60 }) diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/select/SelectSecondExpandSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/select/SelectSecondExpandSample.ets index 857c42f17..62e358568 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/select/SelectSecondExpandSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/select/SelectSecondExpandSample.ets @@ -19,7 +19,7 @@ import { TimeHelper } from '../../../util/TimeHelper' @Component struct SelectSecondExpandSample { timeHelper: TimeHelper = new TimeHelper('SelectSecondExpandSample'); - // @State selectWidth: number = 100; + @State isExpand: boolean = false; selectOption: SelectOption[] = [{ value: 'aaa', icon: $r('app.media.app_icon') }, { value: 'bbb', icon: $r('app.media.app_icon') }, { value: 'ccc', icon: $r('app.media.app_icon') }, @@ -29,16 +29,15 @@ struct SelectSecondExpandSample { build() { Scroll() { Flex({ direction: FlexDirection.Row, wrap: FlexWrap.Wrap }) { - - // if (this.selectWidth == 200 && this.timeHelper.printTime(true)) { - // } - + if (this.isExpand && this.timeHelper.printTime(true)) { + } Select(this.selectOption) .id('SelectSecondExpand') - - // if (this.selectWidth == 200 && this.timeHelper.printTime(false)) { - // } - + .onClick(() => { + this.isExpand = true; + }) + if (this.isExpand && this.timeHelper.printTime(false)) { + } } .width('100%') }.margin({ bottom: 60 }) diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/textPicker/TextPickerMouseScrollSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/textPicker/TextPickerMouseScrollSample.ets index 0386ad6cc..a4645166c 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/textPicker/TextPickerMouseScrollSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/base/textPicker/TextPickerMouseScrollSample.ets @@ -30,7 +30,8 @@ struct TextPickerMouseScrollSample { build() { Scroll() { Flex({ direction: FlexDirection.Row, wrap: FlexWrap.Wrap }) { - + if (this.timeHelper.printTime(true)) { + } TextPicker({ range: this.dataStr }) .onTouch((event: TouchEvent) => { if (event.type == TouchType.Down) { @@ -40,7 +41,8 @@ struct TextPickerMouseScrollSample { this.timeHelper.printTime(false); } }) - + if (this.timeHelper.printTime(false)) { + } } .width('100%') }.margin({ bottom: 60 }) diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridEdgeEffectSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridEdgeEffectSample.ets index 4d06c95a5..a657b9d03 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridEdgeEffectSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridEdgeEffectSample.ets @@ -23,7 +23,7 @@ import { TimeHelper } from '../../../util/TimeHelper' @Entry @Component struct GridEdgeEffectSample { - // timeHelper: TimeHelper = new TimeHelper('GridEdgeEffectSample'); + timeHelper: TimeHelper = new TimeHelper('GridEdgeEffectSample'); @State edgeEffect: EdgeEffect = EdgeEffect.None; scroller: Scroller = new Scroller() @@ -52,10 +52,9 @@ struct GridEdgeEffectSample { }.width('100%') Grid(this.scroller) { - // if (this.edgeValue >= 0 && this.timeHelper.printTime(true)) { - // } ForEach(ArrEntity.arr, (index: number) => { - + if (this.edgeEffect >= 0 && this.timeHelper.printTime(true)) { + } GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } @@ -76,10 +75,9 @@ struct GridEdgeEffectSample { GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } - + if (this.edgeEffect >= 0 && this.timeHelper.printTime(false)) { + } }) - // if (this.edgeValue >= 0 && this.timeHelper.printTime(false)) { - // } } .height('100%') .columnsTemplate('1fr') diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridManualScrollingSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridManualScrollingSample.ets index 4f6777d84..821bc99c4 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridManualScrollingSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridManualScrollingSample.ets @@ -23,17 +23,16 @@ import { TimeHelper } from '../../../util/TimeHelper' @Entry @Component struct GridManualScrollingSample { - // timeHelper: TimeHelper = new TimeHelper('GridManualScrollingSample'); + timeHelper: TimeHelper = new TimeHelper('GridManualScrollingSample'); build() { Scroll() { Flex({ direction: FlexDirection.Row, wrap: FlexWrap.Wrap }) { Grid() { - // if (this.timeHelper.printTime(true)) { - // } ForEach(ArrEntity.arr, (index: number) => { - + if (this.timeHelper.printTime(true)) { + } GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } @@ -54,10 +53,9 @@ struct GridManualScrollingSample { GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } - + if (this.timeHelper.printTime(false)) { + } }) - // if (this.timeHelper.printTime(false)) { - // } } .height('100%') .columnsTemplate('1fr') diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridMarginSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridMarginSample.ets index fe17a7a12..7594d4dd8 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridMarginSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridMarginSample.ets @@ -22,8 +22,8 @@ import { TimeHelper } from '../../../util/TimeHelper' @Entry @Component -struct FlexMarginSample { - timeHelper: TimeHelper = new TimeHelper('FlexMarginSample'); +struct GridMarginSample { + timeHelper: TimeHelper = new TimeHelper('GridMarginSample'); @State GridMargin: number = 20; build() { diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridScrollBySample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridScrollBySample.ets index 0f39c7022..a5d2c6a32 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridScrollBySample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridScrollBySample.ets @@ -23,8 +23,8 @@ import { TimeHelper } from '../../../util/TimeHelper' @Entry @Component struct GridScrollBySample { - // timeHelper: TimeHelper = new TimeHelper('GridScrollBySample'); - // @State scrollByY: number = 0; + timeHelper: TimeHelper = new TimeHelper('GridScrollBySample'); + @State scrollByY: number = 0; scroller: Scroller = new Scroller(); build() { @@ -40,10 +40,9 @@ struct GridScrollBySample { }.width('100%') Grid(this.scroller) { - // if (this.scrollByY >= 0 && this.timeHelper.printTime(true)) { - // } ForEach(ArrEntity.arr, (index: number) => { - + if (this.scrollByY >= 0 && this.timeHelper.printTime(true)) { + } GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } @@ -64,10 +63,9 @@ struct GridScrollBySample { GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } - + if (this.scrollByY >= 0 && this.timeHelper.printTime(false)) { + } }) - // if (this.scrollByY >= 0 && this.timeHelper.printTime(false)) { - // } } .height('100%') .columnsTemplate('1fr') diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridScrollEdgeSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridScrollEdgeSample.ets index 6fd49bfad..b25dd190f 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridScrollEdgeSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridScrollEdgeSample.ets @@ -23,8 +23,8 @@ import { TimeHelper } from '../../../util/TimeHelper' @Entry @Component struct GridScrollEdgeSample { - // timeHelper: TimeHelper = new TimeHelper('GridScrollEdgeSample'); - // @State edgeValue: Edge = Edge.Top; + timeHelper: TimeHelper = new TimeHelper('GridScrollEdgeSample'); + @State edgeValue: Edge = Edge.Top; scroller: Scroller = new Scroller(); build() { @@ -40,10 +40,9 @@ struct GridScrollEdgeSample { }.width('100%') Grid(this.scroller) { - // if (this.edgeValue >= 0 && this.timeHelper.printTime(true)) { - // } ForEach(ArrEntity.arr, (index: number) => { - + if (this.edgeValue >= 0 && this.timeHelper.printTime(true)) { + } GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } @@ -64,10 +63,9 @@ struct GridScrollEdgeSample { GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } - + if (this.edgeValue >= 0 && this.timeHelper.printTime(false)) { + } }) - // if (this.edgeValue >= 0 && this.timeHelper.printTime(false)) { - // } } .height('100%') .columnsTemplate('1fr') diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridScrollToSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridScrollToSample.ets index 0c738f3a6..85b398bc2 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridScrollToSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/grid/GridScrollToSample.ets @@ -23,8 +23,8 @@ import { TimeHelper } from '../../../util/TimeHelper' @Entry @Component struct GridScrollToSample { - // timeHelper: TimeHelper = new TimeHelper('GridScrollToSample'); - // @State scrollToY: number = 0; + timeHelper: TimeHelper = new TimeHelper('GridScrollToSample'); + @State scrollToY: number = 0; scroller: Scroller = new Scroller(); build() { @@ -40,10 +40,9 @@ struct GridScrollToSample { }.width('100%') Grid(this.scroller) { - // if (this.scrollToY >= 0 && this.timeHelper.printTime(true)) { - // } ForEach(ArrEntity.arr, (index: number) => { - + if (this.scrollToY >= 0 && this.timeHelper.printTime(true)) { + } GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } @@ -64,10 +63,9 @@ struct GridScrollToSample { GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } GridItem() { Text(index.toString()) } - + if (this.scrollToY >= 0 && this.timeHelper.printTime(false)) { + } }) - // if (this.scrollToY >= 0 && this.timeHelper.printTime(false)) { - // } } .height('100%') .columnsTemplate('1fr') diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerControlButtonSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerCBSample.ets similarity index 96% rename from performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerControlButtonSample.ets rename to performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerCBSample.ets index a9b353fa8..e371bbf42 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerControlButtonSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerCBSample.ets @@ -22,8 +22,8 @@ import { TimeHelper } from '../../../util/TimeHelper' @Entry @Component -struct SideBarContainerControlButtonSample { - timeHelper: TimeHelper = new TimeHelper('SideBarContainerControlButtonSample'); +struct SideBarContainerCBSample { + timeHelper: TimeHelper = new TimeHelper('SideBarContainerCBSample'); @State sideBarContainerControlButton: ButtonStyle = {}; build() { diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerDragContentSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerDragCoSample.ets similarity index 99% rename from performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerDragContentSample.ets rename to performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerDragCoSample.ets index 910d1b04a..803693cce 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerDragContentSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerDragCoSample.ets @@ -22,8 +22,8 @@ import { TimeHelper } from '../../../util/TimeHelper' @Entry @Component -struct SideBarContainerDragContentSample { - timeHelper: TimeHelper = new TimeHelper('SideBarContainerDragContentSample'); +struct SideBarContainerDragCoSample { + timeHelper: TimeHelper = new TimeHelper('SideBarContainerDragCoSample'); build() { Scroll() { diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerDragSideBarSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerDragSBSample.ets similarity index 99% rename from performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerDragSideBarSample.ets rename to performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerDragSBSample.ets index 32a180b66..409c70880 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerDragSideBarSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerDragSBSample.ets @@ -22,8 +22,8 @@ import { TimeHelper } from '../../../util/TimeHelper' @Entry @Component -struct SideBarContainerDragSideBarSample { - timeHelper: TimeHelper = new TimeHelper('SideBarContainerDragSideBarSample'); +struct SideBarContainerDragSBSample { + timeHelper: TimeHelper = new TimeHelper('SideBarContainerDragSBSample'); build() { Scroll() { diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerHome.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerHome.ets index 58da83eb6..f6edd9e05 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerHome.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerHome.ets @@ -32,18 +32,18 @@ struct SideBarContainerHome { CommonButton({ buttonName: 'SideBarContainerHeightSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerHeightSample' }); CommonButton({ buttonName: 'SideBarContainerPaddingSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerPaddingSample' }); CommonButton({ buttonName: 'SideBarContainerMarginSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerMarginSample' }); - CommonButton({ buttonName: 'SideBarContainerShowSideBarSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerShowSideBarSample' }); - CommonButton({ buttonName: 'SideBarContainerControlButtonSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerControlButtonSample' }); - CommonButton({ buttonName: 'SideBarContainerShowControlButtonSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerShowControlButtonSample' }); - CommonButton({ buttonName: 'SideBarContainerSideBarWidthSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerSideBarWidthSample' }); + CommonButton({ buttonName: 'SideBarContainerShowSBSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerShowSBSample' }); + CommonButton({ buttonName: 'SideBarContainerCBSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerCBSample' }); + CommonButton({ buttonName: 'SideBarContainerShowCBSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerShowCBSample' }); + CommonButton({ buttonName: 'SideBarContainerSideBarWSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerSideBarWSample' }); CommonButton({ buttonName: 'SideBarContainerAutoHideSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerAutoHideSample' }); - CommonButton({ buttonName: 'SideBarContainerSideBarPositionSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerSideBarPositionSample' }); + CommonButton({ buttonName: 'SideBarContainerSideBarPSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerSideBarPSample' }); CommonButton({ buttonName: 'SideBarContainerDividerSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerDividerSample' }); - CommonButton({ buttonName: 'SideBarContainerMinContentWidthSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerMinContentWidthSample' }); - CommonButton({ buttonName: 'SideBarContainerMinSideBarWidthSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerMinSideBarWidthSample' }); - CommonButton({ buttonName: 'SideBarContainerMaxSideBarWidthSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerMaxSideBarWidthSample' }); - CommonButton({ buttonName: 'SideBarContainerDragSideBarSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerDragSideBarSample' }); - CommonButton({ buttonName: 'SideBarContainerDragContentSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerDragContentSample' }); + CommonButton({ buttonName: 'SideBarContainerMinCWSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerMinCWSample' }); + CommonButton({ buttonName: 'SideBarContainerMinSBWSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerMinSBWSample' }); + CommonButton({ buttonName: 'SideBarContainerMaxSBWSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerMaxSBWSample' }); + CommonButton({ buttonName: 'SideBarContainerDragSBSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerDragSBSample' }); + CommonButton({ buttonName: 'SideBarContainerDragCoSample', buttonUrl: 'pages/container/sideBarContainer/SideBarContainerDragCoSample' }); } .padding('5vp') diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerMaxSideBarWidthSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerMaxSBWSample.ets similarity index 96% rename from performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerMaxSideBarWidthSample.ets rename to performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerMaxSBWSample.ets index 21b8f6ea0..39a94d616 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerMaxSideBarWidthSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerMaxSBWSample.ets @@ -22,8 +22,8 @@ import { TimeHelper } from '../../../util/TimeHelper' @Entry @Component -struct SideBarContainerMaxSideBarWidthSample { - timeHelper: TimeHelper = new TimeHelper('SideBarContainerMaxSideBarWidthSample'); +struct SideBarContainerMaxSBWSample { + timeHelper: TimeHelper = new TimeHelper('SideBarContainerMaxSBWSample'); @State sideBarContainerMaxSideBarWidth: number = 280; build() { diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerMinContentWidthSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerMinCWSample.ets similarity index 96% rename from performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerMinContentWidthSample.ets rename to performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerMinCWSample.ets index 5c263fa61..1c557aec7 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerMinContentWidthSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerMinCWSample.ets @@ -22,8 +22,8 @@ import { TimeHelper } from '../../../util/TimeHelper' @Entry @Component -struct SideBarContainerMinContentWidthSample { - timeHelper: TimeHelper = new TimeHelper('SideBarContainerMinContentWidthSample'); +struct SideBarContainerMinCWSample { + timeHelper: TimeHelper = new TimeHelper('SideBarContainerMinCWSample'); @State sideBarContainerMinContentWidth: number = 200; build() { diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerMinSideBarWidthSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerMinSBWSample.ets similarity index 96% rename from performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerMinSideBarWidthSample.ets rename to performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerMinSBWSample.ets index 9d0c48c7c..ed91f5533 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerMinSideBarWidthSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerMinSBWSample.ets @@ -22,8 +22,8 @@ import { TimeHelper } from '../../../util/TimeHelper' @Entry @Component -struct SideBarContainerMinSideBarWidthSample { - timeHelper: TimeHelper = new TimeHelper('SideBarContainerMinSideBarWidthSample'); +struct SideBarContainerMinSBWSample { + timeHelper: TimeHelper = new TimeHelper('SideBarContainerMinSBWSample'); @State sideBarContainerMinSideBarWidth: number = 200; build() { diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerShowControlButtonSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerShowCBSample.ets similarity index 97% rename from performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerShowControlButtonSample.ets rename to performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerShowCBSample.ets index 5a779b6db..9c5644692 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerShowControlButtonSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerShowCBSample.ets @@ -22,8 +22,8 @@ import { TimeHelper } from '../../../util/TimeHelper' @Entry @Component -struct SideBarContainerShowControlButtonSample { - timeHelper: TimeHelper = new TimeHelper('SideBarContainerShowControlButtonSample'); +struct SideBarContainerShowCBSample { + timeHelper: TimeHelper = new TimeHelper('SideBarContainerShowCBSample'); @State sideBarContainerShowControlButton: boolean = true; build() { diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerShowSideBarSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerShowSBSample.ets similarity index 98% rename from performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerShowSideBarSample.ets rename to performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerShowSBSample.ets index 783881757..6457e6ef4 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerShowSideBarSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerShowSBSample.ets @@ -22,8 +22,8 @@ import { TimeHelper } from '../../../util/TimeHelper' @Entry @Component -struct SideBarContainerShowSideBarSample { - timeHelper: TimeHelper = new TimeHelper('SideBarContainerShowSideBarSample'); +struct SideBarContainerShowSBSample { + timeHelper: TimeHelper = new TimeHelper('SideBarContainerShowSBSample'); @State sideBarContainerShowSideBar: boolean = true; build() { diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerSideBarPositionSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerSideBarPSample.ets similarity index 100% rename from performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerSideBarPositionSample.ets rename to performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerSideBarPSample.ets diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerSideBarWidthSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerSideBarWSample.ets similarity index 98% rename from performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerSideBarWidthSample.ets rename to performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerSideBarWSample.ets index 00a20c0c2..7a71de9a5 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerSideBarWidthSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/sideBarContainer/SideBarContainerSideBarWSample.ets @@ -22,8 +22,8 @@ import { TimeHelper } from '../../../util/TimeHelper' @Entry @Component -struct SideBarContainerSideBarWidthSample { - timeHelper: TimeHelper = new TimeHelper('SideBarContainerSideBarWidthSample'); +struct SideBarContainerSideBarWSample { + timeHelper: TimeHelper = new TimeHelper('SideBarContainerSideBarWSample'); @State sideBarContainerSideBarWidth: number = 300; build() { diff --git a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/tabs/TabsWidthSample.ets b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/tabs/TabsWidthSample.ets index f3d996b51..94d0c056d 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/tabs/TabsWidthSample.ets +++ b/performance/arkui/benchMark_Component/entry/src/main/ets/pages/container/tabs/TabsWidthSample.ets @@ -33,7 +33,7 @@ struct TabsWidthSample { }) ForEach(ArrEntity.arr, (index: number) => { - if (this.tabsWidth == '100%' && this.timeHelper.printTime(true)) { + if (this.tabsWidth != null && this.timeHelper.printTime(true)) { } Tabs().width(this.tabsWidth) Tabs().width(this.tabsWidth) @@ -55,7 +55,7 @@ struct TabsWidthSample { Tabs().width(this.tabsWidth) Tabs().width(this.tabsWidth) Tabs().width(this.tabsWidth) - if (this.tabsWidth == '100%' && this.timeHelper.printTime(false)) { + if (this.tabsWidth != null && this.timeHelper.printTime(false)) { } }, (item: number) => JSON.stringify(item)) diff --git a/performance/arkui/benchMark_Component/entry/src/main/resources/base/profile/main_pages.json b/performance/arkui/benchMark_Component/entry/src/main/resources/base/profile/main_pages.json index 9af907eea..d666f8254 100644 --- a/performance/arkui/benchMark_Component/entry/src/main/resources/base/profile/main_pages.json +++ b/performance/arkui/benchMark_Component/entry/src/main/resources/base/profile/main_pages.json @@ -433,7 +433,7 @@ "pages/base/alphabetIndexer/AlphabetIndexerCreateSample", "pages/base/alphabetIndexer/AlphabetIndexerSelectedColorSample", "pages/base/alphabetIndexer/AlphabetIndexerPopupColorSample", - "pages/base/alphabetIndexer/AlphabetIndexerSelectedBackgroundColorSample", + "pages/base/alphabetIndexer/AlphabetIndexerSelectedBgColorSample", "pages/base/alphabetIndexer/AlphabetIndexerPopupBackgroundSample", "pages/base/alphabetIndexer/AlphabetIndexerSelectedFontSample", "pages/base/alphabetIndexer/AlphabetIndexerPopupFontSample", @@ -550,18 +550,18 @@ "pages/container/sideBarContainer/SideBarContainerHeightSample", "pages/container/sideBarContainer/SideBarContainerPaddingSample", "pages/container/sideBarContainer/SideBarContainerMarginSample", - "pages/container/sideBarContainer/SideBarContainerShowSideBarSample", - "pages/container/sideBarContainer/SideBarContainerControlButtonSample", - "pages/container/sideBarContainer/SideBarContainerShowControlButtonSample", - "pages/container/sideBarContainer/SideBarContainerSideBarWidthSample", + "pages/container/sideBarContainer/SideBarContainerShowSBSample", + "pages/container/sideBarContainer/SideBarContainerCBSample", + "pages/container/sideBarContainer/SideBarContainerShowCBSample", + "pages/container/sideBarContainer/SideBarContainerSideBarWSample", "pages/container/sideBarContainer/SideBarContainerAutoHideSample", - "pages/container/sideBarContainer/SideBarContainerSideBarPositionSample", + "pages/container/sideBarContainer/SideBarContainerSideBarPSample", "pages/container/sideBarContainer/SideBarContainerDividerSample", - "pages/container/sideBarContainer/SideBarContainerMinContentWidthSample", - "pages/container/sideBarContainer/SideBarContainerMinSideBarWidthSample", - "pages/container/sideBarContainer/SideBarContainerMaxSideBarWidthSample", - "pages/container/sideBarContainer/SideBarContainerDragSideBarSample", - "pages/container/sideBarContainer/SideBarContainerDragContentSample", + "pages/container/sideBarContainer/SideBarContainerMinCWSample", + "pages/container/sideBarContainer/SideBarContainerMinSBWSample", + "pages/container/sideBarContainer/SideBarContainerMaxSBWSample", + "pages/container/sideBarContainer/SideBarContainerDragSBSample", + "pages/container/sideBarContainer/SideBarContainerDragCoSample", "pages/base/imageAnimator/ImageAnimatorHome", "pages/base/imageAnimator/ImageAnimatorCreateSample", "pages/base/imageAnimator/ImageAnimatorWidthSample", diff --git a/performance/arkui/benchMark_Component/entry/src/ohosTest/ets/test/Ability.test.ets b/performance/arkui/benchMark_Component/entry/src/ohosTest/ets/test/Ability.test.ets index 6b12bdd8c..ff0b143eb 100644 --- a/performance/arkui/benchMark_Component/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/performance/arkui/benchMark_Component/entry/src/ohosTest/ets/test/Ability.test.ets @@ -1892,7 +1892,7 @@ export default function abilityTest() { await checkButtonAndClickWithID('GaugeStrokeWidthSample'); await checkButtonAndClickWithID('change strokeWidth 4 to 10'); await pressBack(); - // await checkButtonAndClickWithID('GaugeTrackShadowSample'); + // await checkButtonAndClickWithID('GaugeTrackShadowSample'); //trackShadow是api11的属性 // await checkButtonAndClickWithID('change trackShadow'); // await pressBack(); await checkButtonAndClickWithID('GaugeAngleSample'); @@ -1948,7 +1948,7 @@ export default function abilityTest() { await checkButtonAndClickWithID('AlphabetIndexerChangePopupColor'); await pressBack(); //改变SelectedBackgroundColor - await checkButtonAndClickWithID('AlphabetIndexerSelectedBackgroundColor'); + await checkButtonAndClickWithID('AlphabetIndexerSelectedBgColorSample'); await checkButtonAndClickWithID('AlphabetIndexerChangeSelectedBackgroundColor'); await pressBack(); // 改变PopupBackground @@ -2188,6 +2188,18 @@ export default function abilityTest() { await checkButtonAndClickWithID('PatternLockPathStrokeWidth'); await checkButtonAndClickWithID('PatternLockChangePathStrokeWidth'); await pressBack(); + await checkButtonAndClickWithID('PatternLockWidth'); + await checkButtonAndClickWithID('PatternLockChangeWidth'); + await pressBack(); + await checkButtonAndClickWithID('PatternLockHeight'); + await checkButtonAndClickWithID('PatternLockChangeHeight'); + await pressBack(); + await checkButtonAndClickWithID('PatternLockPadding'); + await checkButtonAndClickWithID('PatternLockChangePadding'); + await pressBack(); + await checkButtonAndClickWithID('PatternLockMargin'); + await checkButtonAndClickWithID('PatternLockChangeMargin'); + await pressBack(); await pressBack(); //返回首页 }) @@ -2440,42 +2452,42 @@ export default function abilityTest() { await checkButtonAndClickWithID('SideBarContainerMarginSample'); await checkButtonAndClickWithID('change margin 20 to 30'); await pressBack(); - await checkButtonAndClickWithID('SideBarContainerShowSideBarSample'); + await checkButtonAndClickWithID('SideBarContainerShowSBSample'); await checkButtonAndClickWithID('change showSideBar'); await pressBack(); - await checkButtonAndClickWithID('SideBarContainerControlButtonSample'); + await checkButtonAndClickWithID('SideBarContainerCBSample'); await checkButtonAndClickWithID('change controlButton'); await pressBack(); - await checkButtonAndClickWithID('SideBarContainerShowControlButtonSample'); + await checkButtonAndClickWithID('SideBarContainerShowCBSample'); await checkButtonAndClickWithID('change showControlButton'); await pressBack(); - await checkButtonAndClickWithID('SideBarContainerSideBarWidthSample'); + await checkButtonAndClickWithID('SideBarContainerSideBarWSample'); await checkButtonAndClickWithID('change sideBarWidth'); await pressBack(); await checkButtonAndClickWithID('SideBarContainerAutoHideSample'); await checkButtonAndClickWithID('change autoHide'); await pressBack(); - await checkButtonAndClickWithID('SideBarContainerSideBarPositionSample'); + await checkButtonAndClickWithID('SideBarContainerSideBarPSample'); await checkButtonAndClickWithID('change sideBarPosition'); await pressBack(); await checkButtonAndClickWithID('SideBarContainerDividerSample'); await checkButtonAndClickWithID('change divider'); await pressBack(); await driver.swipe(540, 1000, 540, 500); - await checkButtonAndClickWithID('SideBarContainerMinContentWidthSample'); + await checkButtonAndClickWithID('SideBarContainerMinCWSample'); await checkButtonAndClickWithID('change minContentWidth'); await pressBack(); - await checkButtonAndClickWithID('SideBarContainerMinSideBarWidthSample'); + await checkButtonAndClickWithID('SideBarContainerMinSBWSample'); await checkButtonAndClickWithID('change minSideBarWidth'); await pressBack(); - await checkButtonAndClickWithID('SideBarContainerMaxSideBarWidthSample'); + await checkButtonAndClickWithID('SideBarContainerMaxSBWSample'); await checkButtonAndClickWithID('change maxSideBarWidth'); await pressBack(); - await checkButtonAndClickWithID('SideBarContainerDragSideBarSample'); + await checkButtonAndClickWithID('SideBarContainerDragSBSample'); await driver.delayMs(1000); await driver.swipe(300, 500, 100, 500); await pressBack(); - await checkButtonAndClickWithID('SideBarContainerDragContentSample'); + await checkButtonAndClickWithID('SideBarContainerDragCoSample'); await driver.delayMs(1000); await driver.drag(300, 500, 500, 500); await pressBack(); diff --git a/performance/arkui/benchMark_Component/tool/2.bat b/performance/arkui/benchMark_Component/tool/2.bat deleted file mode 100644 index 0d103d6ec..000000000 --- a/performance/arkui/benchMark_Component/tool/2.bat +++ /dev/null @@ -1,7 +0,0 @@ - -hdc_std app install -r entry-default-signed.hap -hdc_std app install -r entry-ohosTest-signed.hap -hdc_std shell aa test -b cn.openharmony.benchmarksample -m entry_test -s unittest /ets/testrunner/OpenHarmonyTestRunner -s class ActsAbilityTest -s timeout 6000000 - - -pause \ No newline at end of file -- Gitee